File reorganization. First step to merge concepts into one game.