Added Main, Game, World, Layer and BaseRoom
Fixed merge conflict in projectfiles for class creation