change directory structure and put files in order