More move around, collapsed the pkg package into metadata