even more re-organization of drones.cs