Reorginization to new mod ids, work on new ores