Making some changes to the engine, merging GameCore and BaseGame and others