restructure code; new ore-gen