Added WorldGenerator and cleaned up world generation