Refactoring. Added sub namespaces.