Finished Module Manager

Finished off module manager features. updated tests and amended setup
model. Needs final testing before release