Rename: ColumnBuilder.sql -> AddColumn.sql
Rename: A2Mapping.sql -> CSharpFields.sql
Query simplification.