diff --git a/libraries/GCS_MAVLink/message_definitions_v1.0/ardupilotmega.xml b/libraries/GCS_MAVLink/message_definitions/ardupilotmega.xml similarity index 100% rename from libraries/GCS_MAVLink/message_definitions_v1.0/ardupilotmega.xml rename to libraries/GCS_MAVLink/message_definitions/ardupilotmega.xml diff --git a/libraries/GCS_MAVLink/message_definitions_v1.0/common.xml b/libraries/GCS_MAVLink/message_definitions/common.xml similarity index 100% rename from libraries/GCS_MAVLink/message_definitions_v1.0/common.xml rename to libraries/GCS_MAVLink/message_definitions/common.xml diff --git a/libraries/GCS_MAVLink/message_definitions_v1.0/matrixpilot.xml b/libraries/GCS_MAVLink/message_definitions/matrixpilot.xml similarity index 100% rename from libraries/GCS_MAVLink/message_definitions_v1.0/matrixpilot.xml rename to libraries/GCS_MAVLink/message_definitions/matrixpilot.xml diff --git a/libraries/GCS_MAVLink/message_definitions_v1.0/minimal.xml b/libraries/GCS_MAVLink/message_definitions/minimal.xml similarity index 100% rename from libraries/GCS_MAVLink/message_definitions_v1.0/minimal.xml rename to libraries/GCS_MAVLink/message_definitions/minimal.xml diff --git a/libraries/GCS_MAVLink/message_definitions_v1.0/pixhawk.xml b/libraries/GCS_MAVLink/message_definitions/pixhawk.xml similarity index 100% rename from libraries/GCS_MAVLink/message_definitions_v1.0/pixhawk.xml rename to libraries/GCS_MAVLink/message_definitions/pixhawk.xml diff --git a/libraries/GCS_MAVLink/message_definitions_v1.0/sensesoar.xml b/libraries/GCS_MAVLink/message_definitions/sensesoar.xml similarity index 100% rename from libraries/GCS_MAVLink/message_definitions_v1.0/sensesoar.xml rename to libraries/GCS_MAVLink/message_definitions/sensesoar.xml diff --git a/libraries/GCS_MAVLink/message_definitions_v1.0/slugs.xml b/libraries/GCS_MAVLink/message_definitions/slugs.xml similarity index 100% rename from libraries/GCS_MAVLink/message_definitions_v1.0/slugs.xml rename to libraries/GCS_MAVLink/message_definitions/slugs.xml diff --git a/libraries/GCS_MAVLink/message_definitions_v1.0/test.xml b/libraries/GCS_MAVLink/message_definitions/test.xml similarity index 100% rename from libraries/GCS_MAVLink/message_definitions_v1.0/test.xml rename to libraries/GCS_MAVLink/message_definitions/test.xml diff --git a/libraries/GCS_MAVLink/message_definitions_v1.0/ualberta.xml b/libraries/GCS_MAVLink/message_definitions/ualberta.xml similarity index 100% rename from libraries/GCS_MAVLink/message_definitions_v1.0/ualberta.xml rename to libraries/GCS_MAVLink/message_definitions/ualberta.xml