Yes they were bedroom villas. You have the SC check-in building as the first building you come to with the tram (picture on the corner of the lagoon). To the left (facing the lagoon) are the row of 1-bedroom villas with the 2- 2 bedroom villas in the middle. Then at the far “corner” you have the Moet Champagne and liquor bar. Now picture going “up” the other side of the lagoon towards the ocean and all of those buildings are just cabana style layout villas.
To the right of the SC check-in is the bar/buffet with the spa being at the top next to ocean. “Behind” the bar/buffet going along the ocean are the “new” ocean villas.