Refactor output directory to be more user friendly