Bastien main scene

Fix typo, add main scene and convert files to enable (I hope) merges with git.