reorganizes factory namespace and filenames