Converted the Requirement models

Converted everything over to the new Requirement model.