Feature/modules

Re-simplifying external modules. Closes #85