split up and reorganize based on role