Removed singleton classes and replaced with namespaces