Created new namespaces and moved files