Refactor/controller modules 9

Fixes #9