instantiate singletons differently in accordance with style guide
better singleton naming
Comment changes and removing a require from builder
removing confused comment
make package-loader take null version argument for local packages only