Move everything into a package