Add additional roles and move "main" roles into the proper places (hopefully)