Restructure of the game for a more modular architecture