#12 Still cleaning and reorganizing the code.
#13 Removed SatConstraint & OptContraint from the catalog.