Moved stuff in wrong place - create core game classes