Simplified Exercise/Criteria objects

Renamed Criteria to Exercise.