Refactored some namespaces