Cleanup worldgen stuff to own package