Cleanup and restructure roles