Started World refactoring