Refactoring namespaces to be more unique
Fixing composer.json