Remove unnecessary package and move around some stuff in the package.