Moved around a few requirements

Moved a few bullet points to keep requirements in logical groups