Minor changes to ObjectGenerator.
Moved all 2D DSC code into a DSC2D namespace.