Refactored the entities into the rooms.
Finished up refactoring the thugs into the rooms.