more code reorganization in drones.cs