Folder names and namespaces fix