Refactor LevelFactory and add occupants