Added PackageRegistrar to allow customization of package component paths
Reverted ServiceProvider