Started world refactoring