Organized 1.2 to 2.0 code into a conversion pattern and updated the generators to use the 2.0 data structure.