changed output directory structure and reorganized config