Small restructuring of folders and namespaces