clean up of directory structure