rename folders and files
remove un-used function