removed all files not in merged Namespaces branch