Reworked output directory hierarchy some more.