minor moving of packages around