Creating files in src-gen and simplifying code due to desugaring.
Fixing DS sans Id x key occurences.