restructure output dir a bit