refactor(*): rearrange the module layout to make life a little easier
Merge branch 'refactor-module-layout' into develop