Consolidated ore gen to one class

Kept the others just in case this screws it up