Namespace refactoring
GameWorld refactor