updated directory structure and outputs