Sorting Requirements

Sorted requirements by groups and got numbering fixed