Moved entities out of game.js