diff --git a/libraries/mavlink/README b/libraries/GCS_MAVLink/README
similarity index 100%
rename from libraries/mavlink/README
rename to libraries/GCS_MAVLink/README
diff --git a/libraries/mavlink/doc/Doxyfile b/libraries/GCS_MAVLink/doc/Doxyfile
similarity index 100%
rename from libraries/mavlink/doc/Doxyfile
rename to libraries/GCS_MAVLink/doc/Doxyfile
diff --git a/libraries/mavlink/doc/README b/libraries/GCS_MAVLink/doc/README
similarity index 100%
rename from libraries/mavlink/doc/README
rename to libraries/GCS_MAVLink/doc/README
diff --git a/libraries/mavlink/doc/mavlink.css b/libraries/GCS_MAVLink/doc/mavlink.css
similarity index 100%
rename from libraries/mavlink/doc/mavlink.css
rename to libraries/GCS_MAVLink/doc/mavlink.css
diff --git a/libraries/mavlink/doc/mavlink.php b/libraries/GCS_MAVLink/doc/mavlink.php
similarity index 100%
rename from libraries/mavlink/doc/mavlink.php
rename to libraries/GCS_MAVLink/doc/mavlink.php
diff --git a/libraries/mavlink/doc/mavlink_to_html_table.xsl b/libraries/GCS_MAVLink/doc/mavlink_to_html_table.xsl
similarity index 100%
rename from libraries/mavlink/doc/mavlink_to_html_table.xsl
rename to libraries/GCS_MAVLink/doc/mavlink_to_html_table.xsl
diff --git a/libraries/mavlink/include/ardupilotmega/ardupilotmega.h b/libraries/GCS_MAVLink/include/ardupilotmega/ardupilotmega.h
similarity index 100%
rename from libraries/mavlink/include/ardupilotmega/ardupilotmega.h
rename to libraries/GCS_MAVLink/include/ardupilotmega/ardupilotmega.h
diff --git a/libraries/mavlink/include/ardupilotmega/mavlink.h b/libraries/GCS_MAVLink/include/ardupilotmega/mavlink.h
similarity index 100%
rename from libraries/mavlink/include/ardupilotmega/mavlink.h
rename to libraries/GCS_MAVLink/include/ardupilotmega/mavlink.h
diff --git a/libraries/mavlink/include/bittest.c b/libraries/GCS_MAVLink/include/bittest.c
similarity index 100%
rename from libraries/mavlink/include/bittest.c
rename to libraries/GCS_MAVLink/include/bittest.c
diff --git a/libraries/mavlink/include/checksum.h b/libraries/GCS_MAVLink/include/checksum.h
similarity index 100%
rename from libraries/mavlink/include/checksum.h
rename to libraries/GCS_MAVLink/include/checksum.h
diff --git a/libraries/mavlink/include/common/common.h b/libraries/GCS_MAVLink/include/common/common.h
similarity index 100%
rename from libraries/mavlink/include/common/common.h
rename to libraries/GCS_MAVLink/include/common/common.h
diff --git a/libraries/mavlink/include/common/mavlink.h b/libraries/GCS_MAVLink/include/common/mavlink.h
similarity index 100%
rename from libraries/mavlink/include/common/mavlink.h
rename to libraries/GCS_MAVLink/include/common/mavlink.h
diff --git a/libraries/mavlink/include/common/mavlink_msg_action.h b/libraries/GCS_MAVLink/include/common/mavlink_msg_action.h
similarity index 100%
rename from libraries/mavlink/include/common/mavlink_msg_action.h
rename to libraries/GCS_MAVLink/include/common/mavlink_msg_action.h
diff --git a/libraries/mavlink/include/common/mavlink_msg_action_ack.h b/libraries/GCS_MAVLink/include/common/mavlink_msg_action_ack.h
similarity index 100%
rename from libraries/mavlink/include/common/mavlink_msg_action_ack.h
rename to libraries/GCS_MAVLink/include/common/mavlink_msg_action_ack.h
diff --git a/libraries/mavlink/include/common/mavlink_msg_attitude.h b/libraries/GCS_MAVLink/include/common/mavlink_msg_attitude.h
similarity index 100%
rename from libraries/mavlink/include/common/mavlink_msg_attitude.h
rename to libraries/GCS_MAVLink/include/common/mavlink_msg_attitude.h
diff --git a/libraries/mavlink/include/common/mavlink_msg_attitude_controller_output.h b/libraries/GCS_MAVLink/include/common/mavlink_msg_attitude_controller_output.h
similarity index 100%
rename from libraries/mavlink/include/common/mavlink_msg_attitude_controller_output.h
rename to libraries/GCS_MAVLink/include/common/mavlink_msg_attitude_controller_output.h
diff --git a/libraries/mavlink/include/common/mavlink_msg_boot.h b/libraries/GCS_MAVLink/include/common/mavlink_msg_boot.h
similarity index 100%
rename from libraries/mavlink/include/common/mavlink_msg_boot.h
rename to libraries/GCS_MAVLink/include/common/mavlink_msg_boot.h
diff --git a/libraries/mavlink/include/common/mavlink_msg_debug.h b/libraries/GCS_MAVLink/include/common/mavlink_msg_debug.h
similarity index 100%
rename from libraries/mavlink/include/common/mavlink_msg_debug.h
rename to libraries/GCS_MAVLink/include/common/mavlink_msg_debug.h
diff --git a/libraries/mavlink/include/common/mavlink_msg_global_position.h b/libraries/GCS_MAVLink/include/common/mavlink_msg_global_position.h
similarity index 100%
rename from libraries/mavlink/include/common/mavlink_msg_global_position.h
rename to libraries/GCS_MAVLink/include/common/mavlink_msg_global_position.h
diff --git a/libraries/mavlink/include/common/mavlink_msg_gps_raw.h b/libraries/GCS_MAVLink/include/common/mavlink_msg_gps_raw.h
similarity index 100%
rename from libraries/mavlink/include/common/mavlink_msg_gps_raw.h
rename to libraries/GCS_MAVLink/include/common/mavlink_msg_gps_raw.h
diff --git a/libraries/mavlink/include/common/mavlink_msg_gps_status.h b/libraries/GCS_MAVLink/include/common/mavlink_msg_gps_status.h
similarity index 100%
rename from libraries/mavlink/include/common/mavlink_msg_gps_status.h
rename to libraries/GCS_MAVLink/include/common/mavlink_msg_gps_status.h
diff --git a/libraries/mavlink/include/common/mavlink_msg_heartbeat.h b/libraries/GCS_MAVLink/include/common/mavlink_msg_heartbeat.h
similarity index 100%
rename from libraries/mavlink/include/common/mavlink_msg_heartbeat.h
rename to libraries/GCS_MAVLink/include/common/mavlink_msg_heartbeat.h
diff --git a/libraries/mavlink/include/common/mavlink_msg_local_position.h b/libraries/GCS_MAVLink/include/common/mavlink_msg_local_position.h
similarity index 100%
rename from libraries/mavlink/include/common/mavlink_msg_local_position.h
rename to libraries/GCS_MAVLink/include/common/mavlink_msg_local_position.h
diff --git a/libraries/mavlink/include/common/mavlink_msg_local_position_setpoint.h b/libraries/GCS_MAVLink/include/common/mavlink_msg_local_position_setpoint.h
similarity index 100%
rename from libraries/mavlink/include/common/mavlink_msg_local_position_setpoint.h
rename to libraries/GCS_MAVLink/include/common/mavlink_msg_local_position_setpoint.h
diff --git a/libraries/mavlink/include/common/mavlink_msg_local_position_setpoint_set.h b/libraries/GCS_MAVLink/include/common/mavlink_msg_local_position_setpoint_set.h
similarity index 100%
rename from libraries/mavlink/include/common/mavlink_msg_local_position_setpoint_set.h
rename to libraries/GCS_MAVLink/include/common/mavlink_msg_local_position_setpoint_set.h
diff --git a/libraries/mavlink/include/common/mavlink_msg_manual_control.h b/libraries/GCS_MAVLink/include/common/mavlink_msg_manual_control.h
similarity index 100%
rename from libraries/mavlink/include/common/mavlink_msg_manual_control.h
rename to libraries/GCS_MAVLink/include/common/mavlink_msg_manual_control.h
diff --git a/libraries/mavlink/include/common/mavlink_msg_param_request_list.h b/libraries/GCS_MAVLink/include/common/mavlink_msg_param_request_list.h
similarity index 100%
rename from libraries/mavlink/include/common/mavlink_msg_param_request_list.h
rename to libraries/GCS_MAVLink/include/common/mavlink_msg_param_request_list.h
diff --git a/libraries/mavlink/include/common/mavlink_msg_param_request_read.h b/libraries/GCS_MAVLink/include/common/mavlink_msg_param_request_read.h
similarity index 100%
rename from libraries/mavlink/include/common/mavlink_msg_param_request_read.h
rename to libraries/GCS_MAVLink/include/common/mavlink_msg_param_request_read.h
diff --git a/libraries/mavlink/include/common/mavlink_msg_param_set.h b/libraries/GCS_MAVLink/include/common/mavlink_msg_param_set.h
similarity index 100%
rename from libraries/mavlink/include/common/mavlink_msg_param_set.h
rename to libraries/GCS_MAVLink/include/common/mavlink_msg_param_set.h
diff --git a/libraries/mavlink/include/common/mavlink_msg_param_value.h b/libraries/GCS_MAVLink/include/common/mavlink_msg_param_value.h
similarity index 100%
rename from libraries/mavlink/include/common/mavlink_msg_param_value.h
rename to libraries/GCS_MAVLink/include/common/mavlink_msg_param_value.h
diff --git a/libraries/mavlink/include/common/mavlink_msg_ping.h b/libraries/GCS_MAVLink/include/common/mavlink_msg_ping.h
similarity index 100%
rename from libraries/mavlink/include/common/mavlink_msg_ping.h
rename to libraries/GCS_MAVLink/include/common/mavlink_msg_ping.h
diff --git a/libraries/mavlink/include/common/mavlink_msg_position_controller_output.h b/libraries/GCS_MAVLink/include/common/mavlink_msg_position_controller_output.h
similarity index 100%
rename from libraries/mavlink/include/common/mavlink_msg_position_controller_output.h
rename to libraries/GCS_MAVLink/include/common/mavlink_msg_position_controller_output.h
diff --git a/libraries/mavlink/include/common/mavlink_msg_position_target.h b/libraries/GCS_MAVLink/include/common/mavlink_msg_position_target.h
similarity index 100%
rename from libraries/mavlink/include/common/mavlink_msg_position_target.h
rename to libraries/GCS_MAVLink/include/common/mavlink_msg_position_target.h
diff --git a/libraries/mavlink/include/common/mavlink_msg_raw_imu.h b/libraries/GCS_MAVLink/include/common/mavlink_msg_raw_imu.h
similarity index 100%
rename from libraries/mavlink/include/common/mavlink_msg_raw_imu.h
rename to libraries/GCS_MAVLink/include/common/mavlink_msg_raw_imu.h
diff --git a/libraries/mavlink/include/common/mavlink_msg_raw_pressure.h b/libraries/GCS_MAVLink/include/common/mavlink_msg_raw_pressure.h
similarity index 100%
rename from libraries/mavlink/include/common/mavlink_msg_raw_pressure.h
rename to libraries/GCS_MAVLink/include/common/mavlink_msg_raw_pressure.h
diff --git a/libraries/mavlink/include/common/mavlink_msg_rc_channels_raw.h b/libraries/GCS_MAVLink/include/common/mavlink_msg_rc_channels_raw.h
similarity index 100%
rename from libraries/mavlink/include/common/mavlink_msg_rc_channels_raw.h
rename to libraries/GCS_MAVLink/include/common/mavlink_msg_rc_channels_raw.h
diff --git a/libraries/mavlink/include/common/mavlink_msg_rc_channels_scaled.h b/libraries/GCS_MAVLink/include/common/mavlink_msg_rc_channels_scaled.h
similarity index 100%
rename from libraries/mavlink/include/common/mavlink_msg_rc_channels_scaled.h
rename to libraries/GCS_MAVLink/include/common/mavlink_msg_rc_channels_scaled.h
diff --git a/libraries/mavlink/include/common/mavlink_msg_request_data_stream.h b/libraries/GCS_MAVLink/include/common/mavlink_msg_request_data_stream.h
similarity index 100%
rename from libraries/mavlink/include/common/mavlink_msg_request_data_stream.h
rename to libraries/GCS_MAVLink/include/common/mavlink_msg_request_data_stream.h
diff --git a/libraries/mavlink/include/common/mavlink_msg_request_dynamic_gyro_calibration.h b/libraries/GCS_MAVLink/include/common/mavlink_msg_request_dynamic_gyro_calibration.h
similarity index 100%
rename from libraries/mavlink/include/common/mavlink_msg_request_dynamic_gyro_calibration.h
rename to libraries/GCS_MAVLink/include/common/mavlink_msg_request_dynamic_gyro_calibration.h
diff --git a/libraries/mavlink/include/common/mavlink_msg_request_static_calibration.h b/libraries/GCS_MAVLink/include/common/mavlink_msg_request_static_calibration.h
similarity index 100%
rename from libraries/mavlink/include/common/mavlink_msg_request_static_calibration.h
rename to libraries/GCS_MAVLink/include/common/mavlink_msg_request_static_calibration.h
diff --git a/libraries/mavlink/include/common/mavlink_msg_set_altitude.h b/libraries/GCS_MAVLink/include/common/mavlink_msg_set_altitude.h
similarity index 100%
rename from libraries/mavlink/include/common/mavlink_msg_set_altitude.h
rename to libraries/GCS_MAVLink/include/common/mavlink_msg_set_altitude.h
diff --git a/libraries/mavlink/include/common/mavlink_msg_set_mode.h b/libraries/GCS_MAVLink/include/common/mavlink_msg_set_mode.h
similarity index 100%
rename from libraries/mavlink/include/common/mavlink_msg_set_mode.h
rename to libraries/GCS_MAVLink/include/common/mavlink_msg_set_mode.h
diff --git a/libraries/mavlink/include/common/mavlink_msg_set_nav_mode.h b/libraries/GCS_MAVLink/include/common/mavlink_msg_set_nav_mode.h
similarity index 100%
rename from libraries/mavlink/include/common/mavlink_msg_set_nav_mode.h
rename to libraries/GCS_MAVLink/include/common/mavlink_msg_set_nav_mode.h
diff --git a/libraries/mavlink/include/common/mavlink_msg_state_correction.h b/libraries/GCS_MAVLink/include/common/mavlink_msg_state_correction.h
similarity index 100%
rename from libraries/mavlink/include/common/mavlink_msg_state_correction.h
rename to libraries/GCS_MAVLink/include/common/mavlink_msg_state_correction.h
diff --git a/libraries/mavlink/include/common/mavlink_msg_statustext.h b/libraries/GCS_MAVLink/include/common/mavlink_msg_statustext.h
similarity index 100%
rename from libraries/mavlink/include/common/mavlink_msg_statustext.h
rename to libraries/GCS_MAVLink/include/common/mavlink_msg_statustext.h
diff --git a/libraries/mavlink/include/common/mavlink_msg_sys_status.h b/libraries/GCS_MAVLink/include/common/mavlink_msg_sys_status.h
similarity index 100%
rename from libraries/mavlink/include/common/mavlink_msg_sys_status.h
rename to libraries/GCS_MAVLink/include/common/mavlink_msg_sys_status.h
diff --git a/libraries/mavlink/include/common/mavlink_msg_system_time.h b/libraries/GCS_MAVLink/include/common/mavlink_msg_system_time.h
similarity index 100%
rename from libraries/mavlink/include/common/mavlink_msg_system_time.h
rename to libraries/GCS_MAVLink/include/common/mavlink_msg_system_time.h
diff --git a/libraries/mavlink/include/common/mavlink_msg_waypoint.h b/libraries/GCS_MAVLink/include/common/mavlink_msg_waypoint.h
similarity index 100%
rename from libraries/mavlink/include/common/mavlink_msg_waypoint.h
rename to libraries/GCS_MAVLink/include/common/mavlink_msg_waypoint.h
diff --git a/libraries/mavlink/include/common/mavlink_msg_waypoint_ack.h b/libraries/GCS_MAVLink/include/common/mavlink_msg_waypoint_ack.h
similarity index 100%
rename from libraries/mavlink/include/common/mavlink_msg_waypoint_ack.h
rename to libraries/GCS_MAVLink/include/common/mavlink_msg_waypoint_ack.h
diff --git a/libraries/mavlink/include/common/mavlink_msg_waypoint_clear_all.h b/libraries/GCS_MAVLink/include/common/mavlink_msg_waypoint_clear_all.h
similarity index 100%
rename from libraries/mavlink/include/common/mavlink_msg_waypoint_clear_all.h
rename to libraries/GCS_MAVLink/include/common/mavlink_msg_waypoint_clear_all.h
diff --git a/libraries/mavlink/include/common/mavlink_msg_waypoint_count.h b/libraries/GCS_MAVLink/include/common/mavlink_msg_waypoint_count.h
similarity index 100%
rename from libraries/mavlink/include/common/mavlink_msg_waypoint_count.h
rename to libraries/GCS_MAVLink/include/common/mavlink_msg_waypoint_count.h
diff --git a/libraries/mavlink/include/common/mavlink_msg_waypoint_current.h b/libraries/GCS_MAVLink/include/common/mavlink_msg_waypoint_current.h
similarity index 100%
rename from libraries/mavlink/include/common/mavlink_msg_waypoint_current.h
rename to libraries/GCS_MAVLink/include/common/mavlink_msg_waypoint_current.h
diff --git a/libraries/mavlink/include/common/mavlink_msg_waypoint_reached.h b/libraries/GCS_MAVLink/include/common/mavlink_msg_waypoint_reached.h
similarity index 100%
rename from libraries/mavlink/include/common/mavlink_msg_waypoint_reached.h
rename to libraries/GCS_MAVLink/include/common/mavlink_msg_waypoint_reached.h
diff --git a/libraries/mavlink/include/common/mavlink_msg_waypoint_request.h b/libraries/GCS_MAVLink/include/common/mavlink_msg_waypoint_request.h
similarity index 100%
rename from libraries/mavlink/include/common/mavlink_msg_waypoint_request.h
rename to libraries/GCS_MAVLink/include/common/mavlink_msg_waypoint_request.h
diff --git a/libraries/mavlink/include/common/mavlink_msg_waypoint_request_list.h b/libraries/GCS_MAVLink/include/common/mavlink_msg_waypoint_request_list.h
similarity index 100%
rename from libraries/mavlink/include/common/mavlink_msg_waypoint_request_list.h
rename to libraries/GCS_MAVLink/include/common/mavlink_msg_waypoint_request_list.h
diff --git a/libraries/mavlink/include/common/mavlink_msg_waypoint_set_current.h b/libraries/GCS_MAVLink/include/common/mavlink_msg_waypoint_set_current.h
similarity index 100%
rename from libraries/mavlink/include/common/mavlink_msg_waypoint_set_current.h
rename to libraries/GCS_MAVLink/include/common/mavlink_msg_waypoint_set_current.h
diff --git a/libraries/mavlink/include/common/mavlink_msg_waypoint_set_global_reference.h b/libraries/GCS_MAVLink/include/common/mavlink_msg_waypoint_set_global_reference.h
similarity index 100%
rename from libraries/mavlink/include/common/mavlink_msg_waypoint_set_global_reference.h
rename to libraries/GCS_MAVLink/include/common/mavlink_msg_waypoint_set_global_reference.h
diff --git a/libraries/mavlink/include/documentation.dox b/libraries/GCS_MAVLink/include/documentation.dox
similarity index 100%
rename from libraries/mavlink/include/documentation.dox
rename to libraries/GCS_MAVLink/include/documentation.dox
diff --git a/libraries/mavlink/include/mavlink_types.h b/libraries/GCS_MAVLink/include/mavlink_types.h
similarity index 100%
rename from libraries/mavlink/include/mavlink_types.h
rename to libraries/GCS_MAVLink/include/mavlink_types.h
diff --git a/libraries/mavlink/include/pixhawk/mavlink.h b/libraries/GCS_MAVLink/include/pixhawk/mavlink.h
similarity index 100%
rename from libraries/mavlink/include/pixhawk/mavlink.h
rename to libraries/GCS_MAVLink/include/pixhawk/mavlink.h
diff --git a/libraries/mavlink/include/pixhawk/mavlink_msg_attitude_control.h b/libraries/GCS_MAVLink/include/pixhawk/mavlink_msg_attitude_control.h
similarity index 100%
rename from libraries/mavlink/include/pixhawk/mavlink_msg_attitude_control.h
rename to libraries/GCS_MAVLink/include/pixhawk/mavlink_msg_attitude_control.h
diff --git a/libraries/mavlink/include/pixhawk/mavlink_msg_aux_status.h b/libraries/GCS_MAVLink/include/pixhawk/mavlink_msg_aux_status.h
similarity index 100%
rename from libraries/mavlink/include/pixhawk/mavlink_msg_aux_status.h
rename to libraries/GCS_MAVLink/include/pixhawk/mavlink_msg_aux_status.h
diff --git a/libraries/mavlink/include/pixhawk/mavlink_msg_control_status.h b/libraries/GCS_MAVLink/include/pixhawk/mavlink_msg_control_status.h
similarity index 100%
rename from libraries/mavlink/include/pixhawk/mavlink_msg_control_status.h
rename to libraries/GCS_MAVLink/include/pixhawk/mavlink_msg_control_status.h
diff --git a/libraries/mavlink/include/pixhawk/mavlink_msg_debug_vect.h b/libraries/GCS_MAVLink/include/pixhawk/mavlink_msg_debug_vect.h
similarity index 100%
rename from libraries/mavlink/include/pixhawk/mavlink_msg_debug_vect.h
rename to libraries/GCS_MAVLink/include/pixhawk/mavlink_msg_debug_vect.h
diff --git a/libraries/mavlink/include/pixhawk/mavlink_msg_image_available.h b/libraries/GCS_MAVLink/include/pixhawk/mavlink_msg_image_available.h
similarity index 100%
rename from libraries/mavlink/include/pixhawk/mavlink_msg_image_available.h
rename to libraries/GCS_MAVLink/include/pixhawk/mavlink_msg_image_available.h
diff --git a/libraries/mavlink/include/pixhawk/mavlink_msg_image_trigger_control.h b/libraries/GCS_MAVLink/include/pixhawk/mavlink_msg_image_trigger_control.h
similarity index 100%
rename from libraries/mavlink/include/pixhawk/mavlink_msg_image_trigger_control.h
rename to libraries/GCS_MAVLink/include/pixhawk/mavlink_msg_image_trigger_control.h
diff --git a/libraries/mavlink/include/pixhawk/mavlink_msg_image_triggered.h b/libraries/GCS_MAVLink/include/pixhawk/mavlink_msg_image_triggered.h
similarity index 100%
rename from libraries/mavlink/include/pixhawk/mavlink_msg_image_triggered.h
rename to libraries/GCS_MAVLink/include/pixhawk/mavlink_msg_image_triggered.h
diff --git a/libraries/mavlink/include/pixhawk/mavlink_msg_manual_control.h b/libraries/GCS_MAVLink/include/pixhawk/mavlink_msg_manual_control.h
similarity index 100%
rename from libraries/mavlink/include/pixhawk/mavlink_msg_manual_control.h
rename to libraries/GCS_MAVLink/include/pixhawk/mavlink_msg_manual_control.h
diff --git a/libraries/mavlink/include/pixhawk/mavlink_msg_marker.h b/libraries/GCS_MAVLink/include/pixhawk/mavlink_msg_marker.h
similarity index 100%
rename from libraries/mavlink/include/pixhawk/mavlink_msg_marker.h
rename to libraries/GCS_MAVLink/include/pixhawk/mavlink_msg_marker.h
diff --git a/libraries/mavlink/include/pixhawk/mavlink_msg_pattern_detected.h b/libraries/GCS_MAVLink/include/pixhawk/mavlink_msg_pattern_detected.h
similarity index 100%
rename from libraries/mavlink/include/pixhawk/mavlink_msg_pattern_detected.h
rename to libraries/GCS_MAVLink/include/pixhawk/mavlink_msg_pattern_detected.h
diff --git a/libraries/mavlink/include/pixhawk/mavlink_msg_position_control_offset_set.h b/libraries/GCS_MAVLink/include/pixhawk/mavlink_msg_position_control_offset_set.h
similarity index 100%
rename from libraries/mavlink/include/pixhawk/mavlink_msg_position_control_offset_set.h
rename to libraries/GCS_MAVLink/include/pixhawk/mavlink_msg_position_control_offset_set.h
diff --git a/libraries/mavlink/include/pixhawk/mavlink_msg_position_control_setpoint.h b/libraries/GCS_MAVLink/include/pixhawk/mavlink_msg_position_control_setpoint.h
similarity index 100%
rename from libraries/mavlink/include/pixhawk/mavlink_msg_position_control_setpoint.h
rename to libraries/GCS_MAVLink/include/pixhawk/mavlink_msg_position_control_setpoint.h
diff --git a/libraries/mavlink/include/pixhawk/mavlink_msg_position_control_setpoint_set.h b/libraries/GCS_MAVLink/include/pixhawk/mavlink_msg_position_control_setpoint_set.h
similarity index 100%
rename from libraries/mavlink/include/pixhawk/mavlink_msg_position_control_setpoint_set.h
rename to libraries/GCS_MAVLink/include/pixhawk/mavlink_msg_position_control_setpoint_set.h
diff --git a/libraries/mavlink/include/pixhawk/mavlink_msg_raw_aux.h b/libraries/GCS_MAVLink/include/pixhawk/mavlink_msg_raw_aux.h
similarity index 100%
rename from libraries/mavlink/include/pixhawk/mavlink_msg_raw_aux.h
rename to libraries/GCS_MAVLink/include/pixhawk/mavlink_msg_raw_aux.h
diff --git a/libraries/mavlink/include/pixhawk/mavlink_msg_request_data_stream.h b/libraries/GCS_MAVLink/include/pixhawk/mavlink_msg_request_data_stream.h
similarity index 100%
rename from libraries/mavlink/include/pixhawk/mavlink_msg_request_data_stream.h
rename to libraries/GCS_MAVLink/include/pixhawk/mavlink_msg_request_data_stream.h
diff --git a/libraries/mavlink/include/pixhawk/mavlink_msg_request_dynamic_gyro_calibration.h b/libraries/GCS_MAVLink/include/pixhawk/mavlink_msg_request_dynamic_gyro_calibration.h
similarity index 100%
rename from libraries/mavlink/include/pixhawk/mavlink_msg_request_dynamic_gyro_calibration.h
rename to libraries/GCS_MAVLink/include/pixhawk/mavlink_msg_request_dynamic_gyro_calibration.h
diff --git a/libraries/mavlink/include/pixhawk/mavlink_msg_request_static_calibration.h b/libraries/GCS_MAVLink/include/pixhawk/mavlink_msg_request_static_calibration.h
similarity index 100%
rename from libraries/mavlink/include/pixhawk/mavlink_msg_request_static_calibration.h
rename to libraries/GCS_MAVLink/include/pixhawk/mavlink_msg_request_static_calibration.h
diff --git a/libraries/mavlink/include/pixhawk/mavlink_msg_set_altitude.h b/libraries/GCS_MAVLink/include/pixhawk/mavlink_msg_set_altitude.h
similarity index 100%
rename from libraries/mavlink/include/pixhawk/mavlink_msg_set_altitude.h
rename to libraries/GCS_MAVLink/include/pixhawk/mavlink_msg_set_altitude.h
diff --git a/libraries/mavlink/include/pixhawk/mavlink_msg_set_cam_shutter.h b/libraries/GCS_MAVLink/include/pixhawk/mavlink_msg_set_cam_shutter.h
similarity index 100%
rename from libraries/mavlink/include/pixhawk/mavlink_msg_set_cam_shutter.h
rename to libraries/GCS_MAVLink/include/pixhawk/mavlink_msg_set_cam_shutter.h
diff --git a/libraries/mavlink/include/pixhawk/mavlink_msg_vicon_position_estimate.h b/libraries/GCS_MAVLink/include/pixhawk/mavlink_msg_vicon_position_estimate.h
similarity index 100%
rename from libraries/mavlink/include/pixhawk/mavlink_msg_vicon_position_estimate.h
rename to libraries/GCS_MAVLink/include/pixhawk/mavlink_msg_vicon_position_estimate.h
diff --git a/libraries/mavlink/include/pixhawk/mavlink_msg_vision_position_estimate.h b/libraries/GCS_MAVLink/include/pixhawk/mavlink_msg_vision_position_estimate.h
similarity index 100%
rename from libraries/mavlink/include/pixhawk/mavlink_msg_vision_position_estimate.h
rename to libraries/GCS_MAVLink/include/pixhawk/mavlink_msg_vision_position_estimate.h
diff --git a/libraries/mavlink/include/pixhawk/mavlink_msg_watchdog_command.h b/libraries/GCS_MAVLink/include/pixhawk/mavlink_msg_watchdog_command.h
similarity index 100%
rename from libraries/mavlink/include/pixhawk/mavlink_msg_watchdog_command.h
rename to libraries/GCS_MAVLink/include/pixhawk/mavlink_msg_watchdog_command.h
diff --git a/libraries/mavlink/include/pixhawk/mavlink_msg_watchdog_heartbeat.h b/libraries/GCS_MAVLink/include/pixhawk/mavlink_msg_watchdog_heartbeat.h
similarity index 100%
rename from libraries/mavlink/include/pixhawk/mavlink_msg_watchdog_heartbeat.h
rename to libraries/GCS_MAVLink/include/pixhawk/mavlink_msg_watchdog_heartbeat.h
diff --git a/libraries/mavlink/include/pixhawk/mavlink_msg_watchdog_process_info.h b/libraries/GCS_MAVLink/include/pixhawk/mavlink_msg_watchdog_process_info.h
similarity index 100%
rename from libraries/mavlink/include/pixhawk/mavlink_msg_watchdog_process_info.h
rename to libraries/GCS_MAVLink/include/pixhawk/mavlink_msg_watchdog_process_info.h
diff --git a/libraries/mavlink/include/pixhawk/mavlink_msg_watchdog_process_status.h b/libraries/GCS_MAVLink/include/pixhawk/mavlink_msg_watchdog_process_status.h
similarity index 100%
rename from libraries/mavlink/include/pixhawk/mavlink_msg_watchdog_process_status.h
rename to libraries/GCS_MAVLink/include/pixhawk/mavlink_msg_watchdog_process_status.h
diff --git a/libraries/mavlink/include/pixhawk/pixhawk.h b/libraries/GCS_MAVLink/include/pixhawk/pixhawk.h
similarity index 100%
rename from libraries/mavlink/include/pixhawk/pixhawk.h
rename to libraries/GCS_MAVLink/include/pixhawk/pixhawk.h
diff --git a/libraries/mavlink/include/protocol.h b/libraries/GCS_MAVLink/include/protocol.h
similarity index 100%
rename from libraries/mavlink/include/protocol.h
rename to libraries/GCS_MAVLink/include/protocol.h
diff --git a/libraries/mavlink/include/slugs/mavlink.h b/libraries/GCS_MAVLink/include/slugs/mavlink.h
similarity index 100%
rename from libraries/mavlink/include/slugs/mavlink.h
rename to libraries/GCS_MAVLink/include/slugs/mavlink.h
diff --git a/libraries/mavlink/include/slugs/mavlink_msg_air_data.h b/libraries/GCS_MAVLink/include/slugs/mavlink_msg_air_data.h
similarity index 100%
rename from libraries/mavlink/include/slugs/mavlink_msg_air_data.h
rename to libraries/GCS_MAVLink/include/slugs/mavlink_msg_air_data.h
diff --git a/libraries/mavlink/include/slugs/mavlink_msg_cpu_load.h b/libraries/GCS_MAVLink/include/slugs/mavlink_msg_cpu_load.h
similarity index 100%
rename from libraries/mavlink/include/slugs/mavlink_msg_cpu_load.h
rename to libraries/GCS_MAVLink/include/slugs/mavlink_msg_cpu_load.h
diff --git a/libraries/mavlink/include/slugs/mavlink_msg_diagnostic.h b/libraries/GCS_MAVLink/include/slugs/mavlink_msg_diagnostic.h
similarity index 100%
rename from libraries/mavlink/include/slugs/mavlink_msg_diagnostic.h
rename to libraries/GCS_MAVLink/include/slugs/mavlink_msg_diagnostic.h
diff --git a/libraries/mavlink/include/slugs/mavlink_msg_pilot_console.h b/libraries/GCS_MAVLink/include/slugs/mavlink_msg_pilot_console.h
similarity index 100%
rename from libraries/mavlink/include/slugs/mavlink_msg_pilot_console.h
rename to libraries/GCS_MAVLink/include/slugs/mavlink_msg_pilot_console.h
diff --git a/libraries/mavlink/include/slugs/mavlink_msg_pwm_commands.h b/libraries/GCS_MAVLink/include/slugs/mavlink_msg_pwm_commands.h
similarity index 100%
rename from libraries/mavlink/include/slugs/mavlink_msg_pwm_commands.h
rename to libraries/GCS_MAVLink/include/slugs/mavlink_msg_pwm_commands.h
diff --git a/libraries/mavlink/include/slugs/mavlink_msg_sensor_bias.h b/libraries/GCS_MAVLink/include/slugs/mavlink_msg_sensor_bias.h
similarity index 100%
rename from libraries/mavlink/include/slugs/mavlink_msg_sensor_bias.h
rename to libraries/GCS_MAVLink/include/slugs/mavlink_msg_sensor_bias.h
diff --git a/libraries/mavlink/include/slugs/slugs.h b/libraries/GCS_MAVLink/include/slugs/slugs.h
similarity index 100%
rename from libraries/mavlink/include/slugs/slugs.h
rename to libraries/GCS_MAVLink/include/slugs/slugs.h
diff --git a/libraries/mavlink/include/ualberta/mavlink.h b/libraries/GCS_MAVLink/include/ualberta/mavlink.h
similarity index 100%
rename from libraries/mavlink/include/ualberta/mavlink.h
rename to libraries/GCS_MAVLink/include/ualberta/mavlink.h
diff --git a/libraries/mavlink/include/ualberta/mavlink_msg_nav_filter_bias.h b/libraries/GCS_MAVLink/include/ualberta/mavlink_msg_nav_filter_bias.h
similarity index 100%
rename from libraries/mavlink/include/ualberta/mavlink_msg_nav_filter_bias.h
rename to libraries/GCS_MAVLink/include/ualberta/mavlink_msg_nav_filter_bias.h
diff --git a/libraries/mavlink/include/ualberta/mavlink_msg_radio_calibration.h b/libraries/GCS_MAVLink/include/ualberta/mavlink_msg_radio_calibration.h
similarity index 100%
rename from libraries/mavlink/include/ualberta/mavlink_msg_radio_calibration.h
rename to libraries/GCS_MAVLink/include/ualberta/mavlink_msg_radio_calibration.h
diff --git a/libraries/mavlink/include/ualberta/mavlink_msg_request_radio_calibration.h b/libraries/GCS_MAVLink/include/ualberta/mavlink_msg_request_radio_calibration.h
similarity index 100%
rename from libraries/mavlink/include/ualberta/mavlink_msg_request_radio_calibration.h
rename to libraries/GCS_MAVLink/include/ualberta/mavlink_msg_request_radio_calibration.h
diff --git a/libraries/mavlink/include/ualberta/mavlink_msg_request_rc_channels.h b/libraries/GCS_MAVLink/include/ualberta/mavlink_msg_request_rc_channels.h
similarity index 100%
rename from libraries/mavlink/include/ualberta/mavlink_msg_request_rc_channels.h
rename to libraries/GCS_MAVLink/include/ualberta/mavlink_msg_request_rc_channels.h
diff --git a/libraries/mavlink/include/ualberta/ualberta.h b/libraries/GCS_MAVLink/include/ualberta/ualberta.h
similarity index 100%
rename from libraries/mavlink/include/ualberta/ualberta.h
rename to libraries/GCS_MAVLink/include/ualberta/ualberta.h
diff --git a/libraries/mavlink/message_definitions/ardupilotmega.xml b/libraries/GCS_MAVLink/message_definitions/ardupilotmega.xml
similarity index 100%
rename from libraries/mavlink/message_definitions/ardupilotmega.xml
rename to libraries/GCS_MAVLink/message_definitions/ardupilotmega.xml
diff --git a/libraries/mavlink/message_definitions/common.xml b/libraries/GCS_MAVLink/message_definitions/common.xml
similarity index 100%
rename from libraries/mavlink/message_definitions/common.xml
rename to libraries/GCS_MAVLink/message_definitions/common.xml
diff --git a/libraries/mavlink/message_definitions/mavlink_standard_proposal.xml b/libraries/GCS_MAVLink/message_definitions/mavlink_standard_proposal.xml
similarity index 100%
rename from libraries/mavlink/message_definitions/mavlink_standard_proposal.xml
rename to libraries/GCS_MAVLink/message_definitions/mavlink_standard_proposal.xml
diff --git a/libraries/mavlink/message_definitions/pixhawk.xml b/libraries/GCS_MAVLink/message_definitions/pixhawk.xml
similarity index 100%
rename from libraries/mavlink/message_definitions/pixhawk.xml
rename to libraries/GCS_MAVLink/message_definitions/pixhawk.xml
diff --git a/libraries/mavlink/message_definitions/slugs.xml b/libraries/GCS_MAVLink/message_definitions/slugs.xml
similarity index 100%
rename from libraries/mavlink/message_definitions/slugs.xml
rename to libraries/GCS_MAVLink/message_definitions/slugs.xml
diff --git a/libraries/mavlink/message_definitions/ualberta.xml b/libraries/GCS_MAVLink/message_definitions/ualberta.xml
similarity index 100%
rename from libraries/mavlink/message_definitions/ualberta.xml
rename to libraries/GCS_MAVLink/message_definitions/ualberta.xml