Moved namespaces of some files prior to extracting them into new projects