Yes, both the same location, and same building. Although, throuout the 70's the club was added onto many times, which led to maze like escape routes, and exits that led deeper into the building. Which contributed to the high number of fatalites.