[DOSGI-242] Extract common module, use DS
40 files changed