relocate MWS requirements checks; closes #2304

This moves some decorators so they'll work, and moves some others for consistency.  There's no easy way to test this change.