Grady/assessment reorder

Reordering of assessment modules, now in the context of the JS refactor.