Refactored output directory structure