Refactor namespaces/folders