Rename directories only
Change contents for the new directory structure