Cleaned up Namespaces file name and removed requires in Namespaces