Module split

Merged Olav Kvittem requested to merge module-split into master

split mockup into modules

Merge request reports