Added suport for utility ores, reorganized folders