Remove subpackages, revert to a single package, since standalone package is now only 10% the size of the main package.