directory restructure
rename