Group sanctioned structural changes

After discussing some redundancy issues the group decided that some
changes needed to be applied.

Ze'ev to take a peek at to see if I'm on the right track.