Delegate previous GameEngine functionality to several classes
Merge with master