rename files. fix core and router