Grady/assessment reorder

Reordering of assessment modules, now in the context of the JS refactor.
I think an additional comment here would be helpful.