Refactors the modules function into the main application
Merges the refactor into the main project
Merge branch 'release/v0.1.2'