Major cleanup; DataTypes.scala is almost done