start preparing some files for namecleaning future changes