Changes to output format as well as including all the generated files.