move roles into host

Well, search hipchat for "UsingPersistence" and you will see the discussion between me and @yvesgoeleven, and I agree with @yvesgoeleven hence the reason to raise it.