Move some packages around