Revamp world generation