Move some classes between packages