World refactoring start