Move some classes to metaapp