diff --git a/APMrover2/AP_Arming.cpp b/Rover/AP_Arming.cpp
similarity index 100%
rename from APMrover2/AP_Arming.cpp
rename to Rover/AP_Arming.cpp
diff --git a/APMrover2/AP_Arming.h b/Rover/AP_Arming.h
similarity index 100%
rename from APMrover2/AP_Arming.h
rename to Rover/AP_Arming.h
diff --git a/APMrover2/AP_MotorsUGV.cpp b/Rover/AP_MotorsUGV.cpp
similarity index 100%
rename from APMrover2/AP_MotorsUGV.cpp
rename to Rover/AP_MotorsUGV.cpp
diff --git a/APMrover2/AP_MotorsUGV.h b/Rover/AP_MotorsUGV.h
similarity index 100%
rename from APMrover2/AP_MotorsUGV.h
rename to Rover/AP_MotorsUGV.h
diff --git a/APMrover2/AP_Rally.cpp b/Rover/AP_Rally.cpp
similarity index 100%
rename from APMrover2/AP_Rally.cpp
rename to Rover/AP_Rally.cpp
diff --git a/APMrover2/AP_Rally.h b/Rover/AP_Rally.h
similarity index 100%
rename from APMrover2/AP_Rally.h
rename to Rover/AP_Rally.h
diff --git a/APMrover2/GCS_Mavlink.cpp b/Rover/GCS_Mavlink.cpp
similarity index 100%
rename from APMrover2/GCS_Mavlink.cpp
rename to Rover/GCS_Mavlink.cpp
diff --git a/APMrover2/GCS_Mavlink.h b/Rover/GCS_Mavlink.h
similarity index 100%
rename from APMrover2/GCS_Mavlink.h
rename to Rover/GCS_Mavlink.h
diff --git a/APMrover2/GCS_Rover.cpp b/Rover/GCS_Rover.cpp
similarity index 100%
rename from APMrover2/GCS_Rover.cpp
rename to Rover/GCS_Rover.cpp
diff --git a/APMrover2/GCS_Rover.h b/Rover/GCS_Rover.h
similarity index 100%
rename from APMrover2/GCS_Rover.h
rename to Rover/GCS_Rover.h
diff --git a/APMrover2/Log.cpp b/Rover/Log.cpp
similarity index 100%
rename from APMrover2/Log.cpp
rename to Rover/Log.cpp
diff --git a/APMrover2/Makefile.waf b/Rover/Makefile.waf
similarity index 100%
rename from APMrover2/Makefile.waf
rename to Rover/Makefile.waf
diff --git a/APMrover2/Parameters.cpp b/Rover/Parameters.cpp
similarity index 100%
rename from APMrover2/Parameters.cpp
rename to Rover/Parameters.cpp
diff --git a/APMrover2/Parameters.h b/Rover/Parameters.h
similarity index 100%
rename from APMrover2/Parameters.h
rename to Rover/Parameters.h
diff --git a/APMrover2/RC_Channel.cpp b/Rover/RC_Channel.cpp
similarity index 100%
rename from APMrover2/RC_Channel.cpp
rename to Rover/RC_Channel.cpp
diff --git a/APMrover2/RC_Channel.h b/Rover/RC_Channel.h
similarity index 100%
rename from APMrover2/RC_Channel.h
rename to Rover/RC_Channel.h
diff --git a/APMrover2/Rover.cpp b/Rover/Rover.cpp
similarity index 100%
rename from APMrover2/Rover.cpp
rename to Rover/Rover.cpp
diff --git a/APMrover2/Rover.h b/Rover/Rover.h
similarity index 100%
rename from APMrover2/Rover.h
rename to Rover/Rover.h
diff --git a/APMrover2/Steering.cpp b/Rover/Steering.cpp
similarity index 100%
rename from APMrover2/Steering.cpp
rename to Rover/Steering.cpp
diff --git a/APMrover2/afs_rover.cpp b/Rover/afs_rover.cpp
similarity index 100%
rename from APMrover2/afs_rover.cpp
rename to Rover/afs_rover.cpp
diff --git a/APMrover2/afs_rover.h b/Rover/afs_rover.h
similarity index 100%
rename from APMrover2/afs_rover.h
rename to Rover/afs_rover.h
diff --git a/APMrover2/balance_bot.cpp b/Rover/balance_bot.cpp
similarity index 100%
rename from APMrover2/balance_bot.cpp
rename to Rover/balance_bot.cpp
diff --git a/APMrover2/commands.cpp b/Rover/commands.cpp
similarity index 100%
rename from APMrover2/commands.cpp
rename to Rover/commands.cpp
diff --git a/APMrover2/compat.cpp b/Rover/compat.cpp
similarity index 100%
rename from APMrover2/compat.cpp
rename to Rover/compat.cpp
diff --git a/APMrover2/config.h b/Rover/config.h
similarity index 100%
rename from APMrover2/config.h
rename to Rover/config.h
diff --git a/APMrover2/crash_check.cpp b/Rover/crash_check.cpp
similarity index 100%
rename from APMrover2/crash_check.cpp
rename to Rover/crash_check.cpp
diff --git a/APMrover2/createTags b/Rover/createTags
similarity index 100%
rename from APMrover2/createTags
rename to Rover/createTags
diff --git a/APMrover2/cruise_learn.cpp b/Rover/cruise_learn.cpp
similarity index 100%
rename from APMrover2/cruise_learn.cpp
rename to Rover/cruise_learn.cpp
diff --git a/APMrover2/defines.h b/Rover/defines.h
similarity index 100%
rename from APMrover2/defines.h
rename to Rover/defines.h
diff --git a/APMrover2/ekf_check.cpp b/Rover/ekf_check.cpp
similarity index 100%
rename from APMrover2/ekf_check.cpp
rename to Rover/ekf_check.cpp
diff --git a/APMrover2/failsafe.cpp b/Rover/failsafe.cpp
similarity index 100%
rename from APMrover2/failsafe.cpp
rename to Rover/failsafe.cpp
diff --git a/APMrover2/fence.cpp b/Rover/fence.cpp
similarity index 100%
rename from APMrover2/fence.cpp
rename to Rover/fence.cpp
diff --git a/APMrover2/mode.cpp b/Rover/mode.cpp
similarity index 100%
rename from APMrover2/mode.cpp
rename to Rover/mode.cpp
diff --git a/APMrover2/mode.h b/Rover/mode.h
similarity index 100%
rename from APMrover2/mode.h
rename to Rover/mode.h
diff --git a/APMrover2/mode_acro.cpp b/Rover/mode_acro.cpp
similarity index 100%
rename from APMrover2/mode_acro.cpp
rename to Rover/mode_acro.cpp
diff --git a/APMrover2/mode_auto.cpp b/Rover/mode_auto.cpp
similarity index 100%
rename from APMrover2/mode_auto.cpp
rename to Rover/mode_auto.cpp
diff --git a/APMrover2/mode_follow.cpp b/Rover/mode_follow.cpp
similarity index 100%
rename from APMrover2/mode_follow.cpp
rename to Rover/mode_follow.cpp
diff --git a/APMrover2/mode_guided.cpp b/Rover/mode_guided.cpp
similarity index 100%
rename from APMrover2/mode_guided.cpp
rename to Rover/mode_guided.cpp
diff --git a/APMrover2/mode_hold.cpp b/Rover/mode_hold.cpp
similarity index 100%
rename from APMrover2/mode_hold.cpp
rename to Rover/mode_hold.cpp
diff --git a/APMrover2/mode_loiter.cpp b/Rover/mode_loiter.cpp
similarity index 100%
rename from APMrover2/mode_loiter.cpp
rename to Rover/mode_loiter.cpp
diff --git a/APMrover2/mode_manual.cpp b/Rover/mode_manual.cpp
similarity index 100%
rename from APMrover2/mode_manual.cpp
rename to Rover/mode_manual.cpp
diff --git a/APMrover2/mode_rtl.cpp b/Rover/mode_rtl.cpp
similarity index 100%
rename from APMrover2/mode_rtl.cpp
rename to Rover/mode_rtl.cpp
diff --git a/APMrover2/mode_simple.cpp b/Rover/mode_simple.cpp
similarity index 100%
rename from APMrover2/mode_simple.cpp
rename to Rover/mode_simple.cpp
diff --git a/APMrover2/mode_smart_rtl.cpp b/Rover/mode_smart_rtl.cpp
similarity index 100%
rename from APMrover2/mode_smart_rtl.cpp
rename to Rover/mode_smart_rtl.cpp
diff --git a/APMrover2/mode_steering.cpp b/Rover/mode_steering.cpp
similarity index 100%
rename from APMrover2/mode_steering.cpp
rename to Rover/mode_steering.cpp
diff --git a/APMrover2/motor_test.cpp b/Rover/motor_test.cpp
similarity index 100%
rename from APMrover2/motor_test.cpp
rename to Rover/motor_test.cpp
diff --git a/APMrover2/radio.cpp b/Rover/radio.cpp
similarity index 100%
rename from APMrover2/radio.cpp
rename to Rover/radio.cpp
diff --git a/APMrover2/release-notes.txt b/Rover/release-notes.txt
similarity index 100%
rename from APMrover2/release-notes.txt
rename to Rover/release-notes.txt
diff --git a/APMrover2/sailboat.cpp b/Rover/sailboat.cpp
similarity index 100%
rename from APMrover2/sailboat.cpp
rename to Rover/sailboat.cpp
diff --git a/APMrover2/sailboat.h b/Rover/sailboat.h
similarity index 100%
rename from APMrover2/sailboat.h
rename to Rover/sailboat.h
diff --git a/APMrover2/sensors.cpp b/Rover/sensors.cpp
similarity index 100%
rename from APMrover2/sensors.cpp
rename to Rover/sensors.cpp
diff --git a/APMrover2/system.cpp b/Rover/system.cpp
similarity index 100%
rename from APMrover2/system.cpp
rename to Rover/system.cpp
diff --git a/APMrover2/version.cpp b/Rover/version.cpp
similarity index 100%
rename from APMrover2/version.cpp
rename to Rover/version.cpp
diff --git a/APMrover2/version.h b/Rover/version.h
similarity index 100%
rename from APMrover2/version.h
rename to Rover/version.h
diff --git a/APMrover2/wscript b/Rover/wscript
similarity index 100%
rename from APMrover2/wscript
rename to Rover/wscript