reorganized output/input file locations / structures