Rooms code re-organized