Refactored output directory structure

category