directory structure revised.