Gave module exports unique module names, as some of these may be shared with other libraries. Fixed broken unit test.
Woops. Forgot to add moved files