Refactoring droneWatch general structure