Moved roles within projects.

Change-Id: I7f5a0738148078521c787500bb91fac1672336ff