update of directory structure part 2