neaten up moved files, adjust rename paths