New folder structure and new Game model