Perform adjust namespaces
Code refactoring