Moved all files their respective namespaces