Move world generation functions into world.clj