Updated role management, moved controllers to separate files