First pass of separation game engine code and game logic code