Moved files and added namespaces