Implemented module groupping

Implements blueprint modules-grouping

Change-Id: I272fe3c9c36dd3d446f32304084ee5869ec8d5bb
Merge "Implemented module groupping"