More rewrites to file structure and the game window.