cleanup file structure to v2 format

moved output files to new directory tree