Reorganized the package files.