remove unnecessary code
rename files