renaming folders to match namespaces