Reorganized everything into a package.