Grady/assessment reorder

Reordering of assessment modules, now in the context of the JS refactor.
ugh formatting didn't post.  That was supposed to be a tree diagram