reformat of directory structure