Use src folder for module(s)

Merged User expired requested to merge src-folder into master

Merge request reports