Refactoring

Cleaning up the structure of the Drone state variables.