room.h and .cpp removed