diff --git a/ArduCopterMega/.cproject b/ArduCopter/.cproject
similarity index 100%
rename from ArduCopterMega/.cproject
rename to ArduCopter/.cproject
diff --git a/ArduCopterMega/.project b/ArduCopter/.project
similarity index 100%
rename from ArduCopterMega/.project
rename to ArduCopter/.project
diff --git a/ArduCopterMega/APM_Config.h b/ArduCopter/APM_Config.h
similarity index 100%
rename from ArduCopterMega/APM_Config.h
rename to ArduCopter/APM_Config.h
diff --git a/ArduCopterMega/APM_Config.h.reference b/ArduCopter/APM_Config.h.reference
similarity index 100%
rename from ArduCopterMega/APM_Config.h.reference
rename to ArduCopter/APM_Config.h.reference
diff --git a/ArduCopterMega/APM_Config_mavlink_hil.h b/ArduCopter/APM_Config_mavlink_hil.h
similarity index 100%
rename from ArduCopterMega/APM_Config_mavlink_hil.h
rename to ArduCopter/APM_Config_mavlink_hil.h
diff --git a/ArduCopterMega/APM_Config_xplane.h b/ArduCopter/APM_Config_xplane.h
similarity index 100%
rename from ArduCopterMega/APM_Config_xplane.h
rename to ArduCopter/APM_Config_xplane.h
diff --git a/ArduCopterMega/ArduCopterMega.pde b/ArduCopter/ArduCopterMega.pde
similarity index 100%
rename from ArduCopterMega/ArduCopterMega.pde
rename to ArduCopter/ArduCopterMega.pde
diff --git a/ArduCopterMega/Attitude.pde b/ArduCopter/Attitude.pde
similarity index 100%
rename from ArduCopterMega/Attitude.pde
rename to ArduCopter/Attitude.pde
diff --git a/ArduCopterMega/Camera.pde b/ArduCopter/Camera.pde
similarity index 100%
rename from ArduCopterMega/Camera.pde
rename to ArduCopter/Camera.pde
diff --git a/ArduCopterMega/GCS.h b/ArduCopter/GCS.h
similarity index 100%
rename from ArduCopterMega/GCS.h
rename to ArduCopter/GCS.h
diff --git a/ArduCopterMega/GCS.pde b/ArduCopter/GCS.pde
similarity index 100%
rename from ArduCopterMega/GCS.pde
rename to ArduCopter/GCS.pde
diff --git a/ArduCopterMega/GCS_Ardupilot.pde b/ArduCopter/GCS_Ardupilot.pde
similarity index 100%
rename from ArduCopterMega/GCS_Ardupilot.pde
rename to ArduCopter/GCS_Ardupilot.pde
diff --git a/ArduCopterMega/GCS_IMU_ouput.pde b/ArduCopter/GCS_IMU_ouput.pde
similarity index 100%
rename from ArduCopterMega/GCS_IMU_ouput.pde
rename to ArduCopter/GCS_IMU_ouput.pde
diff --git a/ArduCopterMega/GCS_Jason_text.pde b/ArduCopter/GCS_Jason_text.pde
similarity index 100%
rename from ArduCopterMega/GCS_Jason_text.pde
rename to ArduCopter/GCS_Jason_text.pde
diff --git a/ArduCopterMega/GCS_Mavlink.pde b/ArduCopter/GCS_Mavlink.pde
similarity index 100%
rename from ArduCopterMega/GCS_Mavlink.pde
rename to ArduCopter/GCS_Mavlink.pde
diff --git a/ArduCopterMega/GCS_Standard.pde b/ArduCopter/GCS_Standard.pde
similarity index 100%
rename from ArduCopterMega/GCS_Standard.pde
rename to ArduCopter/GCS_Standard.pde
diff --git a/ArduCopterMega/GCS_Xplane.pde b/ArduCopter/GCS_Xplane.pde
similarity index 100%
rename from ArduCopterMega/GCS_Xplane.pde
rename to ArduCopter/GCS_Xplane.pde
diff --git a/ArduCopterMega/HIL.h b/ArduCopter/HIL.h
similarity index 100%
rename from ArduCopterMega/HIL.h
rename to ArduCopter/HIL.h
diff --git a/ArduCopterMega/HIL_Xplane.pde b/ArduCopter/HIL_Xplane.pde
similarity index 100%
rename from ArduCopterMega/HIL_Xplane.pde
rename to ArduCopter/HIL_Xplane.pde
diff --git a/ArduCopterMega/Log.pde b/ArduCopter/Log.pde
similarity index 100%
rename from ArduCopterMega/Log.pde
rename to ArduCopter/Log.pde
diff --git a/ArduCopterMega/Makefile b/ArduCopter/Makefile
similarity index 100%
rename from ArduCopterMega/Makefile
rename to ArduCopter/Makefile
diff --git a/ArduCopterMega/Mavlink_Common.h b/ArduCopter/Mavlink_Common.h
similarity index 100%
rename from ArduCopterMega/Mavlink_Common.h
rename to ArduCopter/Mavlink_Common.h
diff --git a/ArduCopterMega/Parameters.h b/ArduCopter/Parameters.h
similarity index 100%
rename from ArduCopterMega/Parameters.h
rename to ArduCopter/Parameters.h
diff --git a/ArduCopterMega/command description.txt b/ArduCopter/command description.txt
similarity index 100%
rename from ArduCopterMega/command description.txt
rename to ArduCopter/command description.txt
diff --git a/ArduCopterMega/commands.pde b/ArduCopter/commands.pde
similarity index 100%
rename from ArduCopterMega/commands.pde
rename to ArduCopter/commands.pde
diff --git a/ArduCopterMega/commands_logic.pde b/ArduCopter/commands_logic.pde
similarity index 100%
rename from ArduCopterMega/commands_logic.pde
rename to ArduCopter/commands_logic.pde
diff --git a/ArduCopterMega/commands_process.pde b/ArduCopter/commands_process.pde
similarity index 100%
rename from ArduCopterMega/commands_process.pde
rename to ArduCopter/commands_process.pde
diff --git a/ArduCopterMega/config.h b/ArduCopter/config.h
similarity index 100%
rename from ArduCopterMega/config.h
rename to ArduCopter/config.h
diff --git a/ArduCopterMega/control_modes.pde b/ArduCopter/control_modes.pde
similarity index 100%
rename from ArduCopterMega/control_modes.pde
rename to ArduCopter/control_modes.pde
diff --git a/ArduCopterMega/defines.h b/ArduCopter/defines.h
similarity index 100%
rename from ArduCopterMega/defines.h
rename to ArduCopter/defines.h
diff --git a/ArduCopterMega/events.pde b/ArduCopter/events.pde
similarity index 100%
rename from ArduCopterMega/events.pde
rename to ArduCopter/events.pde
diff --git a/ArduCopterMega/flight_control.pde b/ArduCopter/flight_control.pde
similarity index 100%
rename from ArduCopterMega/flight_control.pde
rename to ArduCopter/flight_control.pde
diff --git a/ArduCopterMega/flip.pde b/ArduCopter/flip.pde
similarity index 100%
rename from ArduCopterMega/flip.pde
rename to ArduCopter/flip.pde
diff --git a/ArduCopterMega/heli.pde b/ArduCopter/heli.pde
similarity index 100%
rename from ArduCopterMega/heli.pde
rename to ArduCopter/heli.pde
diff --git a/ArduCopterMega/leds.pde b/ArduCopter/leds.pde
similarity index 100%
rename from ArduCopterMega/leds.pde
rename to ArduCopter/leds.pde
diff --git a/ArduCopterMega/motors.pde b/ArduCopter/motors.pde
similarity index 100%
rename from ArduCopterMega/motors.pde
rename to ArduCopter/motors.pde
diff --git a/ArduCopterMega/motors_hexa.pde b/ArduCopter/motors_hexa.pde
similarity index 100%
rename from ArduCopterMega/motors_hexa.pde
rename to ArduCopter/motors_hexa.pde
diff --git a/ArduCopterMega/motors_octa.pde b/ArduCopter/motors_octa.pde
similarity index 100%
rename from ArduCopterMega/motors_octa.pde
rename to ArduCopter/motors_octa.pde
diff --git a/ArduCopterMega/motors_octa_quad.pde b/ArduCopter/motors_octa_quad.pde
similarity index 100%
rename from ArduCopterMega/motors_octa_quad.pde
rename to ArduCopter/motors_octa_quad.pde
diff --git a/ArduCopterMega/motors_quad.pde b/ArduCopter/motors_quad.pde
similarity index 100%
rename from ArduCopterMega/motors_quad.pde
rename to ArduCopter/motors_quad.pde
diff --git a/ArduCopterMega/motors_tri.pde b/ArduCopter/motors_tri.pde
similarity index 100%
rename from ArduCopterMega/motors_tri.pde
rename to ArduCopter/motors_tri.pde
diff --git a/ArduCopterMega/motors_y6.pde b/ArduCopter/motors_y6.pde
similarity index 100%
rename from ArduCopterMega/motors_y6.pde
rename to ArduCopter/motors_y6.pde
diff --git a/ArduCopterMega/navigation.pde b/ArduCopter/navigation.pde
similarity index 100%
rename from ArduCopterMega/navigation.pde
rename to ArduCopter/navigation.pde
diff --git a/ArduCopterMega/planner.pde b/ArduCopter/planner.pde
similarity index 100%
rename from ArduCopterMega/planner.pde
rename to ArduCopter/planner.pde
diff --git a/ArduCopterMega/radio.pde b/ArduCopter/radio.pde
similarity index 100%
rename from ArduCopterMega/radio.pde
rename to ArduCopter/radio.pde
diff --git a/ArduCopterMega/read_commands.pde b/ArduCopter/read_commands.pde
similarity index 100%
rename from ArduCopterMega/read_commands.pde
rename to ArduCopter/read_commands.pde
diff --git a/ArduCopterMega/read_me.text b/ArduCopter/read_me.text
similarity index 100%
rename from ArduCopterMega/read_me.text
rename to ArduCopter/read_me.text
diff --git a/ArduCopterMega/sensors.pde b/ArduCopter/sensors.pde
similarity index 100%
rename from ArduCopterMega/sensors.pde
rename to ArduCopter/sensors.pde
diff --git a/ArduCopterMega/setup.pde b/ArduCopter/setup.pde
similarity index 100%
rename from ArduCopterMega/setup.pde
rename to ArduCopter/setup.pde
diff --git a/ArduCopterMega/system.pde b/ArduCopter/system.pde
similarity index 100%
rename from ArduCopterMega/system.pde
rename to ArduCopter/system.pde
diff --git a/ArduCopterMega/test.pde b/ArduCopter/test.pde
similarity index 100%
rename from ArduCopterMega/test.pde
rename to ArduCopter/test.pde
diff --git a/ArducopterNG/ArduUser.h b/archive/ArducopterNG/ArduUser.h
similarity index 100%
rename from ArducopterNG/ArduUser.h
rename to archive/ArducopterNG/ArduUser.h
diff --git a/ArducopterNG/Arducopter.h b/archive/ArducopterNG/Arducopter.h
similarity index 100%
rename from ArducopterNG/Arducopter.h
rename to archive/ArducopterNG/Arducopter.h
diff --git a/ArducopterNG/ArducopterNG.pde b/archive/ArducopterNG/ArducopterNG.pde
similarity index 100%
rename from ArducopterNG/ArducopterNG.pde
rename to archive/ArducopterNG/ArducopterNG.pde
diff --git a/ArducopterNG/Attitude.pde b/archive/ArducopterNG/Attitude.pde
similarity index 100%
rename from ArducopterNG/Attitude.pde
rename to archive/ArducopterNG/Attitude.pde
diff --git a/ArducopterNG/CLI.pde b/archive/ArducopterNG/CLI.pde
similarity index 100%
rename from ArducopterNG/CLI.pde
rename to archive/ArducopterNG/CLI.pde
diff --git a/ArducopterNG/DCM.pde b/archive/ArducopterNG/DCM.pde
similarity index 100%
rename from ArducopterNG/DCM.pde
rename to archive/ArducopterNG/DCM.pde
diff --git a/ArducopterNG/Debug.pde b/archive/ArducopterNG/Debug.pde
similarity index 100%
rename from ArducopterNG/Debug.pde
rename to archive/ArducopterNG/Debug.pde
diff --git a/ArducopterNG/EEPROM.pde b/archive/ArducopterNG/EEPROM.pde
similarity index 100%
rename from ArducopterNG/EEPROM.pde
rename to archive/ArducopterNG/EEPROM.pde
diff --git a/ArducopterNG/Events.pde b/archive/ArducopterNG/Events.pde
similarity index 100%
rename from ArducopterNG/Events.pde
rename to archive/ArducopterNG/Events.pde
diff --git a/ArducopterNG/Functions.pde b/archive/ArducopterNG/Functions.pde
similarity index 100%
rename from ArducopterNG/Functions.pde
rename to archive/ArducopterNG/Functions.pde
diff --git a/ArducopterNG/GCS.pde b/archive/ArducopterNG/GCS.pde
similarity index 100%
rename from ArducopterNG/GCS.pde
rename to archive/ArducopterNG/GCS.pde
diff --git a/ArducopterNG/Heli.h b/archive/ArducopterNG/Heli.h
similarity index 100%
rename from ArducopterNG/Heli.h
rename to archive/ArducopterNG/Heli.h
diff --git a/ArducopterNG/Heli.pde b/archive/ArducopterNG/Heli.pde
similarity index 100%
rename from ArducopterNG/Heli.pde
rename to archive/ArducopterNG/Heli.pde
diff --git a/ArducopterNG/Log.pde b/archive/ArducopterNG/Log.pde
similarity index 100%
rename from ArducopterNG/Log.pde
rename to archive/ArducopterNG/Log.pde
diff --git a/ArducopterNG/Mixer.pde b/archive/ArducopterNG/Mixer.pde
similarity index 100%
rename from ArducopterNG/Mixer.pde
rename to archive/ArducopterNG/Mixer.pde
diff --git a/ArducopterNG/Motors.pde b/archive/ArducopterNG/Motors.pde
similarity index 100%
rename from ArducopterNG/Motors.pde
rename to archive/ArducopterNG/Motors.pde
diff --git a/ArducopterNG/Navigation.pde b/archive/ArducopterNG/Navigation.pde
similarity index 100%
rename from ArducopterNG/Navigation.pde
rename to archive/ArducopterNG/Navigation.pde
diff --git a/ArducopterNG/README b/archive/ArducopterNG/README
similarity index 100%
rename from ArducopterNG/README
rename to archive/ArducopterNG/README
diff --git a/ArducopterNG/Radio.pde b/archive/ArducopterNG/Radio.pde
similarity index 100%
rename from ArducopterNG/Radio.pde
rename to archive/ArducopterNG/Radio.pde
diff --git a/ArducopterNG/Sensors.pde b/archive/ArducopterNG/Sensors.pde
similarity index 100%
rename from ArducopterNG/Sensors.pde
rename to archive/ArducopterNG/Sensors.pde
diff --git a/ArducopterNG/System.pde b/archive/ArducopterNG/System.pde
similarity index 100%
rename from ArducopterNG/System.pde
rename to archive/ArducopterNG/System.pde
diff --git a/Configurator/Builds/ArduCopterConfigurator/Executable/ArduCopterConfigurator.aliases b/archive/Configurator/Builds/ArduCopterConfigurator/Executable/ArduCopterConfigurator.aliases
similarity index 100%
rename from Configurator/Builds/ArduCopterConfigurator/Executable/ArduCopterConfigurator.aliases
rename to archive/Configurator/Builds/ArduCopterConfigurator/Executable/ArduCopterConfigurator.aliases
diff --git a/Configurator/Builds/ArduCopterConfigurator/Executable/ArduCopterConfigurator.ini b/archive/Configurator/Builds/ArduCopterConfigurator/Executable/ArduCopterConfigurator.ini
similarity index 100%
rename from Configurator/Builds/ArduCopterConfigurator/Executable/ArduCopterConfigurator.ini
rename to archive/Configurator/Builds/ArduCopterConfigurator/Executable/ArduCopterConfigurator.ini
diff --git a/Configurator/Builds/ArduCopterConfigurator/Executable/data/ArduCopterConfigurator.ini b/archive/Configurator/Builds/ArduCopterConfigurator/Executable/data/ArduCopterConfigurator.ini
similarity index 100%
rename from Configurator/Builds/ArduCopterConfigurator/Executable/data/ArduCopterConfigurator.ini
rename to archive/Configurator/Builds/ArduCopterConfigurator/Executable/data/ArduCopterConfigurator.ini
diff --git a/Configurator/Configurator.Net/ArducopterConfigurator.csproj b/archive/Configurator/Configurator.Net/ArducopterConfigurator.csproj
similarity index 100%
rename from Configurator/Configurator.Net/ArducopterConfigurator.csproj
rename to archive/Configurator/Configurator.Net/ArducopterConfigurator.csproj
diff --git a/Configurator/Configurator.Net/ArducopterConfigurator.sln b/archive/Configurator/Configurator.Net/ArducopterConfigurator.sln
similarity index 100%
rename from Configurator/Configurator.Net/ArducopterConfigurator.sln
rename to archive/Configurator/Configurator.Net/ArducopterConfigurator.sln
diff --git a/Configurator/Configurator.Net/CommsSession.cs b/archive/Configurator/Configurator.Net/CommsSession.cs
similarity index 100%
rename from Configurator/Configurator.Net/CommsSession.cs
rename to archive/Configurator/Configurator.Net/CommsSession.cs
diff --git a/Configurator/Configurator.Net/Core/DelegateCommand.cs b/archive/Configurator/Configurator.Net/Core/DelegateCommand.cs
similarity index 100%
rename from Configurator/Configurator.Net/Core/DelegateCommand.cs
rename to archive/Configurator/Configurator.Net/Core/DelegateCommand.cs
diff --git a/Configurator/Configurator.Net/Core/IPresentationModel.cs b/archive/Configurator/Configurator.Net/Core/IPresentationModel.cs
similarity index 100%
rename from Configurator/Configurator.Net/Core/IPresentationModel.cs
rename to archive/Configurator/Configurator.Net/Core/IPresentationModel.cs
diff --git a/Configurator/Configurator.Net/Core/IView.cs b/archive/Configurator/Configurator.Net/Core/IView.cs
similarity index 100%
rename from Configurator/Configurator.Net/Core/IView.cs
rename to archive/Configurator/Configurator.Net/Core/IView.cs
diff --git a/Configurator/Configurator.Net/FakeCommsSession.cs b/archive/Configurator/Configurator.Net/FakeCommsSession.cs
similarity index 100%
rename from Configurator/Configurator.Net/FakeCommsSession.cs
rename to archive/Configurator/Configurator.Net/FakeCommsSession.cs
diff --git a/Configurator/Configurator.Net/NotifyProperyChangedBase.cs b/archive/Configurator/Configurator.Net/NotifyProperyChangedBase.cs
similarity index 100%
rename from Configurator/Configurator.Net/NotifyProperyChangedBase.cs
rename to archive/Configurator/Configurator.Net/NotifyProperyChangedBase.cs
diff --git a/Configurator/Configurator.Net/PresentationModels/AcroModeConfigVm.cs b/archive/Configurator/Configurator.Net/PresentationModels/AcroModeConfigVm.cs
similarity index 100%
rename from Configurator/Configurator.Net/PresentationModels/AcroModeConfigVm.cs
rename to archive/Configurator/Configurator.Net/PresentationModels/AcroModeConfigVm.cs
diff --git a/Configurator/Configurator.Net/PresentationModels/AltitudeHoldConfigVm.cs b/archive/Configurator/Configurator.Net/PresentationModels/AltitudeHoldConfigVm.cs
similarity index 100%
rename from Configurator/Configurator.Net/PresentationModels/AltitudeHoldConfigVm.cs
rename to archive/Configurator/Configurator.Net/PresentationModels/AltitudeHoldConfigVm.cs
diff --git a/Configurator/Configurator.Net/PresentationModels/ConfigWithPidsBase.cs b/archive/Configurator/Configurator.Net/PresentationModels/ConfigWithPidsBase.cs
similarity index 100%
rename from Configurator/Configurator.Net/PresentationModels/ConfigWithPidsBase.cs
rename to archive/Configurator/Configurator.Net/PresentationModels/ConfigWithPidsBase.cs
diff --git a/Configurator/Configurator.Net/PresentationModels/CrudVm.cs b/archive/Configurator/Configurator.Net/PresentationModels/CrudVm.cs
similarity index 100%
rename from Configurator/Configurator.Net/PresentationModels/CrudVm.cs
rename to archive/Configurator/Configurator.Net/PresentationModels/CrudVm.cs
diff --git a/Configurator/Configurator.Net/PresentationModels/DoubleVm.cs b/archive/Configurator/Configurator.Net/PresentationModels/DoubleVm.cs
similarity index 100%
rename from Configurator/Configurator.Net/PresentationModels/DoubleVm.cs
rename to archive/Configurator/Configurator.Net/PresentationModels/DoubleVm.cs
diff --git a/Configurator/Configurator.Net/PresentationModels/FlightControlPidsVm.cs b/archive/Configurator/Configurator.Net/PresentationModels/FlightControlPidsVm.cs
similarity index 100%
rename from Configurator/Configurator.Net/PresentationModels/FlightControlPidsVm.cs
rename to archive/Configurator/Configurator.Net/PresentationModels/FlightControlPidsVm.cs
diff --git a/Configurator/Configurator.Net/PresentationModels/GPSstatusVm.cs b/archive/Configurator/Configurator.Net/PresentationModels/GPSstatusVm.cs
similarity index 100%
rename from Configurator/Configurator.Net/PresentationModels/GPSstatusVm.cs
rename to archive/Configurator/Configurator.Net/PresentationModels/GPSstatusVm.cs
diff --git a/Configurator/Configurator.Net/PresentationModels/ItalksToApm.cs b/archive/Configurator/Configurator.Net/PresentationModels/ItalksToApm.cs
similarity index 100%
rename from Configurator/Configurator.Net/PresentationModels/ItalksToApm.cs
rename to archive/Configurator/Configurator.Net/PresentationModels/ItalksToApm.cs
diff --git a/Configurator/Configurator.Net/PresentationModels/MainVm.cs b/archive/Configurator/Configurator.Net/PresentationModels/MainVm.cs
similarity index 100%
rename from Configurator/Configurator.Net/PresentationModels/MainVm.cs
rename to archive/Configurator/Configurator.Net/PresentationModels/MainVm.cs
diff --git a/Configurator/Configurator.Net/PresentationModels/MotorCommandsVm.cs b/archive/Configurator/Configurator.Net/PresentationModels/MotorCommandsVm.cs
similarity index 100%
rename from Configurator/Configurator.Net/PresentationModels/MotorCommandsVm.cs
rename to archive/Configurator/Configurator.Net/PresentationModels/MotorCommandsVm.cs
diff --git a/Configurator/Configurator.Net/PresentationModels/PositionAltitudePidsVm.cs b/archive/Configurator/Configurator.Net/PresentationModels/PositionAltitudePidsVm.cs
similarity index 100%
rename from Configurator/Configurator.Net/PresentationModels/PositionAltitudePidsVm.cs
rename to archive/Configurator/Configurator.Net/PresentationModels/PositionAltitudePidsVm.cs
diff --git a/Configurator/Configurator.Net/PresentationModels/PositionHoldConfigVm.cs b/archive/Configurator/Configurator.Net/PresentationModels/PositionHoldConfigVm.cs
similarity index 100%
rename from Configurator/Configurator.Net/PresentationModels/PositionHoldConfigVm.cs
rename to archive/Configurator/Configurator.Net/PresentationModels/PositionHoldConfigVm.cs
diff --git a/Configurator/Configurator.Net/PresentationModels/SensorsVm.cs b/archive/Configurator/Configurator.Net/PresentationModels/SensorsVm.cs
similarity index 100%
rename from Configurator/Configurator.Net/PresentationModels/SensorsVm.cs
rename to archive/Configurator/Configurator.Net/PresentationModels/SensorsVm.cs
diff --git a/Configurator/Configurator.Net/PresentationModels/SerialMonitorVm.cs b/archive/Configurator/Configurator.Net/PresentationModels/SerialMonitorVm.cs
similarity index 100%
rename from Configurator/Configurator.Net/PresentationModels/SerialMonitorVm.cs
rename to archive/Configurator/Configurator.Net/PresentationModels/SerialMonitorVm.cs
diff --git a/Configurator/Configurator.Net/PresentationModels/StableModeConfigVm.cs b/archive/Configurator/Configurator.Net/PresentationModels/StableModeConfigVm.cs
similarity index 100%
rename from Configurator/Configurator.Net/PresentationModels/StableModeConfigVm.cs
rename to archive/Configurator/Configurator.Net/PresentationModels/StableModeConfigVm.cs
diff --git a/Configurator/Configurator.Net/PresentationModels/TransmitterChannelsVm.cs b/archive/Configurator/Configurator.Net/PresentationModels/TransmitterChannelsVm.cs
similarity index 100%
rename from Configurator/Configurator.Net/PresentationModels/TransmitterChannelsVm.cs
rename to archive/Configurator/Configurator.Net/PresentationModels/TransmitterChannelsVm.cs
diff --git a/Configurator/Configurator.Net/PresentationModels/VmBase.cs b/archive/Configurator/Configurator.Net/PresentationModels/VmBase.cs
similarity index 100%
rename from Configurator/Configurator.Net/PresentationModels/VmBase.cs
rename to archive/Configurator/Configurator.Net/PresentationModels/VmBase.cs
diff --git a/Configurator/Configurator.Net/Program.cs b/archive/Configurator/Configurator.Net/Program.cs
similarity index 100%
rename from Configurator/Configurator.Net/Program.cs
rename to archive/Configurator/Configurator.Net/Program.cs
diff --git a/Configurator/Configurator.Net/Properties/AssemblyInfo.cs b/archive/Configurator/Configurator.Net/Properties/AssemblyInfo.cs
similarity index 100%
rename from Configurator/Configurator.Net/Properties/AssemblyInfo.cs
rename to archive/Configurator/Configurator.Net/Properties/AssemblyInfo.cs
diff --git a/Configurator/Configurator.Net/Properties/DataSources/ArducopterConfigurator.PresentationModels.AcroModeConfigVm.datasource b/archive/Configurator/Configurator.Net/Properties/DataSources/ArducopterConfigurator.PresentationModels.AcroModeConfigVm.datasource
similarity index 100%
rename from Configurator/Configurator.Net/Properties/DataSources/ArducopterConfigurator.PresentationModels.AcroModeConfigVm.datasource
rename to archive/Configurator/Configurator.Net/Properties/DataSources/ArducopterConfigurator.PresentationModels.AcroModeConfigVm.datasource
diff --git a/Configurator/Configurator.Net/Properties/DataSources/ArducopterConfigurator.PresentationModels.FlightDataVm.datasource b/archive/Configurator/Configurator.Net/Properties/DataSources/ArducopterConfigurator.PresentationModels.FlightDataVm.datasource
similarity index 100%
rename from Configurator/Configurator.Net/Properties/DataSources/ArducopterConfigurator.PresentationModels.FlightDataVm.datasource
rename to archive/Configurator/Configurator.Net/Properties/DataSources/ArducopterConfigurator.PresentationModels.FlightDataVm.datasource
diff --git a/Configurator/Configurator.Net/Properties/DataSources/ArducopterConfigurator.PresentationModels.MainVm.datasource b/archive/Configurator/Configurator.Net/Properties/DataSources/ArducopterConfigurator.PresentationModels.MainVm.datasource
similarity index 100%
rename from Configurator/Configurator.Net/Properties/DataSources/ArducopterConfigurator.PresentationModels.MainVm.datasource
rename to archive/Configurator/Configurator.Net/Properties/DataSources/ArducopterConfigurator.PresentationModels.MainVm.datasource
diff --git a/Configurator/Configurator.Net/Properties/DataSources/ArducopterConfigurator.PresentationModels.StableModeConfigVm.datasource b/archive/Configurator/Configurator.Net/Properties/DataSources/ArducopterConfigurator.PresentationModels.StableModeConfigVm.datasource
similarity index 100%
rename from Configurator/Configurator.Net/Properties/DataSources/ArducopterConfigurator.PresentationModels.StableModeConfigVm.datasource
rename to archive/Configurator/Configurator.Net/Properties/DataSources/ArducopterConfigurator.PresentationModels.StableModeConfigVm.datasource
diff --git a/Configurator/Configurator.Net/Properties/DataSources/SerialMonitorVm.datasource b/archive/Configurator/Configurator.Net/Properties/DataSources/SerialMonitorVm.datasource
similarity index 100%
rename from Configurator/Configurator.Net/Properties/DataSources/SerialMonitorVm.datasource
rename to archive/Configurator/Configurator.Net/Properties/DataSources/SerialMonitorVm.datasource
diff --git a/Configurator/Configurator.Net/Properties/Resources.Designer.cs b/archive/Configurator/Configurator.Net/Properties/Resources.Designer.cs
similarity index 100%
rename from Configurator/Configurator.Net/Properties/Resources.Designer.cs
rename to archive/Configurator/Configurator.Net/Properties/Resources.Designer.cs
diff --git a/Configurator/Configurator.Net/Properties/Resources.resx b/archive/Configurator/Configurator.Net/Properties/Resources.resx
similarity index 100%
rename from Configurator/Configurator.Net/Properties/Resources.resx
rename to archive/Configurator/Configurator.Net/Properties/Resources.resx
diff --git a/Configurator/Configurator.Net/Properties/Settings.Designer.cs b/archive/Configurator/Configurator.Net/Properties/Settings.Designer.cs
similarity index 100%
rename from Configurator/Configurator.Net/Properties/Settings.Designer.cs
rename to archive/Configurator/Configurator.Net/Properties/Settings.Designer.cs
diff --git a/Configurator/Configurator.Net/Properties/Settings.settings b/archive/Configurator/Configurator.Net/Properties/Settings.settings
similarity index 100%
rename from Configurator/Configurator.Net/Properties/Settings.settings
rename to archive/Configurator/Configurator.Net/Properties/Settings.settings
diff --git a/Configurator/Configurator.Net/Readme.txt b/archive/Configurator/Configurator.Net/Readme.txt
similarity index 100%
rename from Configurator/Configurator.Net/Readme.txt
rename to archive/Configurator/Configurator.Net/Readme.txt
diff --git a/Configurator/Configurator.Net/SensorDisplay.cs b/archive/Configurator/Configurator.Net/SensorDisplay.cs
similarity index 100%
rename from Configurator/Configurator.Net/SensorDisplay.cs
rename to archive/Configurator/Configurator.Net/SensorDisplay.cs
diff --git a/Configurator/Configurator.Net/SensorDisplay.resx b/archive/Configurator/Configurator.Net/SensorDisplay.resx
similarity index 100%
rename from Configurator/Configurator.Net/SensorDisplay.resx
rename to archive/Configurator/Configurator.Net/SensorDisplay.resx
diff --git a/Configurator/Configurator.Net/Test/AcroModeConfigVmTest.cs b/archive/Configurator/Configurator.Net/Test/AcroModeConfigVmTest.cs
similarity index 100%
rename from Configurator/Configurator.Net/Test/AcroModeConfigVmTest.cs
rename to archive/Configurator/Configurator.Net/Test/AcroModeConfigVmTest.cs
diff --git a/Configurator/Configurator.Net/Test/AltitudeHoldVmTest.cs b/archive/Configurator/Configurator.Net/Test/AltitudeHoldVmTest.cs
similarity index 100%
rename from Configurator/Configurator.Net/Test/AltitudeHoldVmTest.cs
rename to archive/Configurator/Configurator.Net/Test/AltitudeHoldVmTest.cs
diff --git a/Configurator/Configurator.Net/Test/ArducopterConfiguratorTest.csproj b/archive/Configurator/Configurator.Net/Test/ArducopterConfiguratorTest.csproj
similarity index 100%
rename from Configurator/Configurator.Net/Test/ArducopterConfiguratorTest.csproj
rename to archive/Configurator/Configurator.Net/Test/ArducopterConfiguratorTest.csproj
diff --git a/Configurator/Configurator.Net/Test/CalibrationOffsetsDataVmTest.cs b/archive/Configurator/Configurator.Net/Test/CalibrationOffsetsDataVmTest.cs
similarity index 100%
rename from Configurator/Configurator.Net/Test/CalibrationOffsetsDataVmTest.cs
rename to archive/Configurator/Configurator.Net/Test/CalibrationOffsetsDataVmTest.cs
diff --git a/Configurator/Configurator.Net/Test/MainVmTests.cs b/archive/Configurator/Configurator.Net/Test/MainVmTests.cs
similarity index 100%
rename from Configurator/Configurator.Net/Test/MainVmTests.cs
rename to archive/Configurator/Configurator.Net/Test/MainVmTests.cs
diff --git a/Configurator/Configurator.Net/Test/MockComms.cs b/archive/Configurator/Configurator.Net/Test/MockComms.cs
similarity index 100%
rename from Configurator/Configurator.Net/Test/MockComms.cs
rename to archive/Configurator/Configurator.Net/Test/MockComms.cs
diff --git a/Configurator/Configurator.Net/Test/MotorCommandsVmTest.cs b/archive/Configurator/Configurator.Net/Test/MotorCommandsVmTest.cs
similarity index 100%
rename from Configurator/Configurator.Net/Test/MotorCommandsVmTest.cs
rename to archive/Configurator/Configurator.Net/Test/MotorCommandsVmTest.cs
diff --git a/Configurator/Configurator.Net/Test/PositionHoldConfigVmTest.cs b/archive/Configurator/Configurator.Net/Test/PositionHoldConfigVmTest.cs
similarity index 100%
rename from Configurator/Configurator.Net/Test/PositionHoldConfigVmTest.cs
rename to archive/Configurator/Configurator.Net/Test/PositionHoldConfigVmTest.cs
diff --git a/Configurator/Configurator.Net/Test/Properties/AssemblyInfo.cs b/archive/Configurator/Configurator.Net/Test/Properties/AssemblyInfo.cs
similarity index 100%
rename from Configurator/Configurator.Net/Test/Properties/AssemblyInfo.cs
rename to archive/Configurator/Configurator.Net/Test/Properties/AssemblyInfo.cs
diff --git a/Configurator/Configurator.Net/Test/StableModeConfigVmTest.cs b/archive/Configurator/Configurator.Net/Test/StableModeConfigVmTest.cs
similarity index 100%
rename from Configurator/Configurator.Net/Test/StableModeConfigVmTest.cs
rename to archive/Configurator/Configurator.Net/Test/StableModeConfigVmTest.cs
diff --git a/Configurator/Configurator.Net/Test/TransmitterChannelsVmTests.cs b/archive/Configurator/Configurator.Net/Test/TransmitterChannelsVmTests.cs
similarity index 100%
rename from Configurator/Configurator.Net/Test/TransmitterChannelsVmTests.cs
rename to archive/Configurator/Configurator.Net/Test/TransmitterChannelsVmTests.cs
diff --git a/Configurator/Configurator.Net/Test/VmTestBase.cs b/archive/Configurator/Configurator.Net/Test/VmTestBase.cs
similarity index 100%
rename from Configurator/Configurator.Net/Test/VmTestBase.cs
rename to archive/Configurator/Configurator.Net/Test/VmTestBase.cs
diff --git a/Configurator/Configurator.Net/VerticalProgressBar.cs b/archive/Configurator/Configurator.Net/VerticalProgressBar.cs
similarity index 100%
rename from Configurator/Configurator.Net/VerticalProgressBar.cs
rename to archive/Configurator/Configurator.Net/VerticalProgressBar.cs
diff --git a/Configurator/Configurator.Net/Views/AcroConfigView.Designer.cs b/archive/Configurator/Configurator.Net/Views/AcroConfigView.Designer.cs
similarity index 100%
rename from Configurator/Configurator.Net/Views/AcroConfigView.Designer.cs
rename to archive/Configurator/Configurator.Net/Views/AcroConfigView.Designer.cs
diff --git a/Configurator/Configurator.Net/Views/AcroConfigView.cs b/archive/Configurator/Configurator.Net/Views/AcroConfigView.cs
similarity index 100%
rename from Configurator/Configurator.Net/Views/AcroConfigView.cs
rename to archive/Configurator/Configurator.Net/Views/AcroConfigView.cs
diff --git a/Configurator/Configurator.Net/Views/AcroConfigView.resx b/archive/Configurator/Configurator.Net/Views/AcroConfigView.resx
similarity index 100%
rename from Configurator/Configurator.Net/Views/AcroConfigView.resx
rename to archive/Configurator/Configurator.Net/Views/AcroConfigView.resx
diff --git a/Configurator/Configurator.Net/Views/AltitudeHoldConfigView.Designer.cs b/archive/Configurator/Configurator.Net/Views/AltitudeHoldConfigView.Designer.cs
similarity index 100%
rename from Configurator/Configurator.Net/Views/AltitudeHoldConfigView.Designer.cs
rename to archive/Configurator/Configurator.Net/Views/AltitudeHoldConfigView.Designer.cs
diff --git a/Configurator/Configurator.Net/Views/AltitudeHoldConfigView.cs b/archive/Configurator/Configurator.Net/Views/AltitudeHoldConfigView.cs
similarity index 100%
rename from Configurator/Configurator.Net/Views/AltitudeHoldConfigView.cs
rename to archive/Configurator/Configurator.Net/Views/AltitudeHoldConfigView.cs
diff --git a/Configurator/Configurator.Net/Views/AltitudeHoldConfigView.resx b/archive/Configurator/Configurator.Net/Views/AltitudeHoldConfigView.resx
similarity index 100%
rename from Configurator/Configurator.Net/Views/AltitudeHoldConfigView.resx
rename to archive/Configurator/Configurator.Net/Views/AltitudeHoldConfigView.resx
diff --git a/Configurator/Configurator.Net/Views/FlightControlPidsView.Designer.cs b/archive/Configurator/Configurator.Net/Views/FlightControlPidsView.Designer.cs
similarity index 100%
rename from Configurator/Configurator.Net/Views/FlightControlPidsView.Designer.cs
rename to archive/Configurator/Configurator.Net/Views/FlightControlPidsView.Designer.cs
diff --git a/Configurator/Configurator.Net/Views/FlightControlPidsView.cs b/archive/Configurator/Configurator.Net/Views/FlightControlPidsView.cs
similarity index 100%
rename from Configurator/Configurator.Net/Views/FlightControlPidsView.cs
rename to archive/Configurator/Configurator.Net/Views/FlightControlPidsView.cs
diff --git a/Configurator/Configurator.Net/Views/FlightControlPidsView.resx b/archive/Configurator/Configurator.Net/Views/FlightControlPidsView.resx
similarity index 100%
rename from Configurator/Configurator.Net/Views/FlightControlPidsView.resx
rename to archive/Configurator/Configurator.Net/Views/FlightControlPidsView.resx
diff --git a/Configurator/Configurator.Net/Views/FlightDataView.Designer.cs b/archive/Configurator/Configurator.Net/Views/FlightDataView.Designer.cs
similarity index 100%
rename from Configurator/Configurator.Net/Views/FlightDataView.Designer.cs
rename to archive/Configurator/Configurator.Net/Views/FlightDataView.Designer.cs
diff --git a/Configurator/Configurator.Net/Views/FlightDataView.cs b/archive/Configurator/Configurator.Net/Views/FlightDataView.cs
similarity index 100%
rename from Configurator/Configurator.Net/Views/FlightDataView.cs
rename to archive/Configurator/Configurator.Net/Views/FlightDataView.cs
diff --git a/Configurator/Configurator.Net/Views/FlightDataView.resx b/archive/Configurator/Configurator.Net/Views/FlightDataView.resx
similarity index 100%
rename from Configurator/Configurator.Net/Views/FlightDataView.resx
rename to archive/Configurator/Configurator.Net/Views/FlightDataView.resx
diff --git a/Configurator/Configurator.Net/Views/GpsView.Designer.cs b/archive/Configurator/Configurator.Net/Views/GpsView.Designer.cs
similarity index 100%
rename from Configurator/Configurator.Net/Views/GpsView.Designer.cs
rename to archive/Configurator/Configurator.Net/Views/GpsView.Designer.cs
diff --git a/Configurator/Configurator.Net/Views/GpsView.cs b/archive/Configurator/Configurator.Net/Views/GpsView.cs
similarity index 100%
rename from Configurator/Configurator.Net/Views/GpsView.cs
rename to archive/Configurator/Configurator.Net/Views/GpsView.cs
diff --git a/Configurator/Configurator.Net/Views/GpsView.resx b/archive/Configurator/Configurator.Net/Views/GpsView.resx
similarity index 100%
rename from Configurator/Configurator.Net/Views/GpsView.resx
rename to archive/Configurator/Configurator.Net/Views/GpsView.resx
diff --git a/Configurator/Configurator.Net/Views/MotorCommandsView.Designer.cs b/archive/Configurator/Configurator.Net/Views/MotorCommandsView.Designer.cs
similarity index 100%
rename from Configurator/Configurator.Net/Views/MotorCommandsView.Designer.cs
rename to archive/Configurator/Configurator.Net/Views/MotorCommandsView.Designer.cs
diff --git a/Configurator/Configurator.Net/Views/MotorCommandsView.cs b/archive/Configurator/Configurator.Net/Views/MotorCommandsView.cs
similarity index 100%
rename from Configurator/Configurator.Net/Views/MotorCommandsView.cs
rename to archive/Configurator/Configurator.Net/Views/MotorCommandsView.cs
diff --git a/Configurator/Configurator.Net/Views/MotorCommandsView.resx b/archive/Configurator/Configurator.Net/Views/MotorCommandsView.resx
similarity index 100%
rename from Configurator/Configurator.Net/Views/MotorCommandsView.resx
rename to archive/Configurator/Configurator.Net/Views/MotorCommandsView.resx
diff --git a/Configurator/Configurator.Net/Views/PositionAltitudePidsView.Designer.cs b/archive/Configurator/Configurator.Net/Views/PositionAltitudePidsView.Designer.cs
similarity index 100%
rename from Configurator/Configurator.Net/Views/PositionAltitudePidsView.Designer.cs
rename to archive/Configurator/Configurator.Net/Views/PositionAltitudePidsView.Designer.cs
diff --git a/Configurator/Configurator.Net/Views/PositionAltitudePidsView.cs b/archive/Configurator/Configurator.Net/Views/PositionAltitudePidsView.cs
similarity index 100%
rename from Configurator/Configurator.Net/Views/PositionAltitudePidsView.cs
rename to archive/Configurator/Configurator.Net/Views/PositionAltitudePidsView.cs
diff --git a/Configurator/Configurator.Net/Views/PositionAltitudePidsView.resx b/archive/Configurator/Configurator.Net/Views/PositionAltitudePidsView.resx
similarity index 100%
rename from Configurator/Configurator.Net/Views/PositionAltitudePidsView.resx
rename to archive/Configurator/Configurator.Net/Views/PositionAltitudePidsView.resx
diff --git a/Configurator/Configurator.Net/Views/PositionHoldConfigView.Designer.cs b/archive/Configurator/Configurator.Net/Views/PositionHoldConfigView.Designer.cs
similarity index 100%
rename from Configurator/Configurator.Net/Views/PositionHoldConfigView.Designer.cs
rename to archive/Configurator/Configurator.Net/Views/PositionHoldConfigView.Designer.cs
diff --git a/Configurator/Configurator.Net/Views/PositionHoldConfigView.cs b/archive/Configurator/Configurator.Net/Views/PositionHoldConfigView.cs
similarity index 100%
rename from Configurator/Configurator.Net/Views/PositionHoldConfigView.cs
rename to archive/Configurator/Configurator.Net/Views/PositionHoldConfigView.cs
diff --git a/Configurator/Configurator.Net/Views/PositionHoldConfigView.resx b/archive/Configurator/Configurator.Net/Views/PositionHoldConfigView.resx
similarity index 100%
rename from Configurator/Configurator.Net/Views/PositionHoldConfigView.resx
rename to archive/Configurator/Configurator.Net/Views/PositionHoldConfigView.resx
diff --git a/Configurator/Configurator.Net/Views/SerialMonitorView.Designer.cs b/archive/Configurator/Configurator.Net/Views/SerialMonitorView.Designer.cs
similarity index 100%
rename from Configurator/Configurator.Net/Views/SerialMonitorView.Designer.cs
rename to archive/Configurator/Configurator.Net/Views/SerialMonitorView.Designer.cs
diff --git a/Configurator/Configurator.Net/Views/SerialMonitorView.cs b/archive/Configurator/Configurator.Net/Views/SerialMonitorView.cs
similarity index 100%
rename from Configurator/Configurator.Net/Views/SerialMonitorView.cs
rename to archive/Configurator/Configurator.Net/Views/SerialMonitorView.cs
diff --git a/Configurator/Configurator.Net/Views/SerialMonitorView.resx b/archive/Configurator/Configurator.Net/Views/SerialMonitorView.resx
similarity index 100%
rename from Configurator/Configurator.Net/Views/SerialMonitorView.resx
rename to archive/Configurator/Configurator.Net/Views/SerialMonitorView.resx
diff --git a/Configurator/Configurator.Net/Views/StableConfigView.Designer.cs b/archive/Configurator/Configurator.Net/Views/StableConfigView.Designer.cs
similarity index 100%
rename from Configurator/Configurator.Net/Views/StableConfigView.Designer.cs
rename to archive/Configurator/Configurator.Net/Views/StableConfigView.Designer.cs
diff --git a/Configurator/Configurator.Net/Views/StableConfigView.cs b/archive/Configurator/Configurator.Net/Views/StableConfigView.cs
similarity index 100%
rename from Configurator/Configurator.Net/Views/StableConfigView.cs
rename to archive/Configurator/Configurator.Net/Views/StableConfigView.cs
diff --git a/Configurator/Configurator.Net/Views/StableConfigView.resx b/archive/Configurator/Configurator.Net/Views/StableConfigView.resx
similarity index 100%
rename from Configurator/Configurator.Net/Views/StableConfigView.resx
rename to archive/Configurator/Configurator.Net/Views/StableConfigView.resx
diff --git a/Configurator/Configurator.Net/Views/TransmitterChannelsView.Designer.cs b/archive/Configurator/Configurator.Net/Views/TransmitterChannelsView.Designer.cs
similarity index 100%
rename from Configurator/Configurator.Net/Views/TransmitterChannelsView.Designer.cs
rename to archive/Configurator/Configurator.Net/Views/TransmitterChannelsView.Designer.cs
diff --git a/Configurator/Configurator.Net/Views/TransmitterChannelsView.cs b/archive/Configurator/Configurator.Net/Views/TransmitterChannelsView.cs
similarity index 100%
rename from Configurator/Configurator.Net/Views/TransmitterChannelsView.cs
rename to archive/Configurator/Configurator.Net/Views/TransmitterChannelsView.cs
diff --git a/Configurator/Configurator.Net/Views/TransmitterChannelsView.resx b/archive/Configurator/Configurator.Net/Views/TransmitterChannelsView.resx
similarity index 100%
rename from Configurator/Configurator.Net/Views/TransmitterChannelsView.resx
rename to archive/Configurator/Configurator.Net/Views/TransmitterChannelsView.resx
diff --git a/Configurator/Configurator.Net/Views/ViewCommon.cs b/archive/Configurator/Configurator.Net/Views/ViewCommon.cs
similarity index 100%
rename from Configurator/Configurator.Net/Views/ViewCommon.cs
rename to archive/Configurator/Configurator.Net/Views/ViewCommon.cs
diff --git a/Configurator/Configurator.Net/Views/controls/CircularIndicatorControl.Designer.cs b/archive/Configurator/Configurator.Net/Views/controls/CircularIndicatorControl.Designer.cs
similarity index 100%
rename from Configurator/Configurator.Net/Views/controls/CircularIndicatorControl.Designer.cs
rename to archive/Configurator/Configurator.Net/Views/controls/CircularIndicatorControl.Designer.cs
diff --git a/Configurator/Configurator.Net/Views/controls/CircularIndicatorControl.cs b/archive/Configurator/Configurator.Net/Views/controls/CircularIndicatorControl.cs
similarity index 100%
rename from Configurator/Configurator.Net/Views/controls/CircularIndicatorControl.cs
rename to archive/Configurator/Configurator.Net/Views/controls/CircularIndicatorControl.cs
diff --git a/Configurator/Configurator.Net/Views/controls/CircularIndicatorControl.resx b/archive/Configurator/Configurator.Net/Views/controls/CircularIndicatorControl.resx
similarity index 100%
rename from Configurator/Configurator.Net/Views/controls/CircularIndicatorControl.resx
rename to archive/Configurator/Configurator.Net/Views/controls/CircularIndicatorControl.resx
diff --git a/Configurator/Configurator.Net/Views/controls/CompassControl.Designer.cs b/archive/Configurator/Configurator.Net/Views/controls/CompassControl.Designer.cs
similarity index 100%
rename from Configurator/Configurator.Net/Views/controls/CompassControl.Designer.cs
rename to archive/Configurator/Configurator.Net/Views/controls/CompassControl.Designer.cs
diff --git a/Configurator/Configurator.Net/Views/controls/CompassControl.cs b/archive/Configurator/Configurator.Net/Views/controls/CompassControl.cs
similarity index 100%
rename from Configurator/Configurator.Net/Views/controls/CompassControl.cs
rename to archive/Configurator/Configurator.Net/Views/controls/CompassControl.cs
diff --git a/Configurator/Configurator.Net/Views/controls/CompassControl.resx b/archive/Configurator/Configurator.Net/Views/controls/CompassControl.resx
similarity index 100%
rename from Configurator/Configurator.Net/Views/controls/CompassControl.resx
rename to archive/Configurator/Configurator.Net/Views/controls/CompassControl.resx
diff --git a/Configurator/Configurator.Net/Views/controls/LinearIndicatorControl.Designer.cs b/archive/Configurator/Configurator.Net/Views/controls/LinearIndicatorControl.Designer.cs
similarity index 100%
rename from Configurator/Configurator.Net/Views/controls/LinearIndicatorControl.Designer.cs
rename to archive/Configurator/Configurator.Net/Views/controls/LinearIndicatorControl.Designer.cs
diff --git a/Configurator/Configurator.Net/Views/controls/LinearIndicatorControl.cs b/archive/Configurator/Configurator.Net/Views/controls/LinearIndicatorControl.cs
similarity index 100%
rename from Configurator/Configurator.Net/Views/controls/LinearIndicatorControl.cs
rename to archive/Configurator/Configurator.Net/Views/controls/LinearIndicatorControl.cs
diff --git a/Configurator/Configurator.Net/Views/controls/PropControl.Designer.cs b/archive/Configurator/Configurator.Net/Views/controls/PropControl.Designer.cs
similarity index 100%
rename from Configurator/Configurator.Net/Views/controls/PropControl.Designer.cs
rename to archive/Configurator/Configurator.Net/Views/controls/PropControl.Designer.cs
diff --git a/Configurator/Configurator.Net/Views/controls/PropControl.cs b/archive/Configurator/Configurator.Net/Views/controls/PropControl.cs
similarity index 100%
rename from Configurator/Configurator.Net/Views/controls/PropControl.cs
rename to archive/Configurator/Configurator.Net/Views/controls/PropControl.cs
diff --git a/Configurator/Configurator.Net/Views/controls/PropControl.resx b/archive/Configurator/Configurator.Net/Views/controls/PropControl.resx
similarity index 100%
rename from Configurator/Configurator.Net/Views/controls/PropControl.resx
rename to archive/Configurator/Configurator.Net/Views/controls/PropControl.resx
diff --git a/Configurator/Configurator.Net/Views/controls/QuadPlanControl.Designer.cs b/archive/Configurator/Configurator.Net/Views/controls/QuadPlanControl.Designer.cs
similarity index 100%
rename from Configurator/Configurator.Net/Views/controls/QuadPlanControl.Designer.cs
rename to archive/Configurator/Configurator.Net/Views/controls/QuadPlanControl.Designer.cs
diff --git a/Configurator/Configurator.Net/Views/controls/QuadPlanControl.cs b/archive/Configurator/Configurator.Net/Views/controls/QuadPlanControl.cs
similarity index 100%
rename from Configurator/Configurator.Net/Views/controls/QuadPlanControl.cs
rename to archive/Configurator/Configurator.Net/Views/controls/QuadPlanControl.cs
diff --git a/Configurator/Configurator.Net/Views/controls/QuadPlanControl.resx b/archive/Configurator/Configurator.Net/Views/controls/QuadPlanControl.resx
similarity index 100%
rename from Configurator/Configurator.Net/Views/controls/QuadPlanControl.resx
rename to archive/Configurator/Configurator.Net/Views/controls/QuadPlanControl.resx
diff --git a/Configurator/Configurator.Net/Views/icons/Misc-Tools.ico b/archive/Configurator/Configurator.Net/Views/icons/Misc-Tools.ico
similarity index 100%
rename from Configurator/Configurator.Net/Views/icons/Misc-Tools.ico
rename to archive/Configurator/Configurator.Net/Views/icons/Misc-Tools.ico
diff --git a/Configurator/Configurator.Net/Views/icons/connect.ico b/archive/Configurator/Configurator.Net/Views/icons/connect.ico
similarity index 100%
rename from Configurator/Configurator.Net/Views/icons/connect.ico
rename to archive/Configurator/Configurator.Net/Views/icons/connect.ico
diff --git a/Configurator/Configurator.Net/Views/icons/disconnect.ico b/archive/Configurator/Configurator.Net/Views/icons/disconnect.ico
similarity index 100%
rename from Configurator/Configurator.Net/Views/icons/disconnect.ico
rename to archive/Configurator/Configurator.Net/Views/icons/disconnect.ico
diff --git a/Configurator/Configurator.Net/Views/icons/refresh.ico b/archive/Configurator/Configurator.Net/Views/icons/refresh.ico
similarity index 100%
rename from Configurator/Configurator.Net/Views/icons/refresh.ico
rename to archive/Configurator/Configurator.Net/Views/icons/refresh.ico
diff --git a/Configurator/Configurator.Net/Views/mainForm.Designer.cs b/archive/Configurator/Configurator.Net/Views/mainForm.Designer.cs
similarity index 100%
rename from Configurator/Configurator.Net/Views/mainForm.Designer.cs
rename to archive/Configurator/Configurator.Net/Views/mainForm.Designer.cs
diff --git a/Configurator/Configurator.Net/Views/mainForm.cs b/archive/Configurator/Configurator.Net/Views/mainForm.cs
similarity index 100%
rename from Configurator/Configurator.Net/Views/mainForm.cs
rename to archive/Configurator/Configurator.Net/Views/mainForm.cs
diff --git a/Configurator/Configurator.Net/Views/mainForm.resx b/archive/Configurator/Configurator.Net/Views/mainForm.resx
similarity index 100%
rename from Configurator/Configurator.Net/Views/mainForm.resx
rename to archive/Configurator/Configurator.Net/Views/mainForm.resx
diff --git a/Configurator/Configurator.Net/configuratorCert.pfx b/archive/Configurator/Configurator.Net/configuratorCert.pfx
similarity index 100%
rename from Configurator/Configurator.Net/configuratorCert.pfx
rename to archive/Configurator/Configurator.Net/configuratorCert.pfx
diff --git a/Configurator/Source/ArduCopterConfigurator.ini b/archive/Configurator/Source/ArduCopterConfigurator.ini
similarity index 100%
rename from Configurator/Source/ArduCopterConfigurator.ini
rename to archive/Configurator/Source/ArduCopterConfigurator.ini
diff --git a/Configurator/Source/ArduCopterConfigurator.lvproj b/archive/Configurator/Source/ArduCopterConfigurator.lvproj
similarity index 100%
rename from Configurator/Source/ArduCopterConfigurator.lvproj
rename to archive/Configurator/Source/ArduCopterConfigurator.lvproj
diff --git a/Configurator/Source/ArduCopterConfigurator.vi b/archive/Configurator/Source/ArduCopterConfigurator.vi
similarity index 100%
rename from Configurator/Source/ArduCopterConfigurator.vi
rename to archive/Configurator/Source/ArduCopterConfigurator.vi
diff --git a/Configurator/Source/Dialog/ErrorDialog.vi b/archive/Configurator/Source/Dialog/ErrorDialog.vi
similarity index 100%
rename from Configurator/Source/Dialog/ErrorDialog.vi
rename to archive/Configurator/Source/Dialog/ErrorDialog.vi
diff --git a/Configurator/Source/Dialog/ReconnectDialog.vi b/archive/Configurator/Source/Dialog/ReconnectDialog.vi
similarity index 100%
rename from Configurator/Source/Dialog/ReconnectDialog.vi
rename to archive/Configurator/Source/Dialog/ReconnectDialog.vi
diff --git a/Configurator/Source/Icon/Config-Tools.ico b/archive/Configurator/Source/Icon/Config-Tools.ico
similarity index 100%
rename from Configurator/Source/Icon/Config-Tools.ico
rename to archive/Configurator/Source/Icon/Config-Tools.ico
diff --git a/Configurator/Source/Icon/IM.icns b/archive/Configurator/Source/Icon/IM.icns
similarity index 100%
rename from Configurator/Source/Icon/IM.icns
rename to archive/Configurator/Source/Icon/IM.icns
diff --git a/Configurator/Source/Utilities/DecodeSensorBytes.vi b/archive/Configurator/Source/Utilities/DecodeSensorBytes.vi
similarity index 100%
rename from Configurator/Source/Utilities/DecodeSensorBytes.vi
rename to archive/Configurator/Source/Utilities/DecodeSensorBytes.vi
diff --git a/Configurator/Source/Utilities/FindUserAppFolder.vi b/archive/Configurator/Source/Utilities/FindUserAppFolder.vi
similarity index 100%
rename from Configurator/Source/Utilities/FindUserAppFolder.vi
rename to archive/Configurator/Source/Utilities/FindUserAppFolder.vi
diff --git a/Configurator/Source/Utilities/TDMS - AeroQuad File Viewer.vi b/archive/Configurator/Source/Utilities/TDMS - AeroQuad File Viewer.vi
similarity index 100%
rename from Configurator/Source/Utilities/TDMS - AeroQuad File Viewer.vi
rename to archive/Configurator/Source/Utilities/TDMS - AeroQuad File Viewer.vi
diff --git a/Configurator/Source/Utilities/TDMS/G TDMS 8x.mnu b/archive/Configurator/Source/Utilities/TDMS/G TDMS 8x.mnu
similarity index 100%
rename from Configurator/Source/Utilities/TDMS/G TDMS 8x.mnu
rename to archive/Configurator/Source/Utilities/TDMS/G TDMS 8x.mnu
diff --git a/Configurator/Source/Utilities/TDMS/_G TDMS 8x.llb b/archive/Configurator/Source/Utilities/TDMS/_G TDMS 8x.llb
similarity index 100%
rename from Configurator/Source/Utilities/TDMS/_G TDMS 8x.llb
rename to archive/Configurator/Source/Utilities/TDMS/_G TDMS 8x.llb
diff --git a/Configurator/Source/Utilities/WriteEEPROM.vi b/archive/Configurator/Source/Utilities/WriteEEPROM.vi
similarity index 100%
rename from Configurator/Source/Utilities/WriteEEPROM.vi
rename to archive/Configurator/Source/Utilities/WriteEEPROM.vi
diff --git a/WaypointWriterCopterMega/EEPROM.pde b/archive/WaypointWriterCopterMega/EEPROM.pde
similarity index 100%
rename from WaypointWriterCopterMega/EEPROM.pde
rename to archive/WaypointWriterCopterMega/EEPROM.pde
diff --git a/WaypointWriterCopterMega/WaypointWriterCopterMega.pde b/archive/WaypointWriterCopterMega/WaypointWriterCopterMega.pde
similarity index 100%
rename from WaypointWriterCopterMega/WaypointWriterCopterMega.pde
rename to archive/WaypointWriterCopterMega/WaypointWriterCopterMega.pde
diff --git a/WaypointWriterCopterMega/defines.h b/archive/WaypointWriterCopterMega/defines.h
similarity index 100%
rename from WaypointWriterCopterMega/defines.h
rename to archive/WaypointWriterCopterMega/defines.h
diff --git a/WaypointWriterCopterMega/event_example.h b/archive/WaypointWriterCopterMega/event_example.h
similarity index 100%
rename from WaypointWriterCopterMega/event_example.h
rename to archive/WaypointWriterCopterMega/event_example.h
diff --git a/WaypointWriterCopterMega/mission_example.h b/archive/WaypointWriterCopterMega/mission_example.h
similarity index 100%
rename from WaypointWriterCopterMega/mission_example.h
rename to archive/WaypointWriterCopterMega/mission_example.h
diff --git a/WaypointWriterCopterMega/sparkfun.h b/archive/WaypointWriterCopterMega/sparkfun.h
similarity index 100%
rename from WaypointWriterCopterMega/sparkfun.h
rename to archive/WaypointWriterCopterMega/sparkfun.h
diff --git a/WaypointWriterCopterMega/takeoff.h b/archive/WaypointWriterCopterMega/takeoff.h
similarity index 100%
rename from WaypointWriterCopterMega/takeoff.h
rename to archive/WaypointWriterCopterMega/takeoff.h