Refactoring directories and namespaces