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