Slight change to package structure.  Also forgot to include rooms/Room.scala