restructure to roles