moved roles to modules #5

Change-Id: I47d727b0cda926940ee9e2aed4b637b82b6ca9eb