Move some classes to the package object