Simply generation of source files

This currently takes 2 steps. I'm sure it can be condensed to one.