Redesigned ore generation, plus organization