Reorganized modules into a package.