Refined the UAVRole and it's submodules to be more fully integrated.