Moved Room and Player to separate class files