Another possible fix for DroneDefense, and starting to conver to Move and Cargo modules