Separate the singleton version from a different package to separate usage and functionality scopes better.