Feature/modules

Re-simplifying external modules. Please see #85