Reorganized the game js