fix folders and namespaces