Cleaned up some code. GameWorld now contains all classes