moving over org.metatype package classes