better directory structure for output