mod merge Drone/com/core + Drone/com/helper to Drone/com