Add more substitutions for a more simple output directory structure