diff --git a/src/devices/CMakeLists.txt b/src/devices/CMakeLists.txt index 96659a8dbf1..0f97a3db98b 100644 --- a/src/devices/CMakeLists.txt +++ b/src/devices/CMakeLists.txt @@ -10,38 +10,18 @@ yarp_begin_plugin_library(yarpmod OPTION YARP_COMPILE_DEVICE_PLUGINS DEFAULT ON ) - add_subdirectory(framegrabber_protocol) - add_subdirectory(audioPlayerWrapper) - add_subdirectory(audioRecorderWrapper) - add_subdirectory(audioRecorder_nwc_yarp) - add_subdirectory(audioRecorder_nws_yarp) + add_subdirectory(fake) + add_subdirectory(messages) + add_subdirectory(networkWrappers) + add_subdirectory(audioFromFileDevice) add_subdirectory(audioToFileDevice) add_subdirectory(openNI2DepthCamera) - add_subdirectory(fakeDepthCamera) - add_subdirectory(fakebot) - add_subdirectory(fakeChatBotDevice) - add_subdirectory(fakeMotionControl) - add_subdirectory(fakeMotionControlMicro) - add_subdirectory(fakeAnalogSensor) - add_subdirectory(fakeBattery) - add_subdirectory(fakeIMU) - add_subdirectory(fakeJointCoupling) - add_subdirectory(fakeJoypad) - add_subdirectory(fakeLLMDevice) - add_subdirectory(fakeOdometry2D) - add_subdirectory(fakePositionSensor) - add_subdirectory(fakeSerialPort) - add_subdirectory(fakeSpeechSynthesizer) - add_subdirectory(fakeSpeechTranscription) add_subdirectory(frameTransformClient) add_subdirectory(frameTransformGet) add_subdirectory(frameTransformServer) add_subdirectory(frameTransformSet) - add_subdirectory(frameTransformStorageMsgs) add_subdirectory(frameTransformStorage) - add_subdirectory(frameGrabber_nwc_yarp) - add_subdirectory(frameGrabber_nws_yarp) add_subdirectory(SerialServoBoard) add_subdirectory(ffmpeg) add_subdirectory(opencv) @@ -49,83 +29,22 @@ yarp_begin_plugin_library(yarpmod add_subdirectory(portaudioPlayer) add_subdirectory(portaudioRecorder) add_subdirectory(imuBosch_BNO055) - add_subdirectory(IChatBotMsgs) - add_subdirectory(ILLMMsgs) - add_subdirectory(IAudioGrabberMsgs) - add_subdirectory(IMap2DMsgs) - add_subdirectory(INavigation2DMsgs) - add_subdirectory(ILocalization2DMsgs) - add_subdirectory(IOdometry2DMsgs) - add_subdirectory(ISerialMsgs) - add_subdirectory(ISpeechSynthesizerMsgs) - add_subdirectory(ISpeechTranscriptionMsgs) add_subdirectory(DynamixelAX12Ftdi) - add_subdirectory(fakeLaser) - add_subdirectory(fakeLaserWithMotor) - add_subdirectory(fakeMicrophone) - add_subdirectory(fakeSpeaker) add_subdirectory(laserFromDepth) add_subdirectory(laserFromPointCloud) add_subdirectory(laserFromExternalPort) add_subdirectory(laserHokuyo) - add_subdirectory(fakeFrameGrabber) add_subdirectory(SDLJoypad) - add_subdirectory(battery_nwc_yarp) - add_subdirectory(battery_nws_yarp) - add_subdirectory(chatBot_nwc_yarp) - add_subdirectory(chatBot_nws_yarp) add_subdirectory(upowerBattery) - add_subdirectory(Rangefinder2D_nws_yarp) - add_subdirectory(Rangefinder2D_nwc_yarp) - add_subdirectory(mobileBaseVelocityControl_nwc_yarp) - add_subdirectory(mobileBaseVelocityControl_nws_yarp) - add_subdirectory(mobileBaseVelocityControlMsgs) - add_subdirectory(multipleAnalogSensorsMsgs) - add_subdirectory(multipleanalogsensorsserver) - add_subdirectory(multipleanalogsensorsclient) add_subdirectory(multipleanalogsensorsremapper) - add_subdirectory(LLM_nws_yarp) - add_subdirectory(LLM_nwc_yarp) - add_subdirectory(localization2D_nwc_yarp) - add_subdirectory(localization2D_nws_yarp) - add_subdirectory(map2D_nwc_yarp) - add_subdirectory(map2D_nws_yarp) add_subdirectory(map2DStorage) - add_subdirectory(navigation2D_nwc_yarp) - add_subdirectory(navigation2D_nws_yarp) - add_subdirectory(odometry2D_nws_yarp) - add_subdirectory(Rangefinder2DClient) add_subdirectory(usbCamera) - add_subdirectory(fakeLocalizerDevice) - add_subdirectory(fakeNavigationDevice) - add_subdirectory(serialPort_nws_yarp) - add_subdirectory(serialPort_nwc_yarp) - add_subdirectory(speechSynthesizer_nws_yarp) - add_subdirectory(speechSynthesizer_nwc_yarp) - add_subdirectory(speechTranscription_nws_yarp) - add_subdirectory(speechTranscription_nwc_yarp) - add_subdirectory(RemoteControlBoard) - add_subdirectory(AnalogSensorClient) - add_subdirectory(AnalogWrapper) - add_subdirectory(VirtualAnalogWrapper) - add_subdirectory(RGBDSensorClient) - add_subdirectory(RGBDSensor_nws_yarp) - add_subdirectory(controlBoard_nws_yarp) add_subdirectory(controlBoardRemapper) - add_subdirectory(RobotDescriptionClient) - add_subdirectory(RobotDescriptionServer) add_subdirectory(JoypadControlNetUtils) - add_subdirectory(JoypadControlClient) - add_subdirectory(JoypadControlServer) add_subdirectory(frameGrabberCropper) add_subdirectory(portaudio) # DEPRECATED Since YARP 3.2 - OPTION(YARP_COMPILE_ALL_FAKE_DEVICES - "Build all devices marked as fake, for testing purposes. Overrides the option for the single fake device." - OFF) - mark_as_advanced(YARP_COMPILE_ALL_FAKE_DEVICES) - # Test devices add_subdirectory(test_segfault) add_subdirectory(test_nop) diff --git a/src/devices/fake/CMakeLists.txt b/src/devices/fake/CMakeLists.txt new file mode 100644 index 00000000000..a1a8610d882 --- /dev/null +++ b/src/devices/fake/CMakeLists.txt @@ -0,0 +1,31 @@ +# SPDX-FileCopyrightText: 2023-2023 Istituto Italiano di Tecnologia (IIT) +# SPDX-License-Identifier: BSD-3-Clause + +add_subdirectory(fakeDepthCamera) +add_subdirectory(fakebot) +add_subdirectory(fakeChatBotDevice) +add_subdirectory(fakeMotionControl) +add_subdirectory(fakeMotionControlMicro) +add_subdirectory(fakeAnalogSensor) +add_subdirectory(fakeBattery) +add_subdirectory(fakeIMU) +add_subdirectory(fakeJointCoupling) +add_subdirectory(fakeJoypad) +add_subdirectory(fakeLLMDevice) +add_subdirectory(fakeOdometry2D) +add_subdirectory(fakePositionSensor) +add_subdirectory(fakeSerialPort) +add_subdirectory(fakeSpeechSynthesizer) +add_subdirectory(fakeSpeechTranscription) +add_subdirectory(fakeLaser) +add_subdirectory(fakeLaserWithMotor) +add_subdirectory(fakeMicrophone) +add_subdirectory(fakeSpeaker) +add_subdirectory(fakeFrameGrabber) +add_subdirectory(fakeLocalizerDevice) +add_subdirectory(fakeNavigationDevice) + +OPTION(YARP_COMPILE_ALL_FAKE_DEVICES + "Build all devices marked as fake, for testing purposes. Overrides the option for the single fake device." + OFF) +mark_as_advanced(YARP_COMPILE_ALL_FAKE_DEVICES) diff --git a/src/devices/fakeAnalogSensor/CMakeLists.txt b/src/devices/fake/fakeAnalogSensor/CMakeLists.txt similarity index 100% rename from src/devices/fakeAnalogSensor/CMakeLists.txt rename to src/devices/fake/fakeAnalogSensor/CMakeLists.txt diff --git a/src/devices/fakeAnalogSensor/fakeAnalogSensor.cpp b/src/devices/fake/fakeAnalogSensor/fakeAnalogSensor.cpp similarity index 100% rename from src/devices/fakeAnalogSensor/fakeAnalogSensor.cpp rename to src/devices/fake/fakeAnalogSensor/fakeAnalogSensor.cpp diff --git a/src/devices/fakeAnalogSensor/fakeAnalogSensor.h b/src/devices/fake/fakeAnalogSensor/fakeAnalogSensor.h similarity index 100% rename from src/devices/fakeAnalogSensor/fakeAnalogSensor.h rename to src/devices/fake/fakeAnalogSensor/fakeAnalogSensor.h diff --git a/src/devices/fakeAnalogSensor/tests/CMakeLists.txt b/src/devices/fake/fakeAnalogSensor/tests/CMakeLists.txt similarity index 100% rename from src/devices/fakeAnalogSensor/tests/CMakeLists.txt rename to src/devices/fake/fakeAnalogSensor/tests/CMakeLists.txt diff --git a/src/devices/fakeAnalogSensor/tests/fakeAnalogSensor_test.cpp b/src/devices/fake/fakeAnalogSensor/tests/fakeAnalogSensor_test.cpp similarity index 100% rename from src/devices/fakeAnalogSensor/tests/fakeAnalogSensor_test.cpp rename to src/devices/fake/fakeAnalogSensor/tests/fakeAnalogSensor_test.cpp diff --git a/src/devices/fakeBattery/CMakeLists.txt b/src/devices/fake/fakeBattery/CMakeLists.txt similarity index 100% rename from src/devices/fakeBattery/CMakeLists.txt rename to src/devices/fake/fakeBattery/CMakeLists.txt diff --git a/src/devices/fakeBattery/FakeBatteryService.thrift b/src/devices/fake/fakeBattery/FakeBatteryService.thrift similarity index 100% rename from src/devices/fakeBattery/FakeBatteryService.thrift rename to src/devices/fake/fakeBattery/FakeBatteryService.thrift diff --git a/src/devices/fakeBattery/fakeBattery.cpp b/src/devices/fake/fakeBattery/fakeBattery.cpp similarity index 100% rename from src/devices/fakeBattery/fakeBattery.cpp rename to src/devices/fake/fakeBattery/fakeBattery.cpp diff --git a/src/devices/fakeBattery/fakeBattery.h b/src/devices/fake/fakeBattery/fakeBattery.h similarity index 100% rename from src/devices/fakeBattery/fakeBattery.h rename to src/devices/fake/fakeBattery/fakeBattery.h diff --git a/src/devices/fakeBattery/idl_generated_code/FakeBatteryService.cpp b/src/devices/fake/fakeBattery/idl_generated_code/FakeBatteryService.cpp similarity index 100% rename from src/devices/fakeBattery/idl_generated_code/FakeBatteryService.cpp rename to src/devices/fake/fakeBattery/idl_generated_code/FakeBatteryService.cpp diff --git a/src/devices/fakeBattery/idl_generated_code/FakeBatteryService.h b/src/devices/fake/fakeBattery/idl_generated_code/FakeBatteryService.h similarity index 100% rename from src/devices/fakeBattery/idl_generated_code/FakeBatteryService.h rename to src/devices/fake/fakeBattery/idl_generated_code/FakeBatteryService.h diff --git a/src/devices/fakeBattery/idl_generated_code/FakeBatteryService_index.txt b/src/devices/fake/fakeBattery/idl_generated_code/FakeBatteryService_index.txt similarity index 100% rename from src/devices/fakeBattery/idl_generated_code/FakeBatteryService_index.txt rename to src/devices/fake/fakeBattery/idl_generated_code/FakeBatteryService_index.txt diff --git a/src/devices/fakeBattery/tests/CMakeLists.txt b/src/devices/fake/fakeBattery/tests/CMakeLists.txt similarity index 100% rename from src/devices/fakeBattery/tests/CMakeLists.txt rename to src/devices/fake/fakeBattery/tests/CMakeLists.txt diff --git a/src/devices/fakeBattery/tests/fakeBattery_test.cpp b/src/devices/fake/fakeBattery/tests/fakeBattery_test.cpp similarity index 100% rename from src/devices/fakeBattery/tests/fakeBattery_test.cpp rename to src/devices/fake/fakeBattery/tests/fakeBattery_test.cpp diff --git a/src/devices/fakeChatBotDevice/CMakeLists.txt b/src/devices/fake/fakeChatBotDevice/CMakeLists.txt similarity index 100% rename from src/devices/fakeChatBotDevice/CMakeLists.txt rename to src/devices/fake/fakeChatBotDevice/CMakeLists.txt diff --git a/src/devices/fakeChatBotDevice/FakeChatBotDevice.cpp b/src/devices/fake/fakeChatBotDevice/FakeChatBotDevice.cpp similarity index 100% rename from src/devices/fakeChatBotDevice/FakeChatBotDevice.cpp rename to src/devices/fake/fakeChatBotDevice/FakeChatBotDevice.cpp diff --git a/src/devices/fakeChatBotDevice/FakeChatBotDevice.h b/src/devices/fake/fakeChatBotDevice/FakeChatBotDevice.h similarity index 100% rename from src/devices/fakeChatBotDevice/FakeChatBotDevice.h rename to src/devices/fake/fakeChatBotDevice/FakeChatBotDevice.h diff --git a/src/devices/fakeChatBotDevice/tests/CMakeLists.txt b/src/devices/fake/fakeChatBotDevice/tests/CMakeLists.txt similarity index 100% rename from src/devices/fakeChatBotDevice/tests/CMakeLists.txt rename to src/devices/fake/fakeChatBotDevice/tests/CMakeLists.txt diff --git a/src/devices/fakeChatBotDevice/tests/fakeChatBotDevice_test.cpp b/src/devices/fake/fakeChatBotDevice/tests/fakeChatBotDevice_test.cpp similarity index 100% rename from src/devices/fakeChatBotDevice/tests/fakeChatBotDevice_test.cpp rename to src/devices/fake/fakeChatBotDevice/tests/fakeChatBotDevice_test.cpp diff --git a/src/devices/fakeDepthCamera/CMakeLists.txt b/src/devices/fake/fakeDepthCamera/CMakeLists.txt similarity index 100% rename from src/devices/fakeDepthCamera/CMakeLists.txt rename to src/devices/fake/fakeDepthCamera/CMakeLists.txt diff --git a/src/devices/fakeDepthCamera/fakeDepthCameraDriver.cpp b/src/devices/fake/fakeDepthCamera/fakeDepthCameraDriver.cpp similarity index 100% rename from src/devices/fakeDepthCamera/fakeDepthCameraDriver.cpp rename to src/devices/fake/fakeDepthCamera/fakeDepthCameraDriver.cpp diff --git a/src/devices/fakeDepthCamera/fakeDepthCameraDriver.h b/src/devices/fake/fakeDepthCamera/fakeDepthCameraDriver.h similarity index 100% rename from src/devices/fakeDepthCamera/fakeDepthCameraDriver.h rename to src/devices/fake/fakeDepthCamera/fakeDepthCameraDriver.h diff --git a/src/devices/fakeDepthCamera/tests/CMakeLists.txt b/src/devices/fake/fakeDepthCamera/tests/CMakeLists.txt similarity index 100% rename from src/devices/fakeDepthCamera/tests/CMakeLists.txt rename to src/devices/fake/fakeDepthCamera/tests/CMakeLists.txt diff --git a/src/devices/fakeDepthCamera/tests/fakeDepthCamera_test.cpp b/src/devices/fake/fakeDepthCamera/tests/fakeDepthCamera_test.cpp similarity index 100% rename from src/devices/fakeDepthCamera/tests/fakeDepthCamera_test.cpp rename to src/devices/fake/fakeDepthCamera/tests/fakeDepthCamera_test.cpp diff --git a/src/devices/fakeFrameGrabber/CMakeLists.txt b/src/devices/fake/fakeFrameGrabber/CMakeLists.txt similarity index 100% rename from src/devices/fakeFrameGrabber/CMakeLists.txt rename to src/devices/fake/fakeFrameGrabber/CMakeLists.txt diff --git a/src/devices/fakeFrameGrabber/FakeFrameGrabber.cpp b/src/devices/fake/fakeFrameGrabber/FakeFrameGrabber.cpp similarity index 100% rename from src/devices/fakeFrameGrabber/FakeFrameGrabber.cpp rename to src/devices/fake/fakeFrameGrabber/FakeFrameGrabber.cpp diff --git a/src/devices/fakeFrameGrabber/FakeFrameGrabber.h b/src/devices/fake/fakeFrameGrabber/FakeFrameGrabber.h similarity index 100% rename from src/devices/fakeFrameGrabber/FakeFrameGrabber.h rename to src/devices/fake/fakeFrameGrabber/FakeFrameGrabber.h diff --git a/src/devices/fakeFrameGrabber/tests/CMakeLists.txt b/src/devices/fake/fakeFrameGrabber/tests/CMakeLists.txt similarity index 100% rename from src/devices/fakeFrameGrabber/tests/CMakeLists.txt rename to src/devices/fake/fakeFrameGrabber/tests/CMakeLists.txt diff --git a/src/devices/fakeFrameGrabber/tests/fakeFrameGrabber_test.cpp b/src/devices/fake/fakeFrameGrabber/tests/fakeFrameGrabber_test.cpp similarity index 100% rename from src/devices/fakeFrameGrabber/tests/fakeFrameGrabber_test.cpp rename to src/devices/fake/fakeFrameGrabber/tests/fakeFrameGrabber_test.cpp diff --git a/src/devices/fakeIMU/CMakeLists.txt b/src/devices/fake/fakeIMU/CMakeLists.txt similarity index 100% rename from src/devices/fakeIMU/CMakeLists.txt rename to src/devices/fake/fakeIMU/CMakeLists.txt diff --git a/src/devices/fakeIMU/fakeIMU.cpp b/src/devices/fake/fakeIMU/fakeIMU.cpp similarity index 100% rename from src/devices/fakeIMU/fakeIMU.cpp rename to src/devices/fake/fakeIMU/fakeIMU.cpp diff --git a/src/devices/fakeIMU/fakeIMU.h b/src/devices/fake/fakeIMU/fakeIMU.h similarity index 100% rename from src/devices/fakeIMU/fakeIMU.h rename to src/devices/fake/fakeIMU/fakeIMU.h diff --git a/src/devices/fakeIMU/tests/CMakeLists.txt b/src/devices/fake/fakeIMU/tests/CMakeLists.txt similarity index 100% rename from src/devices/fakeIMU/tests/CMakeLists.txt rename to src/devices/fake/fakeIMU/tests/CMakeLists.txt diff --git a/src/devices/fakeIMU/tests/fakeImu_test.cpp b/src/devices/fake/fakeIMU/tests/fakeImu_test.cpp similarity index 100% rename from src/devices/fakeIMU/tests/fakeImu_test.cpp rename to src/devices/fake/fakeIMU/tests/fakeImu_test.cpp diff --git a/src/devices/fakeJointCoupling/CMakeLists.txt b/src/devices/fake/fakeJointCoupling/CMakeLists.txt similarity index 100% rename from src/devices/fakeJointCoupling/CMakeLists.txt rename to src/devices/fake/fakeJointCoupling/CMakeLists.txt diff --git a/src/devices/fakeJointCoupling/fakeJointCoupling.cpp b/src/devices/fake/fakeJointCoupling/fakeJointCoupling.cpp similarity index 100% rename from src/devices/fakeJointCoupling/fakeJointCoupling.cpp rename to src/devices/fake/fakeJointCoupling/fakeJointCoupling.cpp diff --git a/src/devices/fakeJointCoupling/fakeJointCoupling.h b/src/devices/fake/fakeJointCoupling/fakeJointCoupling.h similarity index 100% rename from src/devices/fakeJointCoupling/fakeJointCoupling.h rename to src/devices/fake/fakeJointCoupling/fakeJointCoupling.h diff --git a/src/devices/fakeJointCoupling/tests/CMakeLists.txt b/src/devices/fake/fakeJointCoupling/tests/CMakeLists.txt similarity index 100% rename from src/devices/fakeJointCoupling/tests/CMakeLists.txt rename to src/devices/fake/fakeJointCoupling/tests/CMakeLists.txt diff --git a/src/devices/fakeJointCoupling/tests/fakeJointCoupling_test.cpp b/src/devices/fake/fakeJointCoupling/tests/fakeJointCoupling_test.cpp similarity index 100% rename from src/devices/fakeJointCoupling/tests/fakeJointCoupling_test.cpp rename to src/devices/fake/fakeJointCoupling/tests/fakeJointCoupling_test.cpp diff --git a/src/devices/fakeJoypad/CMakeLists.txt b/src/devices/fake/fakeJoypad/CMakeLists.txt similarity index 100% rename from src/devices/fakeJoypad/CMakeLists.txt rename to src/devices/fake/fakeJoypad/CMakeLists.txt diff --git a/src/devices/fakeJoypad/fakeJoypad.cpp b/src/devices/fake/fakeJoypad/fakeJoypad.cpp similarity index 100% rename from src/devices/fakeJoypad/fakeJoypad.cpp rename to src/devices/fake/fakeJoypad/fakeJoypad.cpp diff --git a/src/devices/fakeJoypad/fakeJoypad.h b/src/devices/fake/fakeJoypad/fakeJoypad.h similarity index 100% rename from src/devices/fakeJoypad/fakeJoypad.h rename to src/devices/fake/fakeJoypad/fakeJoypad.h diff --git a/src/devices/fakeJoypad/tests/CMakeLists.txt b/src/devices/fake/fakeJoypad/tests/CMakeLists.txt similarity index 100% rename from src/devices/fakeJoypad/tests/CMakeLists.txt rename to src/devices/fake/fakeJoypad/tests/CMakeLists.txt diff --git a/src/devices/fakeJoypad/tests/fakeJoypad_test.cpp b/src/devices/fake/fakeJoypad/tests/fakeJoypad_test.cpp similarity index 100% rename from src/devices/fakeJoypad/tests/fakeJoypad_test.cpp rename to src/devices/fake/fakeJoypad/tests/fakeJoypad_test.cpp diff --git a/src/devices/fakeLLMDevice/CMakeLists.txt b/src/devices/fake/fakeLLMDevice/CMakeLists.txt similarity index 100% rename from src/devices/fakeLLMDevice/CMakeLists.txt rename to src/devices/fake/fakeLLMDevice/CMakeLists.txt diff --git a/src/devices/fakeLLMDevice/fakeLLMDevice.cpp b/src/devices/fake/fakeLLMDevice/fakeLLMDevice.cpp similarity index 100% rename from src/devices/fakeLLMDevice/fakeLLMDevice.cpp rename to src/devices/fake/fakeLLMDevice/fakeLLMDevice.cpp diff --git a/src/devices/fakeLLMDevice/fakeLLMDevice.h b/src/devices/fake/fakeLLMDevice/fakeLLMDevice.h similarity index 100% rename from src/devices/fakeLLMDevice/fakeLLMDevice.h rename to src/devices/fake/fakeLLMDevice/fakeLLMDevice.h diff --git a/src/devices/fakeLLMDevice/tests/CMakeLists.txt b/src/devices/fake/fakeLLMDevice/tests/CMakeLists.txt similarity index 100% rename from src/devices/fakeLLMDevice/tests/CMakeLists.txt rename to src/devices/fake/fakeLLMDevice/tests/CMakeLists.txt diff --git a/src/devices/fakeLLMDevice/tests/fakeLLMDevice_test.cpp b/src/devices/fake/fakeLLMDevice/tests/fakeLLMDevice_test.cpp similarity index 100% rename from src/devices/fakeLLMDevice/tests/fakeLLMDevice_test.cpp rename to src/devices/fake/fakeLLMDevice/tests/fakeLLMDevice_test.cpp diff --git a/src/devices/fakeLaser/CMakeLists.txt b/src/devices/fake/fakeLaser/CMakeLists.txt similarity index 100% rename from src/devices/fakeLaser/CMakeLists.txt rename to src/devices/fake/fakeLaser/CMakeLists.txt diff --git a/src/devices/fakeLaser/fakeLaser.cpp b/src/devices/fake/fakeLaser/fakeLaser.cpp similarity index 100% rename from src/devices/fakeLaser/fakeLaser.cpp rename to src/devices/fake/fakeLaser/fakeLaser.cpp diff --git a/src/devices/fakeLaser/fakeLaser.h b/src/devices/fake/fakeLaser/fakeLaser.h similarity index 100% rename from src/devices/fakeLaser/fakeLaser.h rename to src/devices/fake/fakeLaser/fakeLaser.h diff --git a/src/devices/fakeLaser/info/ex1.jpg b/src/devices/fake/fakeLaser/info/ex1.jpg similarity index 100% rename from src/devices/fakeLaser/info/ex1.jpg rename to src/devices/fake/fakeLaser/info/ex1.jpg diff --git a/src/devices/fakeLaser/info/ex2.jpg b/src/devices/fake/fakeLaser/info/ex2.jpg similarity index 100% rename from src/devices/fakeLaser/info/ex2.jpg rename to src/devices/fake/fakeLaser/info/ex2.jpg diff --git a/src/devices/fakeLaser/info/mymap.rar b/src/devices/fake/fakeLaser/info/mymap.rar similarity index 100% rename from src/devices/fakeLaser/info/mymap.rar rename to src/devices/fake/fakeLaser/info/mymap.rar diff --git a/src/devices/fakeLaser/info/readme.txt b/src/devices/fake/fakeLaser/info/readme.txt similarity index 100% rename from src/devices/fakeLaser/info/readme.txt rename to src/devices/fake/fakeLaser/info/readme.txt diff --git a/src/devices/fakeLaser/tests/CMakeLists.txt b/src/devices/fake/fakeLaser/tests/CMakeLists.txt similarity index 100% rename from src/devices/fakeLaser/tests/CMakeLists.txt rename to src/devices/fake/fakeLaser/tests/CMakeLists.txt diff --git a/src/devices/fakeLaser/tests/fakeLaser_test.cpp b/src/devices/fake/fakeLaser/tests/fakeLaser_test.cpp similarity index 100% rename from src/devices/fakeLaser/tests/fakeLaser_test.cpp rename to src/devices/fake/fakeLaser/tests/fakeLaser_test.cpp diff --git a/src/devices/fakeLaserWithMotor/CMakeLists.txt b/src/devices/fake/fakeLaserWithMotor/CMakeLists.txt similarity index 100% rename from src/devices/fakeLaserWithMotor/CMakeLists.txt rename to src/devices/fake/fakeLaserWithMotor/CMakeLists.txt diff --git a/src/devices/fakeLaserWithMotor/fakeLaserWithMotor.cpp b/src/devices/fake/fakeLaserWithMotor/fakeLaserWithMotor.cpp similarity index 100% rename from src/devices/fakeLaserWithMotor/fakeLaserWithMotor.cpp rename to src/devices/fake/fakeLaserWithMotor/fakeLaserWithMotor.cpp diff --git a/src/devices/fakeLaserWithMotor/fakeLaserWithMotor.h b/src/devices/fake/fakeLaserWithMotor/fakeLaserWithMotor.h similarity index 100% rename from src/devices/fakeLaserWithMotor/fakeLaserWithMotor.h rename to src/devices/fake/fakeLaserWithMotor/fakeLaserWithMotor.h diff --git a/src/devices/fakeLaserWithMotor/fakeLaserWithMotor_laser.cpp b/src/devices/fake/fakeLaserWithMotor/fakeLaserWithMotor_laser.cpp similarity index 100% rename from src/devices/fakeLaserWithMotor/fakeLaserWithMotor_laser.cpp rename to src/devices/fake/fakeLaserWithMotor/fakeLaserWithMotor_laser.cpp diff --git a/src/devices/fakeLaserWithMotor/fakeLaserWithMotor_motors.cpp b/src/devices/fake/fakeLaserWithMotor/fakeLaserWithMotor_motors.cpp similarity index 100% rename from src/devices/fakeLaserWithMotor/fakeLaserWithMotor_motors.cpp rename to src/devices/fake/fakeLaserWithMotor/fakeLaserWithMotor_motors.cpp diff --git a/src/devices/fakeLaserWithMotor/fakeLaserWithMotor_utils.cpp b/src/devices/fake/fakeLaserWithMotor/fakeLaserWithMotor_utils.cpp similarity index 100% rename from src/devices/fakeLaserWithMotor/fakeLaserWithMotor_utils.cpp rename to src/devices/fake/fakeLaserWithMotor/fakeLaserWithMotor_utils.cpp diff --git a/src/devices/fakeLaserWithMotor/robotinterface_xml/robot.urdf b/src/devices/fake/fakeLaserWithMotor/robotinterface_xml/robot.urdf similarity index 100% rename from src/devices/fakeLaserWithMotor/robotinterface_xml/robot.urdf rename to src/devices/fake/fakeLaserWithMotor/robotinterface_xml/robot.urdf diff --git a/src/devices/fakeLaserWithMotor/robotinterface_xml/robot_state_pub.launch b/src/devices/fake/fakeLaserWithMotor/robotinterface_xml/robot_state_pub.launch similarity index 100% rename from src/devices/fakeLaserWithMotor/robotinterface_xml/robot_state_pub.launch rename to src/devices/fake/fakeLaserWithMotor/robotinterface_xml/robot_state_pub.launch diff --git a/src/devices/fakeLaserWithMotor/robotinterface_xml/robot_state_pub2.py b/src/devices/fake/fakeLaserWithMotor/robotinterface_xml/robot_state_pub2.py similarity index 100% rename from src/devices/fakeLaserWithMotor/robotinterface_xml/robot_state_pub2.py rename to src/devices/fake/fakeLaserWithMotor/robotinterface_xml/robot_state_pub2.py diff --git a/src/devices/fakeLaserWithMotor/robotinterface_xml/ros.xml b/src/devices/fake/fakeLaserWithMotor/robotinterface_xml/ros.xml similarity index 100% rename from src/devices/fakeLaserWithMotor/robotinterface_xml/ros.xml rename to src/devices/fake/fakeLaserWithMotor/robotinterface_xml/ros.xml diff --git a/src/devices/fakeLaserWithMotor/robotinterface_xml/ros2.xml b/src/devices/fake/fakeLaserWithMotor/robotinterface_xml/ros2.xml similarity index 100% rename from src/devices/fakeLaserWithMotor/robotinterface_xml/ros2.xml rename to src/devices/fake/fakeLaserWithMotor/robotinterface_xml/ros2.xml diff --git a/src/devices/fakeLaserWithMotor/robotinterface_xml/ros2b.xml b/src/devices/fake/fakeLaserWithMotor/robotinterface_xml/ros2b.xml similarity index 100% rename from src/devices/fakeLaserWithMotor/robotinterface_xml/ros2b.xml rename to src/devices/fake/fakeLaserWithMotor/robotinterface_xml/ros2b.xml diff --git a/src/devices/fakeLaserWithMotor/robotinterface_xml/yarp.xml b/src/devices/fake/fakeLaserWithMotor/robotinterface_xml/yarp.xml similarity index 100% rename from src/devices/fakeLaserWithMotor/robotinterface_xml/yarp.xml rename to src/devices/fake/fakeLaserWithMotor/robotinterface_xml/yarp.xml diff --git a/src/devices/fakeLaserWithMotor/tests/CMakeLists.txt b/src/devices/fake/fakeLaserWithMotor/tests/CMakeLists.txt similarity index 100% rename from src/devices/fakeLaserWithMotor/tests/CMakeLists.txt rename to src/devices/fake/fakeLaserWithMotor/tests/CMakeLists.txt diff --git a/src/devices/fakeLaserWithMotor/tests/fakeLaserWithMotor_test.cpp b/src/devices/fake/fakeLaserWithMotor/tests/fakeLaserWithMotor_test.cpp similarity index 100% rename from src/devices/fakeLaserWithMotor/tests/fakeLaserWithMotor_test.cpp rename to src/devices/fake/fakeLaserWithMotor/tests/fakeLaserWithMotor_test.cpp diff --git a/src/devices/fakeLocalizerDevice/CMakeLists.txt b/src/devices/fake/fakeLocalizerDevice/CMakeLists.txt similarity index 100% rename from src/devices/fakeLocalizerDevice/CMakeLists.txt rename to src/devices/fake/fakeLocalizerDevice/CMakeLists.txt diff --git a/src/devices/fakeLocalizerDevice/fakeLocalizer.cpp b/src/devices/fake/fakeLocalizerDevice/fakeLocalizer.cpp similarity index 100% rename from src/devices/fakeLocalizerDevice/fakeLocalizer.cpp rename to src/devices/fake/fakeLocalizerDevice/fakeLocalizer.cpp diff --git a/src/devices/fakeLocalizerDevice/fakeLocalizer.h b/src/devices/fake/fakeLocalizerDevice/fakeLocalizer.h similarity index 100% rename from src/devices/fakeLocalizerDevice/fakeLocalizer.h rename to src/devices/fake/fakeLocalizerDevice/fakeLocalizer.h diff --git a/src/devices/fakeLocalizerDevice/tests/CMakeLists.txt b/src/devices/fake/fakeLocalizerDevice/tests/CMakeLists.txt similarity index 100% rename from src/devices/fakeLocalizerDevice/tests/CMakeLists.txt rename to src/devices/fake/fakeLocalizerDevice/tests/CMakeLists.txt diff --git a/src/devices/fakeLocalizerDevice/tests/fakeLocalizer_test.cpp b/src/devices/fake/fakeLocalizerDevice/tests/fakeLocalizer_test.cpp similarity index 100% rename from src/devices/fakeLocalizerDevice/tests/fakeLocalizer_test.cpp rename to src/devices/fake/fakeLocalizerDevice/tests/fakeLocalizer_test.cpp diff --git a/src/devices/fakeMicrophone/CMakeLists.txt b/src/devices/fake/fakeMicrophone/CMakeLists.txt similarity index 100% rename from src/devices/fakeMicrophone/CMakeLists.txt rename to src/devices/fake/fakeMicrophone/CMakeLists.txt diff --git a/src/devices/fakeMicrophone/fakeMicrophone.cpp b/src/devices/fake/fakeMicrophone/fakeMicrophone.cpp similarity index 100% rename from src/devices/fakeMicrophone/fakeMicrophone.cpp rename to src/devices/fake/fakeMicrophone/fakeMicrophone.cpp diff --git a/src/devices/fakeMicrophone/fakeMicrophone.h b/src/devices/fake/fakeMicrophone/fakeMicrophone.h similarity index 100% rename from src/devices/fakeMicrophone/fakeMicrophone.h rename to src/devices/fake/fakeMicrophone/fakeMicrophone.h diff --git a/src/devices/fakeMicrophone/tests/CMakeLists.txt b/src/devices/fake/fakeMicrophone/tests/CMakeLists.txt similarity index 100% rename from src/devices/fakeMicrophone/tests/CMakeLists.txt rename to src/devices/fake/fakeMicrophone/tests/CMakeLists.txt diff --git a/src/devices/fakeMicrophone/tests/fakeMicrophone_test.cpp b/src/devices/fake/fakeMicrophone/tests/fakeMicrophone_test.cpp similarity index 100% rename from src/devices/fakeMicrophone/tests/fakeMicrophone_test.cpp rename to src/devices/fake/fakeMicrophone/tests/fakeMicrophone_test.cpp diff --git a/src/devices/fakeMotionControl/CMakeLists.txt b/src/devices/fake/fakeMotionControl/CMakeLists.txt similarity index 100% rename from src/devices/fakeMotionControl/CMakeLists.txt rename to src/devices/fake/fakeMotionControl/CMakeLists.txt diff --git a/src/devices/fakeMotionControl/fakeMotionControl.cpp b/src/devices/fake/fakeMotionControl/fakeMotionControl.cpp similarity index 100% rename from src/devices/fakeMotionControl/fakeMotionControl.cpp rename to src/devices/fake/fakeMotionControl/fakeMotionControl.cpp diff --git a/src/devices/fakeMotionControl/fakeMotionControl.h b/src/devices/fake/fakeMotionControl/fakeMotionControl.h similarity index 100% rename from src/devices/fakeMotionControl/fakeMotionControl.h rename to src/devices/fake/fakeMotionControl/fakeMotionControl.h diff --git a/src/devices/fakeMotionControl/tests/CMakeLists.txt b/src/devices/fake/fakeMotionControl/tests/CMakeLists.txt similarity index 100% rename from src/devices/fakeMotionControl/tests/CMakeLists.txt rename to src/devices/fake/fakeMotionControl/tests/CMakeLists.txt diff --git a/src/devices/fakeMotionControl/tests/fakeMotionControl_test.cpp b/src/devices/fake/fakeMotionControl/tests/fakeMotionControl_test.cpp similarity index 100% rename from src/devices/fakeMotionControl/tests/fakeMotionControl_test.cpp rename to src/devices/fake/fakeMotionControl/tests/fakeMotionControl_test.cpp diff --git a/src/devices/fakeMotionControlMicro/CMakeLists.txt b/src/devices/fake/fakeMotionControlMicro/CMakeLists.txt similarity index 100% rename from src/devices/fakeMotionControlMicro/CMakeLists.txt rename to src/devices/fake/fakeMotionControlMicro/CMakeLists.txt diff --git a/src/devices/fakeMotionControlMicro/fakeMotionControlMicro.cpp b/src/devices/fake/fakeMotionControlMicro/fakeMotionControlMicro.cpp similarity index 100% rename from src/devices/fakeMotionControlMicro/fakeMotionControlMicro.cpp rename to src/devices/fake/fakeMotionControlMicro/fakeMotionControlMicro.cpp diff --git a/src/devices/fakeMotionControlMicro/fakeMotionControlMicro.h b/src/devices/fake/fakeMotionControlMicro/fakeMotionControlMicro.h similarity index 100% rename from src/devices/fakeMotionControlMicro/fakeMotionControlMicro.h rename to src/devices/fake/fakeMotionControlMicro/fakeMotionControlMicro.h diff --git a/src/devices/fakeMotionControlMicro/tests/CMakeLists.txt b/src/devices/fake/fakeMotionControlMicro/tests/CMakeLists.txt similarity index 100% rename from src/devices/fakeMotionControlMicro/tests/CMakeLists.txt rename to src/devices/fake/fakeMotionControlMicro/tests/CMakeLists.txt diff --git a/src/devices/fakeMotionControlMicro/tests/fakeMotionControlMicro_test.cpp b/src/devices/fake/fakeMotionControlMicro/tests/fakeMotionControlMicro_test.cpp similarity index 100% rename from src/devices/fakeMotionControlMicro/tests/fakeMotionControlMicro_test.cpp rename to src/devices/fake/fakeMotionControlMicro/tests/fakeMotionControlMicro_test.cpp diff --git a/src/devices/fakeNavigationDevice/CMakeLists.txt b/src/devices/fake/fakeNavigationDevice/CMakeLists.txt similarity index 100% rename from src/devices/fakeNavigationDevice/CMakeLists.txt rename to src/devices/fake/fakeNavigationDevice/CMakeLists.txt diff --git a/src/devices/fakeNavigationDevice/fakeNavigationDev.cpp b/src/devices/fake/fakeNavigationDevice/fakeNavigationDev.cpp similarity index 100% rename from src/devices/fakeNavigationDevice/fakeNavigationDev.cpp rename to src/devices/fake/fakeNavigationDevice/fakeNavigationDev.cpp diff --git a/src/devices/fakeNavigationDevice/fakeNavigationDev.h b/src/devices/fake/fakeNavigationDevice/fakeNavigationDev.h similarity index 100% rename from src/devices/fakeNavigationDevice/fakeNavigationDev.h rename to src/devices/fake/fakeNavigationDevice/fakeNavigationDev.h diff --git a/src/devices/fakeNavigationDevice/tests/CMakeLists.txt b/src/devices/fake/fakeNavigationDevice/tests/CMakeLists.txt similarity index 100% rename from src/devices/fakeNavigationDevice/tests/CMakeLists.txt rename to src/devices/fake/fakeNavigationDevice/tests/CMakeLists.txt diff --git a/src/devices/fakeNavigationDevice/tests/fakeNavigation_test.cpp b/src/devices/fake/fakeNavigationDevice/tests/fakeNavigation_test.cpp similarity index 100% rename from src/devices/fakeNavigationDevice/tests/fakeNavigation_test.cpp rename to src/devices/fake/fakeNavigationDevice/tests/fakeNavigation_test.cpp diff --git a/src/devices/fakeOdometry2D/CMakeLists.txt b/src/devices/fake/fakeOdometry2D/CMakeLists.txt similarity index 100% rename from src/devices/fakeOdometry2D/CMakeLists.txt rename to src/devices/fake/fakeOdometry2D/CMakeLists.txt diff --git a/src/devices/fakeOdometry2D/fakeOdometry2D.cpp b/src/devices/fake/fakeOdometry2D/fakeOdometry2D.cpp similarity index 100% rename from src/devices/fakeOdometry2D/fakeOdometry2D.cpp rename to src/devices/fake/fakeOdometry2D/fakeOdometry2D.cpp diff --git a/src/devices/fakeOdometry2D/fakeOdometry2D.h b/src/devices/fake/fakeOdometry2D/fakeOdometry2D.h similarity index 100% rename from src/devices/fakeOdometry2D/fakeOdometry2D.h rename to src/devices/fake/fakeOdometry2D/fakeOdometry2D.h diff --git a/src/devices/fakeOdometry2D/tests/CMakeLists.txt b/src/devices/fake/fakeOdometry2D/tests/CMakeLists.txt similarity index 100% rename from src/devices/fakeOdometry2D/tests/CMakeLists.txt rename to src/devices/fake/fakeOdometry2D/tests/CMakeLists.txt diff --git a/src/devices/fakeOdometry2D/tests/fakeOdometry2D_test.cpp b/src/devices/fake/fakeOdometry2D/tests/fakeOdometry2D_test.cpp similarity index 100% rename from src/devices/fakeOdometry2D/tests/fakeOdometry2D_test.cpp rename to src/devices/fake/fakeOdometry2D/tests/fakeOdometry2D_test.cpp diff --git a/src/devices/fakePositionSensor/CMakeLists.txt b/src/devices/fake/fakePositionSensor/CMakeLists.txt similarity index 100% rename from src/devices/fakePositionSensor/CMakeLists.txt rename to src/devices/fake/fakePositionSensor/CMakeLists.txt diff --git a/src/devices/fakePositionSensor/fakePositionSensor.cpp b/src/devices/fake/fakePositionSensor/fakePositionSensor.cpp similarity index 100% rename from src/devices/fakePositionSensor/fakePositionSensor.cpp rename to src/devices/fake/fakePositionSensor/fakePositionSensor.cpp diff --git a/src/devices/fakePositionSensor/fakePositionSensor.h b/src/devices/fake/fakePositionSensor/fakePositionSensor.h similarity index 100% rename from src/devices/fakePositionSensor/fakePositionSensor.h rename to src/devices/fake/fakePositionSensor/fakePositionSensor.h diff --git a/src/devices/fakePositionSensor/tests/CMakeLists.txt b/src/devices/fake/fakePositionSensor/tests/CMakeLists.txt similarity index 100% rename from src/devices/fakePositionSensor/tests/CMakeLists.txt rename to src/devices/fake/fakePositionSensor/tests/CMakeLists.txt diff --git a/src/devices/fakePositionSensor/tests/fakePositionSensor_test.cpp b/src/devices/fake/fakePositionSensor/tests/fakePositionSensor_test.cpp similarity index 100% rename from src/devices/fakePositionSensor/tests/fakePositionSensor_test.cpp rename to src/devices/fake/fakePositionSensor/tests/fakePositionSensor_test.cpp diff --git a/src/devices/fakeSerialPort/CMakeLists.txt b/src/devices/fake/fakeSerialPort/CMakeLists.txt similarity index 100% rename from src/devices/fakeSerialPort/CMakeLists.txt rename to src/devices/fake/fakeSerialPort/CMakeLists.txt diff --git a/src/devices/fakeSerialPort/fakeSerialPort.cpp b/src/devices/fake/fakeSerialPort/fakeSerialPort.cpp similarity index 100% rename from src/devices/fakeSerialPort/fakeSerialPort.cpp rename to src/devices/fake/fakeSerialPort/fakeSerialPort.cpp diff --git a/src/devices/fakeSerialPort/fakeSerialPort.h b/src/devices/fake/fakeSerialPort/fakeSerialPort.h similarity index 100% rename from src/devices/fakeSerialPort/fakeSerialPort.h rename to src/devices/fake/fakeSerialPort/fakeSerialPort.h diff --git a/src/devices/fakeSerialPort/fakeSerialPort_cfg.ini b/src/devices/fake/fakeSerialPort/fakeSerialPort_cfg.ini similarity index 100% rename from src/devices/fakeSerialPort/fakeSerialPort_cfg.ini rename to src/devices/fake/fakeSerialPort/fakeSerialPort_cfg.ini diff --git a/src/devices/fakeSerialPort/tests/CMakeLists.txt b/src/devices/fake/fakeSerialPort/tests/CMakeLists.txt similarity index 100% rename from src/devices/fakeSerialPort/tests/CMakeLists.txt rename to src/devices/fake/fakeSerialPort/tests/CMakeLists.txt diff --git a/src/devices/fakeSerialPort/tests/fakeSerialPort_test.cpp b/src/devices/fake/fakeSerialPort/tests/fakeSerialPort_test.cpp similarity index 100% rename from src/devices/fakeSerialPort/tests/fakeSerialPort_test.cpp rename to src/devices/fake/fakeSerialPort/tests/fakeSerialPort_test.cpp diff --git a/src/devices/fakeSpeaker/CMakeLists.txt b/src/devices/fake/fakeSpeaker/CMakeLists.txt similarity index 100% rename from src/devices/fakeSpeaker/CMakeLists.txt rename to src/devices/fake/fakeSpeaker/CMakeLists.txt diff --git a/src/devices/fakeSpeaker/fakeSpeaker.cpp b/src/devices/fake/fakeSpeaker/fakeSpeaker.cpp similarity index 100% rename from src/devices/fakeSpeaker/fakeSpeaker.cpp rename to src/devices/fake/fakeSpeaker/fakeSpeaker.cpp diff --git a/src/devices/fakeSpeaker/fakeSpeaker.h b/src/devices/fake/fakeSpeaker/fakeSpeaker.h similarity index 100% rename from src/devices/fakeSpeaker/fakeSpeaker.h rename to src/devices/fake/fakeSpeaker/fakeSpeaker.h diff --git a/src/devices/fakeSpeaker/tests/CMakeLists.txt b/src/devices/fake/fakeSpeaker/tests/CMakeLists.txt similarity index 100% rename from src/devices/fakeSpeaker/tests/CMakeLists.txt rename to src/devices/fake/fakeSpeaker/tests/CMakeLists.txt diff --git a/src/devices/fakeSpeaker/tests/fakeSpeaker_test.cpp b/src/devices/fake/fakeSpeaker/tests/fakeSpeaker_test.cpp similarity index 100% rename from src/devices/fakeSpeaker/tests/fakeSpeaker_test.cpp rename to src/devices/fake/fakeSpeaker/tests/fakeSpeaker_test.cpp diff --git a/src/devices/fakeSpeechSynthesizer/CMakeLists.txt b/src/devices/fake/fakeSpeechSynthesizer/CMakeLists.txt similarity index 100% rename from src/devices/fakeSpeechSynthesizer/CMakeLists.txt rename to src/devices/fake/fakeSpeechSynthesizer/CMakeLists.txt diff --git a/src/devices/fakeSpeechSynthesizer/fakeSpeechSynthesizer.cpp b/src/devices/fake/fakeSpeechSynthesizer/fakeSpeechSynthesizer.cpp similarity index 100% rename from src/devices/fakeSpeechSynthesizer/fakeSpeechSynthesizer.cpp rename to src/devices/fake/fakeSpeechSynthesizer/fakeSpeechSynthesizer.cpp diff --git a/src/devices/fakeSpeechSynthesizer/fakeSpeechSynthesizer.h b/src/devices/fake/fakeSpeechSynthesizer/fakeSpeechSynthesizer.h similarity index 100% rename from src/devices/fakeSpeechSynthesizer/fakeSpeechSynthesizer.h rename to src/devices/fake/fakeSpeechSynthesizer/fakeSpeechSynthesizer.h diff --git a/src/devices/fakeSpeechSynthesizer/tests/CMakeLists.txt b/src/devices/fake/fakeSpeechSynthesizer/tests/CMakeLists.txt similarity index 100% rename from src/devices/fakeSpeechSynthesizer/tests/CMakeLists.txt rename to src/devices/fake/fakeSpeechSynthesizer/tests/CMakeLists.txt diff --git a/src/devices/fakeSpeechSynthesizer/tests/fakeSpeechSynthesizer_test.cpp b/src/devices/fake/fakeSpeechSynthesizer/tests/fakeSpeechSynthesizer_test.cpp similarity index 100% rename from src/devices/fakeSpeechSynthesizer/tests/fakeSpeechSynthesizer_test.cpp rename to src/devices/fake/fakeSpeechSynthesizer/tests/fakeSpeechSynthesizer_test.cpp diff --git a/src/devices/fakeSpeechTranscription/CMakeLists.txt b/src/devices/fake/fakeSpeechTranscription/CMakeLists.txt similarity index 100% rename from src/devices/fakeSpeechTranscription/CMakeLists.txt rename to src/devices/fake/fakeSpeechTranscription/CMakeLists.txt diff --git a/src/devices/fakeSpeechTranscription/fakeSpeechTranscription.cpp b/src/devices/fake/fakeSpeechTranscription/fakeSpeechTranscription.cpp similarity index 100% rename from src/devices/fakeSpeechTranscription/fakeSpeechTranscription.cpp rename to src/devices/fake/fakeSpeechTranscription/fakeSpeechTranscription.cpp diff --git a/src/devices/fakeSpeechTranscription/fakeSpeechTranscription.h b/src/devices/fake/fakeSpeechTranscription/fakeSpeechTranscription.h similarity index 100% rename from src/devices/fakeSpeechTranscription/fakeSpeechTranscription.h rename to src/devices/fake/fakeSpeechTranscription/fakeSpeechTranscription.h diff --git a/src/devices/fakeSpeechTranscription/tests/CMakeLists.txt b/src/devices/fake/fakeSpeechTranscription/tests/CMakeLists.txt similarity index 100% rename from src/devices/fakeSpeechTranscription/tests/CMakeLists.txt rename to src/devices/fake/fakeSpeechTranscription/tests/CMakeLists.txt diff --git a/src/devices/fakeSpeechTranscription/tests/fakeSpeechTranscription_test.cpp b/src/devices/fake/fakeSpeechTranscription/tests/fakeSpeechTranscription_test.cpp similarity index 100% rename from src/devices/fakeSpeechTranscription/tests/fakeSpeechTranscription_test.cpp rename to src/devices/fake/fakeSpeechTranscription/tests/fakeSpeechTranscription_test.cpp diff --git a/src/devices/fakebot/CMakeLists.txt b/src/devices/fake/fakebot/CMakeLists.txt similarity index 100% rename from src/devices/fakebot/CMakeLists.txt rename to src/devices/fake/fakebot/CMakeLists.txt diff --git a/src/devices/fakebot/FakeBot.cpp b/src/devices/fake/fakebot/FakeBot.cpp similarity index 100% rename from src/devices/fakebot/FakeBot.cpp rename to src/devices/fake/fakebot/FakeBot.cpp diff --git a/src/devices/fakebot/FakeBot.h b/src/devices/fake/fakebot/FakeBot.h similarity index 100% rename from src/devices/fakebot/FakeBot.h rename to src/devices/fake/fakebot/FakeBot.h diff --git a/src/devices/fakebot/fakebot.example.ini b/src/devices/fake/fakebot/fakebot.example.ini similarity index 100% rename from src/devices/fakebot/fakebot.example.ini rename to src/devices/fake/fakebot/fakebot.example.ini diff --git a/src/devices/fakebot/textures/back.ppm b/src/devices/fake/fakebot/textures/back.ppm similarity index 100% rename from src/devices/fakebot/textures/back.ppm rename to src/devices/fake/fakebot/textures/back.ppm diff --git a/src/devices/fakebot/textures/fore.ppm b/src/devices/fake/fakebot/textures/fore.ppm similarity index 100% rename from src/devices/fakebot/textures/fore.ppm rename to src/devices/fake/fakebot/textures/fore.ppm diff --git a/src/devices/messages/CMakeLists.txt b/src/devices/messages/CMakeLists.txt new file mode 100644 index 00000000000..f650f05c59a --- /dev/null +++ b/src/devices/messages/CMakeLists.txt @@ -0,0 +1,17 @@ +# SPDX-FileCopyrightText: 2023-2023 Istituto Italiano di Tecnologia (IIT) +# SPDX-License-Identifier: BSD-3-Clause + +add_subdirectory(framegrabber_protocol) +add_subdirectory(frameTransformStorageMsgs) +add_subdirectory(IChatBotMsgs) +add_subdirectory(ILLMMsgs) +add_subdirectory(IAudioGrabberMsgs) +add_subdirectory(IMap2DMsgs) +add_subdirectory(INavigation2DMsgs) +add_subdirectory(ILocalization2DMsgs) +add_subdirectory(IOdometry2DMsgs) +add_subdirectory(ISerialMsgs) +add_subdirectory(ISpeechSynthesizerMsgs) +add_subdirectory(ISpeechTranscriptionMsgs) +add_subdirectory(mobileBaseVelocityControlMsgs) +add_subdirectory(multipleAnalogSensorsMsgs) diff --git a/src/devices/IAudioGrabberMsgs/CMakeLists.txt b/src/devices/messages/IAudioGrabberMsgs/CMakeLists.txt similarity index 100% rename from src/devices/IAudioGrabberMsgs/CMakeLists.txt rename to src/devices/messages/IAudioGrabberMsgs/CMakeLists.txt diff --git a/src/devices/IAudioGrabberMsgs/IAudioGrabberMsgs.thrift b/src/devices/messages/IAudioGrabberMsgs/IAudioGrabberMsgs.thrift similarity index 100% rename from src/devices/IAudioGrabberMsgs/IAudioGrabberMsgs.thrift rename to src/devices/messages/IAudioGrabberMsgs/IAudioGrabberMsgs.thrift diff --git a/src/devices/IAudioGrabberMsgs/idl_generated_code/IAudioGrabberMsgs.cpp b/src/devices/messages/IAudioGrabberMsgs/idl_generated_code/IAudioGrabberMsgs.cpp similarity index 100% rename from src/devices/IAudioGrabberMsgs/idl_generated_code/IAudioGrabberMsgs.cpp rename to src/devices/messages/IAudioGrabberMsgs/idl_generated_code/IAudioGrabberMsgs.cpp diff --git a/src/devices/IAudioGrabberMsgs/idl_generated_code/IAudioGrabberMsgs.h b/src/devices/messages/IAudioGrabberMsgs/idl_generated_code/IAudioGrabberMsgs.h similarity index 100% rename from src/devices/IAudioGrabberMsgs/idl_generated_code/IAudioGrabberMsgs.h rename to src/devices/messages/IAudioGrabberMsgs/idl_generated_code/IAudioGrabberMsgs.h diff --git a/src/devices/IAudioGrabberMsgs/idl_generated_code/IAudioGrabberMsgs_common.h b/src/devices/messages/IAudioGrabberMsgs/idl_generated_code/IAudioGrabberMsgs_common.h similarity index 100% rename from src/devices/IAudioGrabberMsgs/idl_generated_code/IAudioGrabberMsgs_common.h rename to src/devices/messages/IAudioGrabberMsgs/idl_generated_code/IAudioGrabberMsgs_common.h diff --git a/src/devices/IAudioGrabberMsgs/idl_generated_code/IAudioGrabberMsgs_index.txt b/src/devices/messages/IAudioGrabberMsgs/idl_generated_code/IAudioGrabberMsgs_index.txt similarity index 100% rename from src/devices/IAudioGrabberMsgs/idl_generated_code/IAudioGrabberMsgs_index.txt rename to src/devices/messages/IAudioGrabberMsgs/idl_generated_code/IAudioGrabberMsgs_index.txt diff --git a/src/devices/IAudioGrabberMsgs/idl_generated_code/return_getRecordingAudioBufferCurrentSize.cpp b/src/devices/messages/IAudioGrabberMsgs/idl_generated_code/return_getRecordingAudioBufferCurrentSize.cpp similarity index 100% rename from src/devices/IAudioGrabberMsgs/idl_generated_code/return_getRecordingAudioBufferCurrentSize.cpp rename to src/devices/messages/IAudioGrabberMsgs/idl_generated_code/return_getRecordingAudioBufferCurrentSize.cpp diff --git a/src/devices/IAudioGrabberMsgs/idl_generated_code/return_getRecordingAudioBufferCurrentSize.h b/src/devices/messages/IAudioGrabberMsgs/idl_generated_code/return_getRecordingAudioBufferCurrentSize.h similarity index 100% rename from src/devices/IAudioGrabberMsgs/idl_generated_code/return_getRecordingAudioBufferCurrentSize.h rename to src/devices/messages/IAudioGrabberMsgs/idl_generated_code/return_getRecordingAudioBufferCurrentSize.h diff --git a/src/devices/IAudioGrabberMsgs/idl_generated_code/return_getRecordingAudioBufferMaxSize.cpp b/src/devices/messages/IAudioGrabberMsgs/idl_generated_code/return_getRecordingAudioBufferMaxSize.cpp similarity index 100% rename from src/devices/IAudioGrabberMsgs/idl_generated_code/return_getRecordingAudioBufferMaxSize.cpp rename to src/devices/messages/IAudioGrabberMsgs/idl_generated_code/return_getRecordingAudioBufferMaxSize.cpp diff --git a/src/devices/IAudioGrabberMsgs/idl_generated_code/return_getRecordingAudioBufferMaxSize.h b/src/devices/messages/IAudioGrabberMsgs/idl_generated_code/return_getRecordingAudioBufferMaxSize.h similarity index 100% rename from src/devices/IAudioGrabberMsgs/idl_generated_code/return_getRecordingAudioBufferMaxSize.h rename to src/devices/messages/IAudioGrabberMsgs/idl_generated_code/return_getRecordingAudioBufferMaxSize.h diff --git a/src/devices/IAudioGrabberMsgs/idl_generated_code/return_getSound.cpp b/src/devices/messages/IAudioGrabberMsgs/idl_generated_code/return_getSound.cpp similarity index 100% rename from src/devices/IAudioGrabberMsgs/idl_generated_code/return_getSound.cpp rename to src/devices/messages/IAudioGrabberMsgs/idl_generated_code/return_getSound.cpp diff --git a/src/devices/IAudioGrabberMsgs/idl_generated_code/return_getSound.h b/src/devices/messages/IAudioGrabberMsgs/idl_generated_code/return_getSound.h similarity index 100% rename from src/devices/IAudioGrabberMsgs/idl_generated_code/return_getSound.h rename to src/devices/messages/IAudioGrabberMsgs/idl_generated_code/return_getSound.h diff --git a/src/devices/IAudioGrabberMsgs/idl_generated_code/return_isRecording.cpp b/src/devices/messages/IAudioGrabberMsgs/idl_generated_code/return_isRecording.cpp similarity index 100% rename from src/devices/IAudioGrabberMsgs/idl_generated_code/return_isRecording.cpp rename to src/devices/messages/IAudioGrabberMsgs/idl_generated_code/return_isRecording.cpp diff --git a/src/devices/IAudioGrabberMsgs/idl_generated_code/return_isRecording.h b/src/devices/messages/IAudioGrabberMsgs/idl_generated_code/return_isRecording.h similarity index 100% rename from src/devices/IAudioGrabberMsgs/idl_generated_code/return_isRecording.h rename to src/devices/messages/IAudioGrabberMsgs/idl_generated_code/return_isRecording.h diff --git a/src/devices/IChatBotMsgs/CMakeLists.txt b/src/devices/messages/IChatBotMsgs/CMakeLists.txt similarity index 100% rename from src/devices/IChatBotMsgs/CMakeLists.txt rename to src/devices/messages/IChatBotMsgs/CMakeLists.txt diff --git a/src/devices/IChatBotMsgs/IChatBotMsgs.thrift b/src/devices/messages/IChatBotMsgs/IChatBotMsgs.thrift similarity index 100% rename from src/devices/IChatBotMsgs/IChatBotMsgs.thrift rename to src/devices/messages/IChatBotMsgs/IChatBotMsgs.thrift diff --git a/src/devices/IChatBotMsgs/idl_generated_code/IChatBotMsgs.cpp b/src/devices/messages/IChatBotMsgs/idl_generated_code/IChatBotMsgs.cpp similarity index 100% rename from src/devices/IChatBotMsgs/idl_generated_code/IChatBotMsgs.cpp rename to src/devices/messages/IChatBotMsgs/idl_generated_code/IChatBotMsgs.cpp diff --git a/src/devices/IChatBotMsgs/idl_generated_code/IChatBotMsgs.h b/src/devices/messages/IChatBotMsgs/idl_generated_code/IChatBotMsgs.h similarity index 100% rename from src/devices/IChatBotMsgs/idl_generated_code/IChatBotMsgs.h rename to src/devices/messages/IChatBotMsgs/idl_generated_code/IChatBotMsgs.h diff --git a/src/devices/IChatBotMsgs/idl_generated_code/IChatBotMsgs_index.txt b/src/devices/messages/IChatBotMsgs/idl_generated_code/IChatBotMsgs_index.txt similarity index 100% rename from src/devices/IChatBotMsgs/idl_generated_code/IChatBotMsgs_index.txt rename to src/devices/messages/IChatBotMsgs/idl_generated_code/IChatBotMsgs_index.txt diff --git a/src/devices/IChatBotMsgs/idl_generated_code/return_getLanguage.cpp b/src/devices/messages/IChatBotMsgs/idl_generated_code/return_getLanguage.cpp similarity index 100% rename from src/devices/IChatBotMsgs/idl_generated_code/return_getLanguage.cpp rename to src/devices/messages/IChatBotMsgs/idl_generated_code/return_getLanguage.cpp diff --git a/src/devices/IChatBotMsgs/idl_generated_code/return_getLanguage.h b/src/devices/messages/IChatBotMsgs/idl_generated_code/return_getLanguage.h similarity index 100% rename from src/devices/IChatBotMsgs/idl_generated_code/return_getLanguage.h rename to src/devices/messages/IChatBotMsgs/idl_generated_code/return_getLanguage.h diff --git a/src/devices/IChatBotMsgs/idl_generated_code/return_getStatus.cpp b/src/devices/messages/IChatBotMsgs/idl_generated_code/return_getStatus.cpp similarity index 100% rename from src/devices/IChatBotMsgs/idl_generated_code/return_getStatus.cpp rename to src/devices/messages/IChatBotMsgs/idl_generated_code/return_getStatus.cpp diff --git a/src/devices/IChatBotMsgs/idl_generated_code/return_getStatus.h b/src/devices/messages/IChatBotMsgs/idl_generated_code/return_getStatus.h similarity index 100% rename from src/devices/IChatBotMsgs/idl_generated_code/return_getStatus.h rename to src/devices/messages/IChatBotMsgs/idl_generated_code/return_getStatus.h diff --git a/src/devices/IChatBotMsgs/idl_generated_code/return_interact.cpp b/src/devices/messages/IChatBotMsgs/idl_generated_code/return_interact.cpp similarity index 100% rename from src/devices/IChatBotMsgs/idl_generated_code/return_interact.cpp rename to src/devices/messages/IChatBotMsgs/idl_generated_code/return_interact.cpp diff --git a/src/devices/IChatBotMsgs/idl_generated_code/return_interact.h b/src/devices/messages/IChatBotMsgs/idl_generated_code/return_interact.h similarity index 100% rename from src/devices/IChatBotMsgs/idl_generated_code/return_interact.h rename to src/devices/messages/IChatBotMsgs/idl_generated_code/return_interact.h diff --git a/src/devices/ILLMMsgs/CMakeLists.txt b/src/devices/messages/ILLMMsgs/CMakeLists.txt similarity index 100% rename from src/devices/ILLMMsgs/CMakeLists.txt rename to src/devices/messages/ILLMMsgs/CMakeLists.txt diff --git a/src/devices/ILLMMsgs/ILLMMsgs.thrift b/src/devices/messages/ILLMMsgs/ILLMMsgs.thrift similarity index 100% rename from src/devices/ILLMMsgs/ILLMMsgs.thrift rename to src/devices/messages/ILLMMsgs/ILLMMsgs.thrift diff --git a/src/devices/ILLMMsgs/idl_generated_code/ILLMMsgs_index.txt b/src/devices/messages/ILLMMsgs/idl_generated_code/ILLMMsgs_index.txt similarity index 100% rename from src/devices/ILLMMsgs/idl_generated_code/ILLMMsgs_index.txt rename to src/devices/messages/ILLMMsgs/idl_generated_code/ILLMMsgs_index.txt diff --git a/src/devices/ILLMMsgs/idl_generated_code/yarp/dev/llm/ILLMMsgs.cpp b/src/devices/messages/ILLMMsgs/idl_generated_code/yarp/dev/llm/ILLMMsgs.cpp similarity index 100% rename from src/devices/ILLMMsgs/idl_generated_code/yarp/dev/llm/ILLMMsgs.cpp rename to src/devices/messages/ILLMMsgs/idl_generated_code/yarp/dev/llm/ILLMMsgs.cpp diff --git a/src/devices/ILLMMsgs/idl_generated_code/yarp/dev/llm/ILLMMsgs.h b/src/devices/messages/ILLMMsgs/idl_generated_code/yarp/dev/llm/ILLMMsgs.h similarity index 100% rename from src/devices/ILLMMsgs/idl_generated_code/yarp/dev/llm/ILLMMsgs.h rename to src/devices/messages/ILLMMsgs/idl_generated_code/yarp/dev/llm/ILLMMsgs.h diff --git a/src/devices/ILLMMsgs/idl_generated_code/yarp/dev/llm/Message.cpp b/src/devices/messages/ILLMMsgs/idl_generated_code/yarp/dev/llm/Message.cpp similarity index 100% rename from src/devices/ILLMMsgs/idl_generated_code/yarp/dev/llm/Message.cpp rename to src/devices/messages/ILLMMsgs/idl_generated_code/yarp/dev/llm/Message.cpp diff --git a/src/devices/ILLMMsgs/idl_generated_code/yarp/dev/llm/Message.h b/src/devices/messages/ILLMMsgs/idl_generated_code/yarp/dev/llm/Message.h similarity index 100% rename from src/devices/ILLMMsgs/idl_generated_code/yarp/dev/llm/Message.h rename to src/devices/messages/ILLMMsgs/idl_generated_code/yarp/dev/llm/Message.h diff --git a/src/devices/ILLMMsgs/idl_generated_code/yarp/dev/llm/return_ask.cpp b/src/devices/messages/ILLMMsgs/idl_generated_code/yarp/dev/llm/return_ask.cpp similarity index 100% rename from src/devices/ILLMMsgs/idl_generated_code/yarp/dev/llm/return_ask.cpp rename to src/devices/messages/ILLMMsgs/idl_generated_code/yarp/dev/llm/return_ask.cpp diff --git a/src/devices/ILLMMsgs/idl_generated_code/yarp/dev/llm/return_ask.h b/src/devices/messages/ILLMMsgs/idl_generated_code/yarp/dev/llm/return_ask.h similarity index 100% rename from src/devices/ILLMMsgs/idl_generated_code/yarp/dev/llm/return_ask.h rename to src/devices/messages/ILLMMsgs/idl_generated_code/yarp/dev/llm/return_ask.h diff --git a/src/devices/ILLMMsgs/idl_generated_code/yarp/dev/llm/return_getConversation.cpp b/src/devices/messages/ILLMMsgs/idl_generated_code/yarp/dev/llm/return_getConversation.cpp similarity index 100% rename from src/devices/ILLMMsgs/idl_generated_code/yarp/dev/llm/return_getConversation.cpp rename to src/devices/messages/ILLMMsgs/idl_generated_code/yarp/dev/llm/return_getConversation.cpp diff --git a/src/devices/ILLMMsgs/idl_generated_code/yarp/dev/llm/return_getConversation.h b/src/devices/messages/ILLMMsgs/idl_generated_code/yarp/dev/llm/return_getConversation.h similarity index 100% rename from src/devices/ILLMMsgs/idl_generated_code/yarp/dev/llm/return_getConversation.h rename to src/devices/messages/ILLMMsgs/idl_generated_code/yarp/dev/llm/return_getConversation.h diff --git a/src/devices/ILLMMsgs/idl_generated_code/yarp/dev/llm/return_readPrompt.cpp b/src/devices/messages/ILLMMsgs/idl_generated_code/yarp/dev/llm/return_readPrompt.cpp similarity index 100% rename from src/devices/ILLMMsgs/idl_generated_code/yarp/dev/llm/return_readPrompt.cpp rename to src/devices/messages/ILLMMsgs/idl_generated_code/yarp/dev/llm/return_readPrompt.cpp diff --git a/src/devices/ILLMMsgs/idl_generated_code/yarp/dev/llm/return_readPrompt.h b/src/devices/messages/ILLMMsgs/idl_generated_code/yarp/dev/llm/return_readPrompt.h similarity index 100% rename from src/devices/ILLMMsgs/idl_generated_code/yarp/dev/llm/return_readPrompt.h rename to src/devices/messages/ILLMMsgs/idl_generated_code/yarp/dev/llm/return_readPrompt.h diff --git a/src/devices/ILocalization2DMsgs/CMakeLists.txt b/src/devices/messages/ILocalization2DMsgs/CMakeLists.txt similarity index 100% rename from src/devices/ILocalization2DMsgs/CMakeLists.txt rename to src/devices/messages/ILocalization2DMsgs/CMakeLists.txt diff --git a/src/devices/ILocalization2DMsgs/ILocalization2DMsgs.thrift b/src/devices/messages/ILocalization2DMsgs/ILocalization2DMsgs.thrift similarity index 100% rename from src/devices/ILocalization2DMsgs/ILocalization2DMsgs.thrift rename to src/devices/messages/ILocalization2DMsgs/ILocalization2DMsgs.thrift diff --git a/src/devices/ILocalization2DMsgs/idl_generated_code/ILocalization2DMsgs.cpp b/src/devices/messages/ILocalization2DMsgs/idl_generated_code/ILocalization2DMsgs.cpp similarity index 100% rename from src/devices/ILocalization2DMsgs/idl_generated_code/ILocalization2DMsgs.cpp rename to src/devices/messages/ILocalization2DMsgs/idl_generated_code/ILocalization2DMsgs.cpp diff --git a/src/devices/ILocalization2DMsgs/idl_generated_code/ILocalization2DMsgs.h b/src/devices/messages/ILocalization2DMsgs/idl_generated_code/ILocalization2DMsgs.h similarity index 100% rename from src/devices/ILocalization2DMsgs/idl_generated_code/ILocalization2DMsgs.h rename to src/devices/messages/ILocalization2DMsgs/idl_generated_code/ILocalization2DMsgs.h diff --git a/src/devices/ILocalization2DMsgs/idl_generated_code/ILocalization2DMsgs_index.txt b/src/devices/messages/ILocalization2DMsgs/idl_generated_code/ILocalization2DMsgs_index.txt similarity index 100% rename from src/devices/ILocalization2DMsgs/idl_generated_code/ILocalization2DMsgs_index.txt rename to src/devices/messages/ILocalization2DMsgs/idl_generated_code/ILocalization2DMsgs_index.txt diff --git a/src/devices/ILocalization2DMsgs/idl_generated_code/return_get_current_position1.cpp b/src/devices/messages/ILocalization2DMsgs/idl_generated_code/return_get_current_position1.cpp similarity index 100% rename from src/devices/ILocalization2DMsgs/idl_generated_code/return_get_current_position1.cpp rename to src/devices/messages/ILocalization2DMsgs/idl_generated_code/return_get_current_position1.cpp diff --git a/src/devices/ILocalization2DMsgs/idl_generated_code/return_get_current_position1.h b/src/devices/messages/ILocalization2DMsgs/idl_generated_code/return_get_current_position1.h similarity index 100% rename from src/devices/ILocalization2DMsgs/idl_generated_code/return_get_current_position1.h rename to src/devices/messages/ILocalization2DMsgs/idl_generated_code/return_get_current_position1.h diff --git a/src/devices/ILocalization2DMsgs/idl_generated_code/return_get_current_position2.cpp b/src/devices/messages/ILocalization2DMsgs/idl_generated_code/return_get_current_position2.cpp similarity index 100% rename from src/devices/ILocalization2DMsgs/idl_generated_code/return_get_current_position2.cpp rename to src/devices/messages/ILocalization2DMsgs/idl_generated_code/return_get_current_position2.cpp diff --git a/src/devices/ILocalization2DMsgs/idl_generated_code/return_get_current_position2.h b/src/devices/messages/ILocalization2DMsgs/idl_generated_code/return_get_current_position2.h similarity index 100% rename from src/devices/ILocalization2DMsgs/idl_generated_code/return_get_current_position2.h rename to src/devices/messages/ILocalization2DMsgs/idl_generated_code/return_get_current_position2.h diff --git a/src/devices/ILocalization2DMsgs/idl_generated_code/return_get_estimated_odometry.cpp b/src/devices/messages/ILocalization2DMsgs/idl_generated_code/return_get_estimated_odometry.cpp similarity index 100% rename from src/devices/ILocalization2DMsgs/idl_generated_code/return_get_estimated_odometry.cpp rename to src/devices/messages/ILocalization2DMsgs/idl_generated_code/return_get_estimated_odometry.cpp diff --git a/src/devices/ILocalization2DMsgs/idl_generated_code/return_get_estimated_odometry.h b/src/devices/messages/ILocalization2DMsgs/idl_generated_code/return_get_estimated_odometry.h similarity index 100% rename from src/devices/ILocalization2DMsgs/idl_generated_code/return_get_estimated_odometry.h rename to src/devices/messages/ILocalization2DMsgs/idl_generated_code/return_get_estimated_odometry.h diff --git a/src/devices/ILocalization2DMsgs/idl_generated_code/return_get_estimated_poses.cpp b/src/devices/messages/ILocalization2DMsgs/idl_generated_code/return_get_estimated_poses.cpp similarity index 100% rename from src/devices/ILocalization2DMsgs/idl_generated_code/return_get_estimated_poses.cpp rename to src/devices/messages/ILocalization2DMsgs/idl_generated_code/return_get_estimated_poses.cpp diff --git a/src/devices/ILocalization2DMsgs/idl_generated_code/return_get_estimated_poses.h b/src/devices/messages/ILocalization2DMsgs/idl_generated_code/return_get_estimated_poses.h similarity index 100% rename from src/devices/ILocalization2DMsgs/idl_generated_code/return_get_estimated_poses.h rename to src/devices/messages/ILocalization2DMsgs/idl_generated_code/return_get_estimated_poses.h diff --git a/src/devices/ILocalization2DMsgs/idl_generated_code/return_get_localization_status.cpp b/src/devices/messages/ILocalization2DMsgs/idl_generated_code/return_get_localization_status.cpp similarity index 100% rename from src/devices/ILocalization2DMsgs/idl_generated_code/return_get_localization_status.cpp rename to src/devices/messages/ILocalization2DMsgs/idl_generated_code/return_get_localization_status.cpp diff --git a/src/devices/ILocalization2DMsgs/idl_generated_code/return_get_localization_status.h b/src/devices/messages/ILocalization2DMsgs/idl_generated_code/return_get_localization_status.h similarity index 100% rename from src/devices/ILocalization2DMsgs/idl_generated_code/return_get_localization_status.h rename to src/devices/messages/ILocalization2DMsgs/idl_generated_code/return_get_localization_status.h diff --git a/src/devices/IMap2DMsgs/CMakeLists.txt b/src/devices/messages/IMap2DMsgs/CMakeLists.txt similarity index 100% rename from src/devices/IMap2DMsgs/CMakeLists.txt rename to src/devices/messages/IMap2DMsgs/CMakeLists.txt diff --git a/src/devices/IMap2DMsgs/IMap2DMsgs.thrift b/src/devices/messages/IMap2DMsgs/IMap2DMsgs.thrift similarity index 100% rename from src/devices/IMap2DMsgs/IMap2DMsgs.thrift rename to src/devices/messages/IMap2DMsgs/IMap2DMsgs.thrift diff --git a/src/devices/IMap2DMsgs/idl_generated_code/IMap2DMsgs.cpp b/src/devices/messages/IMap2DMsgs/idl_generated_code/IMap2DMsgs.cpp similarity index 100% rename from src/devices/IMap2DMsgs/idl_generated_code/IMap2DMsgs.cpp rename to src/devices/messages/IMap2DMsgs/idl_generated_code/IMap2DMsgs.cpp diff --git a/src/devices/IMap2DMsgs/idl_generated_code/IMap2DMsgs.h b/src/devices/messages/IMap2DMsgs/idl_generated_code/IMap2DMsgs.h similarity index 100% rename from src/devices/IMap2DMsgs/idl_generated_code/IMap2DMsgs.h rename to src/devices/messages/IMap2DMsgs/idl_generated_code/IMap2DMsgs.h diff --git a/src/devices/IMap2DMsgs/idl_generated_code/IMap2DMsgs_index.txt b/src/devices/messages/IMap2DMsgs/idl_generated_code/IMap2DMsgs_index.txt similarity index 100% rename from src/devices/IMap2DMsgs/idl_generated_code/IMap2DMsgs_index.txt rename to src/devices/messages/IMap2DMsgs/idl_generated_code/IMap2DMsgs_index.txt diff --git a/src/devices/IMap2DMsgs/idl_generated_code/return_get_all_areas.cpp b/src/devices/messages/IMap2DMsgs/idl_generated_code/return_get_all_areas.cpp similarity index 100% rename from src/devices/IMap2DMsgs/idl_generated_code/return_get_all_areas.cpp rename to src/devices/messages/IMap2DMsgs/idl_generated_code/return_get_all_areas.cpp diff --git a/src/devices/IMap2DMsgs/idl_generated_code/return_get_all_areas.h b/src/devices/messages/IMap2DMsgs/idl_generated_code/return_get_all_areas.h similarity index 100% rename from src/devices/IMap2DMsgs/idl_generated_code/return_get_all_areas.h rename to src/devices/messages/IMap2DMsgs/idl_generated_code/return_get_all_areas.h diff --git a/src/devices/IMap2DMsgs/idl_generated_code/return_get_all_locations.cpp b/src/devices/messages/IMap2DMsgs/idl_generated_code/return_get_all_locations.cpp similarity index 100% rename from src/devices/IMap2DMsgs/idl_generated_code/return_get_all_locations.cpp rename to src/devices/messages/IMap2DMsgs/idl_generated_code/return_get_all_locations.cpp diff --git a/src/devices/IMap2DMsgs/idl_generated_code/return_get_all_locations.h b/src/devices/messages/IMap2DMsgs/idl_generated_code/return_get_all_locations.h similarity index 100% rename from src/devices/IMap2DMsgs/idl_generated_code/return_get_all_locations.h rename to src/devices/messages/IMap2DMsgs/idl_generated_code/return_get_all_locations.h diff --git a/src/devices/IMap2DMsgs/idl_generated_code/return_get_all_paths.cpp b/src/devices/messages/IMap2DMsgs/idl_generated_code/return_get_all_paths.cpp similarity index 100% rename from src/devices/IMap2DMsgs/idl_generated_code/return_get_all_paths.cpp rename to src/devices/messages/IMap2DMsgs/idl_generated_code/return_get_all_paths.cpp diff --git a/src/devices/IMap2DMsgs/idl_generated_code/return_get_all_paths.h b/src/devices/messages/IMap2DMsgs/idl_generated_code/return_get_all_paths.h similarity index 100% rename from src/devices/IMap2DMsgs/idl_generated_code/return_get_all_paths.h rename to src/devices/messages/IMap2DMsgs/idl_generated_code/return_get_all_paths.h diff --git a/src/devices/IMap2DMsgs/idl_generated_code/return_get_area.cpp b/src/devices/messages/IMap2DMsgs/idl_generated_code/return_get_area.cpp similarity index 100% rename from src/devices/IMap2DMsgs/idl_generated_code/return_get_area.cpp rename to src/devices/messages/IMap2DMsgs/idl_generated_code/return_get_area.cpp diff --git a/src/devices/IMap2DMsgs/idl_generated_code/return_get_area.h b/src/devices/messages/IMap2DMsgs/idl_generated_code/return_get_area.h similarity index 100% rename from src/devices/IMap2DMsgs/idl_generated_code/return_get_area.h rename to src/devices/messages/IMap2DMsgs/idl_generated_code/return_get_area.h diff --git a/src/devices/IMap2DMsgs/idl_generated_code/return_get_areas_list.cpp b/src/devices/messages/IMap2DMsgs/idl_generated_code/return_get_areas_list.cpp similarity index 100% rename from src/devices/IMap2DMsgs/idl_generated_code/return_get_areas_list.cpp rename to src/devices/messages/IMap2DMsgs/idl_generated_code/return_get_areas_list.cpp diff --git a/src/devices/IMap2DMsgs/idl_generated_code/return_get_areas_list.h b/src/devices/messages/IMap2DMsgs/idl_generated_code/return_get_areas_list.h similarity index 100% rename from src/devices/IMap2DMsgs/idl_generated_code/return_get_areas_list.h rename to src/devices/messages/IMap2DMsgs/idl_generated_code/return_get_areas_list.h diff --git a/src/devices/IMap2DMsgs/idl_generated_code/return_get_location.cpp b/src/devices/messages/IMap2DMsgs/idl_generated_code/return_get_location.cpp similarity index 100% rename from src/devices/IMap2DMsgs/idl_generated_code/return_get_location.cpp rename to src/devices/messages/IMap2DMsgs/idl_generated_code/return_get_location.cpp diff --git a/src/devices/IMap2DMsgs/idl_generated_code/return_get_location.h b/src/devices/messages/IMap2DMsgs/idl_generated_code/return_get_location.h similarity index 100% rename from src/devices/IMap2DMsgs/idl_generated_code/return_get_location.h rename to src/devices/messages/IMap2DMsgs/idl_generated_code/return_get_location.h diff --git a/src/devices/IMap2DMsgs/idl_generated_code/return_get_locations_list.cpp b/src/devices/messages/IMap2DMsgs/idl_generated_code/return_get_locations_list.cpp similarity index 100% rename from src/devices/IMap2DMsgs/idl_generated_code/return_get_locations_list.cpp rename to src/devices/messages/IMap2DMsgs/idl_generated_code/return_get_locations_list.cpp diff --git a/src/devices/IMap2DMsgs/idl_generated_code/return_get_locations_list.h b/src/devices/messages/IMap2DMsgs/idl_generated_code/return_get_locations_list.h similarity index 100% rename from src/devices/IMap2DMsgs/idl_generated_code/return_get_locations_list.h rename to src/devices/messages/IMap2DMsgs/idl_generated_code/return_get_locations_list.h diff --git a/src/devices/IMap2DMsgs/idl_generated_code/return_get_map.cpp b/src/devices/messages/IMap2DMsgs/idl_generated_code/return_get_map.cpp similarity index 100% rename from src/devices/IMap2DMsgs/idl_generated_code/return_get_map.cpp rename to src/devices/messages/IMap2DMsgs/idl_generated_code/return_get_map.cpp diff --git a/src/devices/IMap2DMsgs/idl_generated_code/return_get_map.h b/src/devices/messages/IMap2DMsgs/idl_generated_code/return_get_map.h similarity index 100% rename from src/devices/IMap2DMsgs/idl_generated_code/return_get_map.h rename to src/devices/messages/IMap2DMsgs/idl_generated_code/return_get_map.h diff --git a/src/devices/IMap2DMsgs/idl_generated_code/return_get_map_names.cpp b/src/devices/messages/IMap2DMsgs/idl_generated_code/return_get_map_names.cpp similarity index 100% rename from src/devices/IMap2DMsgs/idl_generated_code/return_get_map_names.cpp rename to src/devices/messages/IMap2DMsgs/idl_generated_code/return_get_map_names.cpp diff --git a/src/devices/IMap2DMsgs/idl_generated_code/return_get_map_names.h b/src/devices/messages/IMap2DMsgs/idl_generated_code/return_get_map_names.h similarity index 100% rename from src/devices/IMap2DMsgs/idl_generated_code/return_get_map_names.h rename to src/devices/messages/IMap2DMsgs/idl_generated_code/return_get_map_names.h diff --git a/src/devices/IMap2DMsgs/idl_generated_code/return_get_path.cpp b/src/devices/messages/IMap2DMsgs/idl_generated_code/return_get_path.cpp similarity index 100% rename from src/devices/IMap2DMsgs/idl_generated_code/return_get_path.cpp rename to src/devices/messages/IMap2DMsgs/idl_generated_code/return_get_path.cpp diff --git a/src/devices/IMap2DMsgs/idl_generated_code/return_get_path.h b/src/devices/messages/IMap2DMsgs/idl_generated_code/return_get_path.h similarity index 100% rename from src/devices/IMap2DMsgs/idl_generated_code/return_get_path.h rename to src/devices/messages/IMap2DMsgs/idl_generated_code/return_get_path.h diff --git a/src/devices/IMap2DMsgs/idl_generated_code/return_get_paths_list.cpp b/src/devices/messages/IMap2DMsgs/idl_generated_code/return_get_paths_list.cpp similarity index 100% rename from src/devices/IMap2DMsgs/idl_generated_code/return_get_paths_list.cpp rename to src/devices/messages/IMap2DMsgs/idl_generated_code/return_get_paths_list.cpp diff --git a/src/devices/IMap2DMsgs/idl_generated_code/return_get_paths_list.h b/src/devices/messages/IMap2DMsgs/idl_generated_code/return_get_paths_list.h similarity index 100% rename from src/devices/IMap2DMsgs/idl_generated_code/return_get_paths_list.h rename to src/devices/messages/IMap2DMsgs/idl_generated_code/return_get_paths_list.h diff --git a/src/devices/INavigation2DMsgs/CMakeLists.txt b/src/devices/messages/INavigation2DMsgs/CMakeLists.txt similarity index 100% rename from src/devices/INavigation2DMsgs/CMakeLists.txt rename to src/devices/messages/INavigation2DMsgs/CMakeLists.txt diff --git a/src/devices/INavigation2DMsgs/INavigation2DMsgs.thrift b/src/devices/messages/INavigation2DMsgs/INavigation2DMsgs.thrift similarity index 100% rename from src/devices/INavigation2DMsgs/INavigation2DMsgs.thrift rename to src/devices/messages/INavigation2DMsgs/INavigation2DMsgs.thrift diff --git a/src/devices/INavigation2DMsgs/idl_generated_code/INavigation2DMsgs.cpp b/src/devices/messages/INavigation2DMsgs/idl_generated_code/INavigation2DMsgs.cpp similarity index 100% rename from src/devices/INavigation2DMsgs/idl_generated_code/INavigation2DMsgs.cpp rename to src/devices/messages/INavigation2DMsgs/idl_generated_code/INavigation2DMsgs.cpp diff --git a/src/devices/INavigation2DMsgs/idl_generated_code/INavigation2DMsgs.h b/src/devices/messages/INavigation2DMsgs/idl_generated_code/INavigation2DMsgs.h similarity index 100% rename from src/devices/INavigation2DMsgs/idl_generated_code/INavigation2DMsgs.h rename to src/devices/messages/INavigation2DMsgs/idl_generated_code/INavigation2DMsgs.h diff --git a/src/devices/INavigation2DMsgs/idl_generated_code/INavigation2DMsgs_index.txt b/src/devices/messages/INavigation2DMsgs/idl_generated_code/INavigation2DMsgs_index.txt similarity index 100% rename from src/devices/INavigation2DMsgs/idl_generated_code/INavigation2DMsgs_index.txt rename to src/devices/messages/INavigation2DMsgs/idl_generated_code/INavigation2DMsgs_index.txt diff --git a/src/devices/INavigation2DMsgs/idl_generated_code/return_get_abs_loc_of_curr_target.cpp b/src/devices/messages/INavigation2DMsgs/idl_generated_code/return_get_abs_loc_of_curr_target.cpp similarity index 100% rename from src/devices/INavigation2DMsgs/idl_generated_code/return_get_abs_loc_of_curr_target.cpp rename to src/devices/messages/INavigation2DMsgs/idl_generated_code/return_get_abs_loc_of_curr_target.cpp diff --git a/src/devices/INavigation2DMsgs/idl_generated_code/return_get_abs_loc_of_curr_target.h b/src/devices/messages/INavigation2DMsgs/idl_generated_code/return_get_abs_loc_of_curr_target.h similarity index 100% rename from src/devices/INavigation2DMsgs/idl_generated_code/return_get_abs_loc_of_curr_target.h rename to src/devices/messages/INavigation2DMsgs/idl_generated_code/return_get_abs_loc_of_curr_target.h diff --git a/src/devices/INavigation2DMsgs/idl_generated_code/return_get_all_nav_waypoints.cpp b/src/devices/messages/INavigation2DMsgs/idl_generated_code/return_get_all_nav_waypoints.cpp similarity index 100% rename from src/devices/INavigation2DMsgs/idl_generated_code/return_get_all_nav_waypoints.cpp rename to src/devices/messages/INavigation2DMsgs/idl_generated_code/return_get_all_nav_waypoints.cpp diff --git a/src/devices/INavigation2DMsgs/idl_generated_code/return_get_all_nav_waypoints.h b/src/devices/messages/INavigation2DMsgs/idl_generated_code/return_get_all_nav_waypoints.h similarity index 100% rename from src/devices/INavigation2DMsgs/idl_generated_code/return_get_all_nav_waypoints.h rename to src/devices/messages/INavigation2DMsgs/idl_generated_code/return_get_all_nav_waypoints.h diff --git a/src/devices/INavigation2DMsgs/idl_generated_code/return_get_current_nav_map.cpp b/src/devices/messages/INavigation2DMsgs/idl_generated_code/return_get_current_nav_map.cpp similarity index 100% rename from src/devices/INavigation2DMsgs/idl_generated_code/return_get_current_nav_map.cpp rename to src/devices/messages/INavigation2DMsgs/idl_generated_code/return_get_current_nav_map.cpp diff --git a/src/devices/INavigation2DMsgs/idl_generated_code/return_get_current_nav_map.h b/src/devices/messages/INavigation2DMsgs/idl_generated_code/return_get_current_nav_map.h similarity index 100% rename from src/devices/INavigation2DMsgs/idl_generated_code/return_get_current_nav_map.h rename to src/devices/messages/INavigation2DMsgs/idl_generated_code/return_get_current_nav_map.h diff --git a/src/devices/INavigation2DMsgs/idl_generated_code/return_get_current_nav_waypoint.cpp b/src/devices/messages/INavigation2DMsgs/idl_generated_code/return_get_current_nav_waypoint.cpp similarity index 100% rename from src/devices/INavigation2DMsgs/idl_generated_code/return_get_current_nav_waypoint.cpp rename to src/devices/messages/INavigation2DMsgs/idl_generated_code/return_get_current_nav_waypoint.cpp diff --git a/src/devices/INavigation2DMsgs/idl_generated_code/return_get_current_nav_waypoint.h b/src/devices/messages/INavigation2DMsgs/idl_generated_code/return_get_current_nav_waypoint.h similarity index 100% rename from src/devices/INavigation2DMsgs/idl_generated_code/return_get_current_nav_waypoint.h rename to src/devices/messages/INavigation2DMsgs/idl_generated_code/return_get_current_nav_waypoint.h diff --git a/src/devices/INavigation2DMsgs/idl_generated_code/return_get_last_velocity_command.cpp b/src/devices/messages/INavigation2DMsgs/idl_generated_code/return_get_last_velocity_command.cpp similarity index 100% rename from src/devices/INavigation2DMsgs/idl_generated_code/return_get_last_velocity_command.cpp rename to src/devices/messages/INavigation2DMsgs/idl_generated_code/return_get_last_velocity_command.cpp diff --git a/src/devices/INavigation2DMsgs/idl_generated_code/return_get_last_velocity_command.h b/src/devices/messages/INavigation2DMsgs/idl_generated_code/return_get_last_velocity_command.h similarity index 100% rename from src/devices/INavigation2DMsgs/idl_generated_code/return_get_last_velocity_command.h rename to src/devices/messages/INavigation2DMsgs/idl_generated_code/return_get_last_velocity_command.h diff --git a/src/devices/INavigation2DMsgs/idl_generated_code/return_get_name_of_current_target.cpp b/src/devices/messages/INavigation2DMsgs/idl_generated_code/return_get_name_of_current_target.cpp similarity index 100% rename from src/devices/INavigation2DMsgs/idl_generated_code/return_get_name_of_current_target.cpp rename to src/devices/messages/INavigation2DMsgs/idl_generated_code/return_get_name_of_current_target.cpp diff --git a/src/devices/INavigation2DMsgs/idl_generated_code/return_get_name_of_current_target.h b/src/devices/messages/INavigation2DMsgs/idl_generated_code/return_get_name_of_current_target.h similarity index 100% rename from src/devices/INavigation2DMsgs/idl_generated_code/return_get_name_of_current_target.h rename to src/devices/messages/INavigation2DMsgs/idl_generated_code/return_get_name_of_current_target.h diff --git a/src/devices/INavigation2DMsgs/idl_generated_code/return_get_navigation_status.cpp b/src/devices/messages/INavigation2DMsgs/idl_generated_code/return_get_navigation_status.cpp similarity index 100% rename from src/devices/INavigation2DMsgs/idl_generated_code/return_get_navigation_status.cpp rename to src/devices/messages/INavigation2DMsgs/idl_generated_code/return_get_navigation_status.cpp diff --git a/src/devices/INavigation2DMsgs/idl_generated_code/return_get_navigation_status.h b/src/devices/messages/INavigation2DMsgs/idl_generated_code/return_get_navigation_status.h similarity index 100% rename from src/devices/INavigation2DMsgs/idl_generated_code/return_get_navigation_status.h rename to src/devices/messages/INavigation2DMsgs/idl_generated_code/return_get_navigation_status.h diff --git a/src/devices/INavigation2DMsgs/idl_generated_code/return_get_rel_loc_of_curr_target.cpp b/src/devices/messages/INavigation2DMsgs/idl_generated_code/return_get_rel_loc_of_curr_target.cpp similarity index 100% rename from src/devices/INavigation2DMsgs/idl_generated_code/return_get_rel_loc_of_curr_target.cpp rename to src/devices/messages/INavigation2DMsgs/idl_generated_code/return_get_rel_loc_of_curr_target.cpp diff --git a/src/devices/INavigation2DMsgs/idl_generated_code/return_get_rel_loc_of_curr_target.h b/src/devices/messages/INavigation2DMsgs/idl_generated_code/return_get_rel_loc_of_curr_target.h similarity index 100% rename from src/devices/INavigation2DMsgs/idl_generated_code/return_get_rel_loc_of_curr_target.h rename to src/devices/messages/INavigation2DMsgs/idl_generated_code/return_get_rel_loc_of_curr_target.h diff --git a/src/devices/IOdometry2DMsgs/CMakeLists.txt b/src/devices/messages/IOdometry2DMsgs/CMakeLists.txt similarity index 100% rename from src/devices/IOdometry2DMsgs/CMakeLists.txt rename to src/devices/messages/IOdometry2DMsgs/CMakeLists.txt diff --git a/src/devices/IOdometry2DMsgs/IOdometry2DMsgs.thrift b/src/devices/messages/IOdometry2DMsgs/IOdometry2DMsgs.thrift similarity index 100% rename from src/devices/IOdometry2DMsgs/IOdometry2DMsgs.thrift rename to src/devices/messages/IOdometry2DMsgs/IOdometry2DMsgs.thrift diff --git a/src/devices/IOdometry2DMsgs/idl_generated_code/IOdometry2DMsgs.cpp b/src/devices/messages/IOdometry2DMsgs/idl_generated_code/IOdometry2DMsgs.cpp similarity index 100% rename from src/devices/IOdometry2DMsgs/idl_generated_code/IOdometry2DMsgs.cpp rename to src/devices/messages/IOdometry2DMsgs/idl_generated_code/IOdometry2DMsgs.cpp diff --git a/src/devices/IOdometry2DMsgs/idl_generated_code/IOdometry2DMsgs.h b/src/devices/messages/IOdometry2DMsgs/idl_generated_code/IOdometry2DMsgs.h similarity index 100% rename from src/devices/IOdometry2DMsgs/idl_generated_code/IOdometry2DMsgs.h rename to src/devices/messages/IOdometry2DMsgs/idl_generated_code/IOdometry2DMsgs.h diff --git a/src/devices/IOdometry2DMsgs/idl_generated_code/IOdometry2DMsgs_index.txt b/src/devices/messages/IOdometry2DMsgs/idl_generated_code/IOdometry2DMsgs_index.txt similarity index 100% rename from src/devices/IOdometry2DMsgs/idl_generated_code/IOdometry2DMsgs_index.txt rename to src/devices/messages/IOdometry2DMsgs/idl_generated_code/IOdometry2DMsgs_index.txt diff --git a/src/devices/ISerialMsgs/CMakeLists.txt b/src/devices/messages/ISerialMsgs/CMakeLists.txt similarity index 100% rename from src/devices/ISerialMsgs/CMakeLists.txt rename to src/devices/messages/ISerialMsgs/CMakeLists.txt diff --git a/src/devices/ISerialMsgs/ISerialMsgs.thrift b/src/devices/messages/ISerialMsgs/ISerialMsgs.thrift similarity index 100% rename from src/devices/ISerialMsgs/ISerialMsgs.thrift rename to src/devices/messages/ISerialMsgs/ISerialMsgs.thrift diff --git a/src/devices/ISerialMsgs/idl_generated_code/ISerialMsgs.cpp b/src/devices/messages/ISerialMsgs/idl_generated_code/ISerialMsgs.cpp similarity index 100% rename from src/devices/ISerialMsgs/idl_generated_code/ISerialMsgs.cpp rename to src/devices/messages/ISerialMsgs/idl_generated_code/ISerialMsgs.cpp diff --git a/src/devices/ISerialMsgs/idl_generated_code/ISerialMsgs.h b/src/devices/messages/ISerialMsgs/idl_generated_code/ISerialMsgs.h similarity index 100% rename from src/devices/ISerialMsgs/idl_generated_code/ISerialMsgs.h rename to src/devices/messages/ISerialMsgs/idl_generated_code/ISerialMsgs.h diff --git a/src/devices/ISerialMsgs/idl_generated_code/ISerialMsgs_index.txt b/src/devices/messages/ISerialMsgs/idl_generated_code/ISerialMsgs_index.txt similarity index 100% rename from src/devices/ISerialMsgs/idl_generated_code/ISerialMsgs_index.txt rename to src/devices/messages/ISerialMsgs/idl_generated_code/ISerialMsgs_index.txt diff --git a/src/devices/ISpeechSynthesizerMsgs/CMakeLists.txt b/src/devices/messages/ISpeechSynthesizerMsgs/CMakeLists.txt similarity index 100% rename from src/devices/ISpeechSynthesizerMsgs/CMakeLists.txt rename to src/devices/messages/ISpeechSynthesizerMsgs/CMakeLists.txt diff --git a/src/devices/ISpeechSynthesizerMsgs/ISpeechSynthesizerMsgs.thrift b/src/devices/messages/ISpeechSynthesizerMsgs/ISpeechSynthesizerMsgs.thrift similarity index 100% rename from src/devices/ISpeechSynthesizerMsgs/ISpeechSynthesizerMsgs.thrift rename to src/devices/messages/ISpeechSynthesizerMsgs/ISpeechSynthesizerMsgs.thrift diff --git a/src/devices/ISpeechSynthesizerMsgs/idl_generated_code/ISpeechSynthesizerMsgs.cpp b/src/devices/messages/ISpeechSynthesizerMsgs/idl_generated_code/ISpeechSynthesizerMsgs.cpp similarity index 100% rename from src/devices/ISpeechSynthesizerMsgs/idl_generated_code/ISpeechSynthesizerMsgs.cpp rename to src/devices/messages/ISpeechSynthesizerMsgs/idl_generated_code/ISpeechSynthesizerMsgs.cpp diff --git a/src/devices/ISpeechSynthesizerMsgs/idl_generated_code/ISpeechSynthesizerMsgs.h b/src/devices/messages/ISpeechSynthesizerMsgs/idl_generated_code/ISpeechSynthesizerMsgs.h similarity index 100% rename from src/devices/ISpeechSynthesizerMsgs/idl_generated_code/ISpeechSynthesizerMsgs.h rename to src/devices/messages/ISpeechSynthesizerMsgs/idl_generated_code/ISpeechSynthesizerMsgs.h diff --git a/src/devices/ISpeechSynthesizerMsgs/idl_generated_code/ISpeechSynthesizerMsgs_index.txt b/src/devices/messages/ISpeechSynthesizerMsgs/idl_generated_code/ISpeechSynthesizerMsgs_index.txt similarity index 100% rename from src/devices/ISpeechSynthesizerMsgs/idl_generated_code/ISpeechSynthesizerMsgs_index.txt rename to src/devices/messages/ISpeechSynthesizerMsgs/idl_generated_code/ISpeechSynthesizerMsgs_index.txt diff --git a/src/devices/ISpeechSynthesizerMsgs/idl_generated_code/return_get_language.cpp b/src/devices/messages/ISpeechSynthesizerMsgs/idl_generated_code/return_get_language.cpp similarity index 100% rename from src/devices/ISpeechSynthesizerMsgs/idl_generated_code/return_get_language.cpp rename to src/devices/messages/ISpeechSynthesizerMsgs/idl_generated_code/return_get_language.cpp diff --git a/src/devices/ISpeechSynthesizerMsgs/idl_generated_code/return_get_language.h b/src/devices/messages/ISpeechSynthesizerMsgs/idl_generated_code/return_get_language.h similarity index 100% rename from src/devices/ISpeechSynthesizerMsgs/idl_generated_code/return_get_language.h rename to src/devices/messages/ISpeechSynthesizerMsgs/idl_generated_code/return_get_language.h diff --git a/src/devices/ISpeechSynthesizerMsgs/idl_generated_code/return_get_pitch.cpp b/src/devices/messages/ISpeechSynthesizerMsgs/idl_generated_code/return_get_pitch.cpp similarity index 100% rename from src/devices/ISpeechSynthesizerMsgs/idl_generated_code/return_get_pitch.cpp rename to src/devices/messages/ISpeechSynthesizerMsgs/idl_generated_code/return_get_pitch.cpp diff --git a/src/devices/ISpeechSynthesizerMsgs/idl_generated_code/return_get_pitch.h b/src/devices/messages/ISpeechSynthesizerMsgs/idl_generated_code/return_get_pitch.h similarity index 100% rename from src/devices/ISpeechSynthesizerMsgs/idl_generated_code/return_get_pitch.h rename to src/devices/messages/ISpeechSynthesizerMsgs/idl_generated_code/return_get_pitch.h diff --git a/src/devices/ISpeechSynthesizerMsgs/idl_generated_code/return_get_speed.cpp b/src/devices/messages/ISpeechSynthesizerMsgs/idl_generated_code/return_get_speed.cpp similarity index 100% rename from src/devices/ISpeechSynthesizerMsgs/idl_generated_code/return_get_speed.cpp rename to src/devices/messages/ISpeechSynthesizerMsgs/idl_generated_code/return_get_speed.cpp diff --git a/src/devices/ISpeechSynthesizerMsgs/idl_generated_code/return_get_speed.h b/src/devices/messages/ISpeechSynthesizerMsgs/idl_generated_code/return_get_speed.h similarity index 100% rename from src/devices/ISpeechSynthesizerMsgs/idl_generated_code/return_get_speed.h rename to src/devices/messages/ISpeechSynthesizerMsgs/idl_generated_code/return_get_speed.h diff --git a/src/devices/ISpeechSynthesizerMsgs/idl_generated_code/return_get_voice.cpp b/src/devices/messages/ISpeechSynthesizerMsgs/idl_generated_code/return_get_voice.cpp similarity index 100% rename from src/devices/ISpeechSynthesizerMsgs/idl_generated_code/return_get_voice.cpp rename to src/devices/messages/ISpeechSynthesizerMsgs/idl_generated_code/return_get_voice.cpp diff --git a/src/devices/ISpeechSynthesizerMsgs/idl_generated_code/return_get_voice.h b/src/devices/messages/ISpeechSynthesizerMsgs/idl_generated_code/return_get_voice.h similarity index 100% rename from src/devices/ISpeechSynthesizerMsgs/idl_generated_code/return_get_voice.h rename to src/devices/messages/ISpeechSynthesizerMsgs/idl_generated_code/return_get_voice.h diff --git a/src/devices/ISpeechSynthesizerMsgs/idl_generated_code/return_synthesize.cpp b/src/devices/messages/ISpeechSynthesizerMsgs/idl_generated_code/return_synthesize.cpp similarity index 100% rename from src/devices/ISpeechSynthesizerMsgs/idl_generated_code/return_synthesize.cpp rename to src/devices/messages/ISpeechSynthesizerMsgs/idl_generated_code/return_synthesize.cpp diff --git a/src/devices/ISpeechSynthesizerMsgs/idl_generated_code/return_synthesize.h b/src/devices/messages/ISpeechSynthesizerMsgs/idl_generated_code/return_synthesize.h similarity index 100% rename from src/devices/ISpeechSynthesizerMsgs/idl_generated_code/return_synthesize.h rename to src/devices/messages/ISpeechSynthesizerMsgs/idl_generated_code/return_synthesize.h diff --git a/src/devices/ISpeechTranscriptionMsgs/CMakeLists.txt b/src/devices/messages/ISpeechTranscriptionMsgs/CMakeLists.txt similarity index 100% rename from src/devices/ISpeechTranscriptionMsgs/CMakeLists.txt rename to src/devices/messages/ISpeechTranscriptionMsgs/CMakeLists.txt diff --git a/src/devices/ISpeechTranscriptionMsgs/ISpeechTranscriptionMsgs.thrift b/src/devices/messages/ISpeechTranscriptionMsgs/ISpeechTranscriptionMsgs.thrift similarity index 100% rename from src/devices/ISpeechTranscriptionMsgs/ISpeechTranscriptionMsgs.thrift rename to src/devices/messages/ISpeechTranscriptionMsgs/ISpeechTranscriptionMsgs.thrift diff --git a/src/devices/ISpeechTranscriptionMsgs/idl_generated_code/ISpeechTranscriptionMsgs.cpp b/src/devices/messages/ISpeechTranscriptionMsgs/idl_generated_code/ISpeechTranscriptionMsgs.cpp similarity index 100% rename from src/devices/ISpeechTranscriptionMsgs/idl_generated_code/ISpeechTranscriptionMsgs.cpp rename to src/devices/messages/ISpeechTranscriptionMsgs/idl_generated_code/ISpeechTranscriptionMsgs.cpp diff --git a/src/devices/ISpeechTranscriptionMsgs/idl_generated_code/ISpeechTranscriptionMsgs.h b/src/devices/messages/ISpeechTranscriptionMsgs/idl_generated_code/ISpeechTranscriptionMsgs.h similarity index 100% rename from src/devices/ISpeechTranscriptionMsgs/idl_generated_code/ISpeechTranscriptionMsgs.h rename to src/devices/messages/ISpeechTranscriptionMsgs/idl_generated_code/ISpeechTranscriptionMsgs.h diff --git a/src/devices/ISpeechTranscriptionMsgs/idl_generated_code/ISpeechTranscriptionMsgs_index.txt b/src/devices/messages/ISpeechTranscriptionMsgs/idl_generated_code/ISpeechTranscriptionMsgs_index.txt similarity index 100% rename from src/devices/ISpeechTranscriptionMsgs/idl_generated_code/ISpeechTranscriptionMsgs_index.txt rename to src/devices/messages/ISpeechTranscriptionMsgs/idl_generated_code/ISpeechTranscriptionMsgs_index.txt diff --git a/src/devices/ISpeechTranscriptionMsgs/idl_generated_code/return_get_language.cpp b/src/devices/messages/ISpeechTranscriptionMsgs/idl_generated_code/return_get_language.cpp similarity index 100% rename from src/devices/ISpeechTranscriptionMsgs/idl_generated_code/return_get_language.cpp rename to src/devices/messages/ISpeechTranscriptionMsgs/idl_generated_code/return_get_language.cpp diff --git a/src/devices/ISpeechTranscriptionMsgs/idl_generated_code/return_get_language.h b/src/devices/messages/ISpeechTranscriptionMsgs/idl_generated_code/return_get_language.h similarity index 100% rename from src/devices/ISpeechTranscriptionMsgs/idl_generated_code/return_get_language.h rename to src/devices/messages/ISpeechTranscriptionMsgs/idl_generated_code/return_get_language.h diff --git a/src/devices/ISpeechTranscriptionMsgs/idl_generated_code/return_transcribe.cpp b/src/devices/messages/ISpeechTranscriptionMsgs/idl_generated_code/return_transcribe.cpp similarity index 100% rename from src/devices/ISpeechTranscriptionMsgs/idl_generated_code/return_transcribe.cpp rename to src/devices/messages/ISpeechTranscriptionMsgs/idl_generated_code/return_transcribe.cpp diff --git a/src/devices/ISpeechTranscriptionMsgs/idl_generated_code/return_transcribe.h b/src/devices/messages/ISpeechTranscriptionMsgs/idl_generated_code/return_transcribe.h similarity index 100% rename from src/devices/ISpeechTranscriptionMsgs/idl_generated_code/return_transcribe.h rename to src/devices/messages/ISpeechTranscriptionMsgs/idl_generated_code/return_transcribe.h diff --git a/src/devices/frameTransformStorageMsgs/CMakeLists.txt b/src/devices/messages/frameTransformStorageMsgs/CMakeLists.txt similarity index 100% rename from src/devices/frameTransformStorageMsgs/CMakeLists.txt rename to src/devices/messages/frameTransformStorageMsgs/CMakeLists.txt diff --git a/src/devices/frameTransformStorageMsgs/frameTransformStorageMsgs.thrift b/src/devices/messages/frameTransformStorageMsgs/frameTransformStorageMsgs.thrift similarity index 100% rename from src/devices/frameTransformStorageMsgs/frameTransformStorageMsgs.thrift rename to src/devices/messages/frameTransformStorageMsgs/frameTransformStorageMsgs.thrift diff --git a/src/devices/frameTransformStorageMsgs/idl_generated_code/FrameTransformStorageGetRPC.cpp b/src/devices/messages/frameTransformStorageMsgs/idl_generated_code/FrameTransformStorageGetRPC.cpp similarity index 100% rename from src/devices/frameTransformStorageMsgs/idl_generated_code/FrameTransformStorageGetRPC.cpp rename to src/devices/messages/frameTransformStorageMsgs/idl_generated_code/FrameTransformStorageGetRPC.cpp diff --git a/src/devices/frameTransformStorageMsgs/idl_generated_code/FrameTransformStorageGetRPC.h b/src/devices/messages/frameTransformStorageMsgs/idl_generated_code/FrameTransformStorageGetRPC.h similarity index 100% rename from src/devices/frameTransformStorageMsgs/idl_generated_code/FrameTransformStorageGetRPC.h rename to src/devices/messages/frameTransformStorageMsgs/idl_generated_code/FrameTransformStorageGetRPC.h diff --git a/src/devices/frameTransformStorageMsgs/idl_generated_code/FrameTransformStorageSetRPC.cpp b/src/devices/messages/frameTransformStorageMsgs/idl_generated_code/FrameTransformStorageSetRPC.cpp similarity index 100% rename from src/devices/frameTransformStorageMsgs/idl_generated_code/FrameTransformStorageSetRPC.cpp rename to src/devices/messages/frameTransformStorageMsgs/idl_generated_code/FrameTransformStorageSetRPC.cpp diff --git a/src/devices/frameTransformStorageMsgs/idl_generated_code/FrameTransformStorageSetRPC.h b/src/devices/messages/frameTransformStorageMsgs/idl_generated_code/FrameTransformStorageSetRPC.h similarity index 100% rename from src/devices/frameTransformStorageMsgs/idl_generated_code/FrameTransformStorageSetRPC.h rename to src/devices/messages/frameTransformStorageMsgs/idl_generated_code/FrameTransformStorageSetRPC.h diff --git a/src/devices/frameTransformStorageMsgs/idl_generated_code/frameTransformStorageMsgs_index.txt b/src/devices/messages/frameTransformStorageMsgs/idl_generated_code/frameTransformStorageMsgs_index.txt similarity index 100% rename from src/devices/frameTransformStorageMsgs/idl_generated_code/frameTransformStorageMsgs_index.txt rename to src/devices/messages/frameTransformStorageMsgs/idl_generated_code/frameTransformStorageMsgs_index.txt diff --git a/src/devices/frameTransformStorageMsgs/idl_generated_code/return_getAllTransforms.cpp b/src/devices/messages/frameTransformStorageMsgs/idl_generated_code/return_getAllTransforms.cpp similarity index 100% rename from src/devices/frameTransformStorageMsgs/idl_generated_code/return_getAllTransforms.cpp rename to src/devices/messages/frameTransformStorageMsgs/idl_generated_code/return_getAllTransforms.cpp diff --git a/src/devices/frameTransformStorageMsgs/idl_generated_code/return_getAllTransforms.h b/src/devices/messages/frameTransformStorageMsgs/idl_generated_code/return_getAllTransforms.h similarity index 100% rename from src/devices/frameTransformStorageMsgs/idl_generated_code/return_getAllTransforms.h rename to src/devices/messages/frameTransformStorageMsgs/idl_generated_code/return_getAllTransforms.h diff --git a/src/devices/framegrabber_protocol/CMakeLists.txt b/src/devices/messages/framegrabber_protocol/CMakeLists.txt similarity index 100% rename from src/devices/framegrabber_protocol/CMakeLists.txt rename to src/devices/messages/framegrabber_protocol/CMakeLists.txt diff --git a/src/devices/framegrabber_protocol/yarp/proto/framegrabber/CameraVocabs.h b/src/devices/messages/framegrabber_protocol/yarp/proto/framegrabber/CameraVocabs.h similarity index 100% rename from src/devices/framegrabber_protocol/yarp/proto/framegrabber/CameraVocabs.h rename to src/devices/messages/framegrabber_protocol/yarp/proto/framegrabber/CameraVocabs.h diff --git a/src/devices/framegrabber_protocol/yarp/proto/framegrabber/DepthVisualParams_Forwarder.cpp b/src/devices/messages/framegrabber_protocol/yarp/proto/framegrabber/DepthVisualParams_Forwarder.cpp similarity index 100% rename from src/devices/framegrabber_protocol/yarp/proto/framegrabber/DepthVisualParams_Forwarder.cpp rename to src/devices/messages/framegrabber_protocol/yarp/proto/framegrabber/DepthVisualParams_Forwarder.cpp diff --git a/src/devices/framegrabber_protocol/yarp/proto/framegrabber/DepthVisualParams_Forwarder.h b/src/devices/messages/framegrabber_protocol/yarp/proto/framegrabber/DepthVisualParams_Forwarder.h similarity index 100% rename from src/devices/framegrabber_protocol/yarp/proto/framegrabber/DepthVisualParams_Forwarder.h rename to src/devices/messages/framegrabber_protocol/yarp/proto/framegrabber/DepthVisualParams_Forwarder.h diff --git a/src/devices/framegrabber_protocol/yarp/proto/framegrabber/DepthVisualParams_Responder.cpp b/src/devices/messages/framegrabber_protocol/yarp/proto/framegrabber/DepthVisualParams_Responder.cpp similarity index 100% rename from src/devices/framegrabber_protocol/yarp/proto/framegrabber/DepthVisualParams_Responder.cpp rename to src/devices/messages/framegrabber_protocol/yarp/proto/framegrabber/DepthVisualParams_Responder.cpp diff --git a/src/devices/framegrabber_protocol/yarp/proto/framegrabber/DepthVisualParams_Responder.h b/src/devices/messages/framegrabber_protocol/yarp/proto/framegrabber/DepthVisualParams_Responder.h similarity index 100% rename from src/devices/framegrabber_protocol/yarp/proto/framegrabber/DepthVisualParams_Responder.h rename to src/devices/messages/framegrabber_protocol/yarp/proto/framegrabber/DepthVisualParams_Responder.h diff --git a/src/devices/framegrabber_protocol/yarp/proto/framegrabber/FrameGrabberControlsDC1394_Forwarder.cpp b/src/devices/messages/framegrabber_protocol/yarp/proto/framegrabber/FrameGrabberControlsDC1394_Forwarder.cpp similarity index 100% rename from src/devices/framegrabber_protocol/yarp/proto/framegrabber/FrameGrabberControlsDC1394_Forwarder.cpp rename to src/devices/messages/framegrabber_protocol/yarp/proto/framegrabber/FrameGrabberControlsDC1394_Forwarder.cpp diff --git a/src/devices/framegrabber_protocol/yarp/proto/framegrabber/FrameGrabberControlsDC1394_Forwarder.h b/src/devices/messages/framegrabber_protocol/yarp/proto/framegrabber/FrameGrabberControlsDC1394_Forwarder.h similarity index 100% rename from src/devices/framegrabber_protocol/yarp/proto/framegrabber/FrameGrabberControlsDC1394_Forwarder.h rename to src/devices/messages/framegrabber_protocol/yarp/proto/framegrabber/FrameGrabberControlsDC1394_Forwarder.h diff --git a/src/devices/framegrabber_protocol/yarp/proto/framegrabber/FrameGrabberControlsDC1394_Responder.cpp b/src/devices/messages/framegrabber_protocol/yarp/proto/framegrabber/FrameGrabberControlsDC1394_Responder.cpp similarity index 100% rename from src/devices/framegrabber_protocol/yarp/proto/framegrabber/FrameGrabberControlsDC1394_Responder.cpp rename to src/devices/messages/framegrabber_protocol/yarp/proto/framegrabber/FrameGrabberControlsDC1394_Responder.cpp diff --git a/src/devices/framegrabber_protocol/yarp/proto/framegrabber/FrameGrabberControlsDC1394_Responder.h b/src/devices/messages/framegrabber_protocol/yarp/proto/framegrabber/FrameGrabberControlsDC1394_Responder.h similarity index 100% rename from src/devices/framegrabber_protocol/yarp/proto/framegrabber/FrameGrabberControlsDC1394_Responder.h rename to src/devices/messages/framegrabber_protocol/yarp/proto/framegrabber/FrameGrabberControlsDC1394_Responder.h diff --git a/src/devices/framegrabber_protocol/yarp/proto/framegrabber/FrameGrabberControls_Forwarder.cpp b/src/devices/messages/framegrabber_protocol/yarp/proto/framegrabber/FrameGrabberControls_Forwarder.cpp similarity index 100% rename from src/devices/framegrabber_protocol/yarp/proto/framegrabber/FrameGrabberControls_Forwarder.cpp rename to src/devices/messages/framegrabber_protocol/yarp/proto/framegrabber/FrameGrabberControls_Forwarder.cpp diff --git a/src/devices/framegrabber_protocol/yarp/proto/framegrabber/FrameGrabberControls_Forwarder.h b/src/devices/messages/framegrabber_protocol/yarp/proto/framegrabber/FrameGrabberControls_Forwarder.h similarity index 100% rename from src/devices/framegrabber_protocol/yarp/proto/framegrabber/FrameGrabberControls_Forwarder.h rename to src/devices/messages/framegrabber_protocol/yarp/proto/framegrabber/FrameGrabberControls_Forwarder.h diff --git a/src/devices/framegrabber_protocol/yarp/proto/framegrabber/FrameGrabberControls_Responder.cpp b/src/devices/messages/framegrabber_protocol/yarp/proto/framegrabber/FrameGrabberControls_Responder.cpp similarity index 100% rename from src/devices/framegrabber_protocol/yarp/proto/framegrabber/FrameGrabberControls_Responder.cpp rename to src/devices/messages/framegrabber_protocol/yarp/proto/framegrabber/FrameGrabberControls_Responder.cpp diff --git a/src/devices/framegrabber_protocol/yarp/proto/framegrabber/FrameGrabberControls_Responder.h b/src/devices/messages/framegrabber_protocol/yarp/proto/framegrabber/FrameGrabberControls_Responder.h similarity index 100% rename from src/devices/framegrabber_protocol/yarp/proto/framegrabber/FrameGrabberControls_Responder.h rename to src/devices/messages/framegrabber_protocol/yarp/proto/framegrabber/FrameGrabberControls_Responder.h diff --git a/src/devices/framegrabber_protocol/yarp/proto/framegrabber/FrameGrabberOf_Forwarder-inl.h b/src/devices/messages/framegrabber_protocol/yarp/proto/framegrabber/FrameGrabberOf_Forwarder-inl.h similarity index 100% rename from src/devices/framegrabber_protocol/yarp/proto/framegrabber/FrameGrabberOf_Forwarder-inl.h rename to src/devices/messages/framegrabber_protocol/yarp/proto/framegrabber/FrameGrabberOf_Forwarder-inl.h diff --git a/src/devices/framegrabber_protocol/yarp/proto/framegrabber/FrameGrabberOf_Forwarder.h b/src/devices/messages/framegrabber_protocol/yarp/proto/framegrabber/FrameGrabberOf_Forwarder.h similarity index 100% rename from src/devices/framegrabber_protocol/yarp/proto/framegrabber/FrameGrabberOf_Forwarder.h rename to src/devices/messages/framegrabber_protocol/yarp/proto/framegrabber/FrameGrabberOf_Forwarder.h diff --git a/src/devices/framegrabber_protocol/yarp/proto/framegrabber/FrameGrabberOf_Responder-inl.h b/src/devices/messages/framegrabber_protocol/yarp/proto/framegrabber/FrameGrabberOf_Responder-inl.h similarity index 100% rename from src/devices/framegrabber_protocol/yarp/proto/framegrabber/FrameGrabberOf_Responder-inl.h rename to src/devices/messages/framegrabber_protocol/yarp/proto/framegrabber/FrameGrabberOf_Responder-inl.h diff --git a/src/devices/framegrabber_protocol/yarp/proto/framegrabber/FrameGrabberOf_Responder.h b/src/devices/messages/framegrabber_protocol/yarp/proto/framegrabber/FrameGrabberOf_Responder.h similarity index 100% rename from src/devices/framegrabber_protocol/yarp/proto/framegrabber/FrameGrabberOf_Responder.h rename to src/devices/messages/framegrabber_protocol/yarp/proto/framegrabber/FrameGrabberOf_Responder.h diff --git a/src/devices/framegrabber_protocol/yarp/proto/framegrabber/RgbVisualParams_Forwarder.cpp b/src/devices/messages/framegrabber_protocol/yarp/proto/framegrabber/RgbVisualParams_Forwarder.cpp similarity index 100% rename from src/devices/framegrabber_protocol/yarp/proto/framegrabber/RgbVisualParams_Forwarder.cpp rename to src/devices/messages/framegrabber_protocol/yarp/proto/framegrabber/RgbVisualParams_Forwarder.cpp diff --git a/src/devices/framegrabber_protocol/yarp/proto/framegrabber/RgbVisualParams_Forwarder.h b/src/devices/messages/framegrabber_protocol/yarp/proto/framegrabber/RgbVisualParams_Forwarder.h similarity index 100% rename from src/devices/framegrabber_protocol/yarp/proto/framegrabber/RgbVisualParams_Forwarder.h rename to src/devices/messages/framegrabber_protocol/yarp/proto/framegrabber/RgbVisualParams_Forwarder.h diff --git a/src/devices/framegrabber_protocol/yarp/proto/framegrabber/RgbVisualParams_Responder.cpp b/src/devices/messages/framegrabber_protocol/yarp/proto/framegrabber/RgbVisualParams_Responder.cpp similarity index 100% rename from src/devices/framegrabber_protocol/yarp/proto/framegrabber/RgbVisualParams_Responder.cpp rename to src/devices/messages/framegrabber_protocol/yarp/proto/framegrabber/RgbVisualParams_Responder.cpp diff --git a/src/devices/framegrabber_protocol/yarp/proto/framegrabber/RgbVisualParams_Responder.h b/src/devices/messages/framegrabber_protocol/yarp/proto/framegrabber/RgbVisualParams_Responder.h similarity index 100% rename from src/devices/framegrabber_protocol/yarp/proto/framegrabber/RgbVisualParams_Responder.h rename to src/devices/messages/framegrabber_protocol/yarp/proto/framegrabber/RgbVisualParams_Responder.h diff --git a/src/devices/mobileBaseVelocityControlMsgs/CMakeLists.txt b/src/devices/messages/mobileBaseVelocityControlMsgs/CMakeLists.txt similarity index 100% rename from src/devices/mobileBaseVelocityControlMsgs/CMakeLists.txt rename to src/devices/messages/mobileBaseVelocityControlMsgs/CMakeLists.txt diff --git a/src/devices/mobileBaseVelocityControlMsgs/MobileBaseVelocityControlMsgs.thrift b/src/devices/messages/mobileBaseVelocityControlMsgs/MobileBaseVelocityControlMsgs.thrift similarity index 100% rename from src/devices/mobileBaseVelocityControlMsgs/MobileBaseVelocityControlMsgs.thrift rename to src/devices/messages/mobileBaseVelocityControlMsgs/MobileBaseVelocityControlMsgs.thrift diff --git a/src/devices/mobileBaseVelocityControlMsgs/idl_generated_code/MobileBaseVelocityControlMsgs_index.txt b/src/devices/messages/mobileBaseVelocityControlMsgs/idl_generated_code/MobileBaseVelocityControlMsgs_index.txt similarity index 100% rename from src/devices/mobileBaseVelocityControlMsgs/idl_generated_code/MobileBaseVelocityControlMsgs_index.txt rename to src/devices/messages/mobileBaseVelocityControlMsgs/idl_generated_code/MobileBaseVelocityControlMsgs_index.txt diff --git a/src/devices/mobileBaseVelocityControlMsgs/idl_generated_code/MobileBaseVelocityControlRPC.cpp b/src/devices/messages/mobileBaseVelocityControlMsgs/idl_generated_code/MobileBaseVelocityControlRPC.cpp similarity index 100% rename from src/devices/mobileBaseVelocityControlMsgs/idl_generated_code/MobileBaseVelocityControlRPC.cpp rename to src/devices/messages/mobileBaseVelocityControlMsgs/idl_generated_code/MobileBaseVelocityControlRPC.cpp diff --git a/src/devices/mobileBaseVelocityControlMsgs/idl_generated_code/MobileBaseVelocityControlRPC.h b/src/devices/messages/mobileBaseVelocityControlMsgs/idl_generated_code/MobileBaseVelocityControlRPC.h similarity index 100% rename from src/devices/mobileBaseVelocityControlMsgs/idl_generated_code/MobileBaseVelocityControlRPC.h rename to src/devices/messages/mobileBaseVelocityControlMsgs/idl_generated_code/MobileBaseVelocityControlRPC.h diff --git a/src/devices/mobileBaseVelocityControlMsgs/idl_generated_code/return_getLastVelocityCommand.cpp b/src/devices/messages/mobileBaseVelocityControlMsgs/idl_generated_code/return_getLastVelocityCommand.cpp similarity index 100% rename from src/devices/mobileBaseVelocityControlMsgs/idl_generated_code/return_getLastVelocityCommand.cpp rename to src/devices/messages/mobileBaseVelocityControlMsgs/idl_generated_code/return_getLastVelocityCommand.cpp diff --git a/src/devices/mobileBaseVelocityControlMsgs/idl_generated_code/return_getLastVelocityCommand.h b/src/devices/messages/mobileBaseVelocityControlMsgs/idl_generated_code/return_getLastVelocityCommand.h similarity index 100% rename from src/devices/mobileBaseVelocityControlMsgs/idl_generated_code/return_getLastVelocityCommand.h rename to src/devices/messages/mobileBaseVelocityControlMsgs/idl_generated_code/return_getLastVelocityCommand.h diff --git a/src/devices/multipleAnalogSensorsMsgs/CMakeLists.txt b/src/devices/messages/multipleAnalogSensorsMsgs/CMakeLists.txt similarity index 100% rename from src/devices/multipleAnalogSensorsMsgs/CMakeLists.txt rename to src/devices/messages/multipleAnalogSensorsMsgs/CMakeLists.txt diff --git a/src/devices/multipleAnalogSensorsMsgs/idl_generated_code/MultipleAnalogSensorsMetadata.cpp b/src/devices/messages/multipleAnalogSensorsMsgs/idl_generated_code/MultipleAnalogSensorsMetadata.cpp similarity index 100% rename from src/devices/multipleAnalogSensorsMsgs/idl_generated_code/MultipleAnalogSensorsMetadata.cpp rename to src/devices/messages/multipleAnalogSensorsMsgs/idl_generated_code/MultipleAnalogSensorsMetadata.cpp diff --git a/src/devices/multipleAnalogSensorsMsgs/idl_generated_code/MultipleAnalogSensorsMetadata.h b/src/devices/messages/multipleAnalogSensorsMsgs/idl_generated_code/MultipleAnalogSensorsMetadata.h similarity index 100% rename from src/devices/multipleAnalogSensorsMsgs/idl_generated_code/MultipleAnalogSensorsMetadata.h rename to src/devices/messages/multipleAnalogSensorsMsgs/idl_generated_code/MultipleAnalogSensorsMetadata.h diff --git a/src/devices/multipleAnalogSensorsMsgs/idl_generated_code/SensorMeasurement.cpp b/src/devices/messages/multipleAnalogSensorsMsgs/idl_generated_code/SensorMeasurement.cpp similarity index 100% rename from src/devices/multipleAnalogSensorsMsgs/idl_generated_code/SensorMeasurement.cpp rename to src/devices/messages/multipleAnalogSensorsMsgs/idl_generated_code/SensorMeasurement.cpp diff --git a/src/devices/multipleAnalogSensorsMsgs/idl_generated_code/SensorMeasurement.h b/src/devices/messages/multipleAnalogSensorsMsgs/idl_generated_code/SensorMeasurement.h similarity index 100% rename from src/devices/multipleAnalogSensorsMsgs/idl_generated_code/SensorMeasurement.h rename to src/devices/messages/multipleAnalogSensorsMsgs/idl_generated_code/SensorMeasurement.h diff --git a/src/devices/multipleAnalogSensorsMsgs/idl_generated_code/SensorMeasurements.cpp b/src/devices/messages/multipleAnalogSensorsMsgs/idl_generated_code/SensorMeasurements.cpp similarity index 100% rename from src/devices/multipleAnalogSensorsMsgs/idl_generated_code/SensorMeasurements.cpp rename to src/devices/messages/multipleAnalogSensorsMsgs/idl_generated_code/SensorMeasurements.cpp diff --git a/src/devices/multipleAnalogSensorsMsgs/idl_generated_code/SensorMeasurements.h b/src/devices/messages/multipleAnalogSensorsMsgs/idl_generated_code/SensorMeasurements.h similarity index 100% rename from src/devices/multipleAnalogSensorsMsgs/idl_generated_code/SensorMeasurements.h rename to src/devices/messages/multipleAnalogSensorsMsgs/idl_generated_code/SensorMeasurements.h diff --git a/src/devices/multipleAnalogSensorsMsgs/idl_generated_code/SensorMetadata.cpp b/src/devices/messages/multipleAnalogSensorsMsgs/idl_generated_code/SensorMetadata.cpp similarity index 100% rename from src/devices/multipleAnalogSensorsMsgs/idl_generated_code/SensorMetadata.cpp rename to src/devices/messages/multipleAnalogSensorsMsgs/idl_generated_code/SensorMetadata.cpp diff --git a/src/devices/multipleAnalogSensorsMsgs/idl_generated_code/SensorMetadata.h b/src/devices/messages/multipleAnalogSensorsMsgs/idl_generated_code/SensorMetadata.h similarity index 100% rename from src/devices/multipleAnalogSensorsMsgs/idl_generated_code/SensorMetadata.h rename to src/devices/messages/multipleAnalogSensorsMsgs/idl_generated_code/SensorMetadata.h diff --git a/src/devices/multipleAnalogSensorsMsgs/idl_generated_code/SensorRPCData.cpp b/src/devices/messages/multipleAnalogSensorsMsgs/idl_generated_code/SensorRPCData.cpp similarity index 100% rename from src/devices/multipleAnalogSensorsMsgs/idl_generated_code/SensorRPCData.cpp rename to src/devices/messages/multipleAnalogSensorsMsgs/idl_generated_code/SensorRPCData.cpp diff --git a/src/devices/multipleAnalogSensorsMsgs/idl_generated_code/SensorRPCData.h b/src/devices/messages/multipleAnalogSensorsMsgs/idl_generated_code/SensorRPCData.h similarity index 100% rename from src/devices/multipleAnalogSensorsMsgs/idl_generated_code/SensorRPCData.h rename to src/devices/messages/multipleAnalogSensorsMsgs/idl_generated_code/SensorRPCData.h diff --git a/src/devices/multipleAnalogSensorsMsgs/idl_generated_code/SensorStreamingData.cpp b/src/devices/messages/multipleAnalogSensorsMsgs/idl_generated_code/SensorStreamingData.cpp similarity index 100% rename from src/devices/multipleAnalogSensorsMsgs/idl_generated_code/SensorStreamingData.cpp rename to src/devices/messages/multipleAnalogSensorsMsgs/idl_generated_code/SensorStreamingData.cpp diff --git a/src/devices/multipleAnalogSensorsMsgs/idl_generated_code/SensorStreamingData.h b/src/devices/messages/multipleAnalogSensorsMsgs/idl_generated_code/SensorStreamingData.h similarity index 100% rename from src/devices/multipleAnalogSensorsMsgs/idl_generated_code/SensorStreamingData.h rename to src/devices/messages/multipleAnalogSensorsMsgs/idl_generated_code/SensorStreamingData.h diff --git a/src/devices/multipleAnalogSensorsMsgs/idl_generated_code/multipleAnalogSensorsSerializations_index.txt b/src/devices/messages/multipleAnalogSensorsMsgs/idl_generated_code/multipleAnalogSensorsSerializations_index.txt similarity index 100% rename from src/devices/multipleAnalogSensorsMsgs/idl_generated_code/multipleAnalogSensorsSerializations_index.txt rename to src/devices/messages/multipleAnalogSensorsMsgs/idl_generated_code/multipleAnalogSensorsSerializations_index.txt diff --git a/src/devices/multipleAnalogSensorsMsgs/multipleAnalogSensorsSerializations.thrift b/src/devices/messages/multipleAnalogSensorsMsgs/multipleAnalogSensorsSerializations.thrift similarity index 100% rename from src/devices/multipleAnalogSensorsMsgs/multipleAnalogSensorsSerializations.thrift rename to src/devices/messages/multipleAnalogSensorsMsgs/multipleAnalogSensorsSerializations.thrift diff --git a/src/devices/AnalogSensorClient/AnalogSensorClient.cpp b/src/devices/networkWrappers/AnalogSensorClient/AnalogSensorClient.cpp similarity index 100% rename from src/devices/AnalogSensorClient/AnalogSensorClient.cpp rename to src/devices/networkWrappers/AnalogSensorClient/AnalogSensorClient.cpp diff --git a/src/devices/AnalogSensorClient/AnalogSensorClient.h b/src/devices/networkWrappers/AnalogSensorClient/AnalogSensorClient.h similarity index 100% rename from src/devices/AnalogSensorClient/AnalogSensorClient.h rename to src/devices/networkWrappers/AnalogSensorClient/AnalogSensorClient.h diff --git a/src/devices/AnalogSensorClient/CMakeLists.txt b/src/devices/networkWrappers/AnalogSensorClient/CMakeLists.txt similarity index 100% rename from src/devices/AnalogSensorClient/CMakeLists.txt rename to src/devices/networkWrappers/AnalogSensorClient/CMakeLists.txt diff --git a/src/devices/AnalogWrapper/AnalogWrapper.cpp b/src/devices/networkWrappers/AnalogWrapper/AnalogWrapper.cpp similarity index 100% rename from src/devices/AnalogWrapper/AnalogWrapper.cpp rename to src/devices/networkWrappers/AnalogWrapper/AnalogWrapper.cpp diff --git a/src/devices/AnalogWrapper/AnalogWrapper.h b/src/devices/networkWrappers/AnalogWrapper/AnalogWrapper.h similarity index 100% rename from src/devices/AnalogWrapper/AnalogWrapper.h rename to src/devices/networkWrappers/AnalogWrapper/AnalogWrapper.h diff --git a/src/devices/AnalogWrapper/CMakeLists.txt b/src/devices/networkWrappers/AnalogWrapper/CMakeLists.txt similarity index 100% rename from src/devices/AnalogWrapper/CMakeLists.txt rename to src/devices/networkWrappers/AnalogWrapper/CMakeLists.txt diff --git a/src/devices/networkWrappers/CMakeLists.txt b/src/devices/networkWrappers/CMakeLists.txt new file mode 100644 index 00000000000..df09e40534c --- /dev/null +++ b/src/devices/networkWrappers/CMakeLists.txt @@ -0,0 +1,46 @@ +# SPDX-FileCopyrightText: 2023-2023 Istituto Italiano di Tecnologia (IIT) +# SPDX-License-Identifier: BSD-3-Clause + +add_subdirectory(audioPlayerWrapper) +add_subdirectory(audioRecorderWrapper) +add_subdirectory(audioRecorder_nwc_yarp) +add_subdirectory(audioRecorder_nws_yarp) +add_subdirectory(frameGrabber_nwc_yarp) +add_subdirectory(frameGrabber_nws_yarp) +add_subdirectory(battery_nwc_yarp) +add_subdirectory(battery_nws_yarp) +add_subdirectory(chatBot_nwc_yarp) +add_subdirectory(chatBot_nws_yarp) +add_subdirectory(Rangefinder2D_nws_yarp) +add_subdirectory(Rangefinder2D_nwc_yarp) +add_subdirectory(mobileBaseVelocityControl_nwc_yarp) +add_subdirectory(mobileBaseVelocityControl_nws_yarp) +add_subdirectory(multipleanalogsensorsserver) +add_subdirectory(multipleanalogsensorsclient) +add_subdirectory(LLM_nws_yarp) +add_subdirectory(LLM_nwc_yarp) +add_subdirectory(localization2D_nwc_yarp) +add_subdirectory(localization2D_nws_yarp) +add_subdirectory(map2D_nwc_yarp) +add_subdirectory(map2D_nws_yarp) +add_subdirectory(navigation2D_nwc_yarp) +add_subdirectory(navigation2D_nws_yarp) +add_subdirectory(odometry2D_nws_yarp) +add_subdirectory(Rangefinder2DClient) +add_subdirectory(serialPort_nws_yarp) +add_subdirectory(serialPort_nwc_yarp) +add_subdirectory(speechSynthesizer_nws_yarp) +add_subdirectory(speechSynthesizer_nwc_yarp) +add_subdirectory(speechTranscription_nws_yarp) +add_subdirectory(speechTranscription_nwc_yarp) +add_subdirectory(RemoteControlBoard) +add_subdirectory(AnalogSensorClient) +add_subdirectory(AnalogWrapper) +add_subdirectory(VirtualAnalogWrapper) +add_subdirectory(RGBDSensorClient) +add_subdirectory(RGBDSensor_nws_yarp) +add_subdirectory(controlBoard_nws_yarp) +add_subdirectory(RobotDescriptionClient) +add_subdirectory(RobotDescriptionServer) +add_subdirectory(JoypadControlClient) +add_subdirectory(JoypadControlServer) diff --git a/src/devices/JoypadControlClient/CMakeLists.txt b/src/devices/networkWrappers/JoypadControlClient/CMakeLists.txt similarity index 100% rename from src/devices/JoypadControlClient/CMakeLists.txt rename to src/devices/networkWrappers/JoypadControlClient/CMakeLists.txt diff --git a/src/devices/JoypadControlClient/JoypadControlClient.cpp b/src/devices/networkWrappers/JoypadControlClient/JoypadControlClient.cpp similarity index 100% rename from src/devices/JoypadControlClient/JoypadControlClient.cpp rename to src/devices/networkWrappers/JoypadControlClient/JoypadControlClient.cpp diff --git a/src/devices/JoypadControlClient/JoypadControlClient.h b/src/devices/networkWrappers/JoypadControlClient/JoypadControlClient.h similarity index 100% rename from src/devices/JoypadControlClient/JoypadControlClient.h rename to src/devices/networkWrappers/JoypadControlClient/JoypadControlClient.h diff --git a/src/devices/JoypadControlClient/tests/CMakeLists.txt b/src/devices/networkWrappers/JoypadControlClient/tests/CMakeLists.txt similarity index 100% rename from src/devices/JoypadControlClient/tests/CMakeLists.txt rename to src/devices/networkWrappers/JoypadControlClient/tests/CMakeLists.txt diff --git a/src/devices/JoypadControlClient/tests/joypadControlClient_test.cpp b/src/devices/networkWrappers/JoypadControlClient/tests/joypadControlClient_test.cpp similarity index 100% rename from src/devices/JoypadControlClient/tests/joypadControlClient_test.cpp rename to src/devices/networkWrappers/JoypadControlClient/tests/joypadControlClient_test.cpp diff --git a/src/devices/JoypadControlServer/CMakeLists.txt b/src/devices/networkWrappers/JoypadControlServer/CMakeLists.txt similarity index 100% rename from src/devices/JoypadControlServer/CMakeLists.txt rename to src/devices/networkWrappers/JoypadControlServer/CMakeLists.txt diff --git a/src/devices/JoypadControlServer/JoypadControlServer.cpp b/src/devices/networkWrappers/JoypadControlServer/JoypadControlServer.cpp similarity index 100% rename from src/devices/JoypadControlServer/JoypadControlServer.cpp rename to src/devices/networkWrappers/JoypadControlServer/JoypadControlServer.cpp diff --git a/src/devices/JoypadControlServer/JoypadControlServer.h b/src/devices/networkWrappers/JoypadControlServer/JoypadControlServer.h similarity index 100% rename from src/devices/JoypadControlServer/JoypadControlServer.h rename to src/devices/networkWrappers/JoypadControlServer/JoypadControlServer.h diff --git a/src/devices/JoypadControlServer/tests/CMakeLists.txt b/src/devices/networkWrappers/JoypadControlServer/tests/CMakeLists.txt similarity index 100% rename from src/devices/JoypadControlServer/tests/CMakeLists.txt rename to src/devices/networkWrappers/JoypadControlServer/tests/CMakeLists.txt diff --git a/src/devices/JoypadControlServer/tests/joypadControlServer_test.cpp b/src/devices/networkWrappers/JoypadControlServer/tests/joypadControlServer_test.cpp similarity index 100% rename from src/devices/JoypadControlServer/tests/joypadControlServer_test.cpp rename to src/devices/networkWrappers/JoypadControlServer/tests/joypadControlServer_test.cpp diff --git a/src/devices/LLM_nwc_yarp/CMakeLists.txt b/src/devices/networkWrappers/LLM_nwc_yarp/CMakeLists.txt similarity index 100% rename from src/devices/LLM_nwc_yarp/CMakeLists.txt rename to src/devices/networkWrappers/LLM_nwc_yarp/CMakeLists.txt diff --git a/src/devices/LLM_nwc_yarp/LLM_nwc_yarp.cpp b/src/devices/networkWrappers/LLM_nwc_yarp/LLM_nwc_yarp.cpp similarity index 100% rename from src/devices/LLM_nwc_yarp/LLM_nwc_yarp.cpp rename to src/devices/networkWrappers/LLM_nwc_yarp/LLM_nwc_yarp.cpp diff --git a/src/devices/LLM_nwc_yarp/LLM_nwc_yarp.h b/src/devices/networkWrappers/LLM_nwc_yarp/LLM_nwc_yarp.h similarity index 100% rename from src/devices/LLM_nwc_yarp/LLM_nwc_yarp.h rename to src/devices/networkWrappers/LLM_nwc_yarp/LLM_nwc_yarp.h diff --git a/src/devices/LLM_nwc_yarp/tests/CMakeLists.txt b/src/devices/networkWrappers/LLM_nwc_yarp/tests/CMakeLists.txt similarity index 100% rename from src/devices/LLM_nwc_yarp/tests/CMakeLists.txt rename to src/devices/networkWrappers/LLM_nwc_yarp/tests/CMakeLists.txt diff --git a/src/devices/LLM_nwc_yarp/tests/LLM_nwc_yarp_test.cpp b/src/devices/networkWrappers/LLM_nwc_yarp/tests/LLM_nwc_yarp_test.cpp similarity index 100% rename from src/devices/LLM_nwc_yarp/tests/LLM_nwc_yarp_test.cpp rename to src/devices/networkWrappers/LLM_nwc_yarp/tests/LLM_nwc_yarp_test.cpp diff --git a/src/devices/LLM_nws_yarp/CMakeLists.txt b/src/devices/networkWrappers/LLM_nws_yarp/CMakeLists.txt similarity index 100% rename from src/devices/LLM_nws_yarp/CMakeLists.txt rename to src/devices/networkWrappers/LLM_nws_yarp/CMakeLists.txt diff --git a/src/devices/LLM_nws_yarp/ILLMServerImpl.cpp b/src/devices/networkWrappers/LLM_nws_yarp/ILLMServerImpl.cpp similarity index 100% rename from src/devices/LLM_nws_yarp/ILLMServerImpl.cpp rename to src/devices/networkWrappers/LLM_nws_yarp/ILLMServerImpl.cpp diff --git a/src/devices/LLM_nws_yarp/ILLMServerImpl.h b/src/devices/networkWrappers/LLM_nws_yarp/ILLMServerImpl.h similarity index 100% rename from src/devices/LLM_nws_yarp/ILLMServerImpl.h rename to src/devices/networkWrappers/LLM_nws_yarp/ILLMServerImpl.h diff --git a/src/devices/LLM_nws_yarp/LLM_nws_yarp.cpp b/src/devices/networkWrappers/LLM_nws_yarp/LLM_nws_yarp.cpp similarity index 100% rename from src/devices/LLM_nws_yarp/LLM_nws_yarp.cpp rename to src/devices/networkWrappers/LLM_nws_yarp/LLM_nws_yarp.cpp diff --git a/src/devices/LLM_nws_yarp/LLM_nws_yarp.h b/src/devices/networkWrappers/LLM_nws_yarp/LLM_nws_yarp.h similarity index 100% rename from src/devices/LLM_nws_yarp/LLM_nws_yarp.h rename to src/devices/networkWrappers/LLM_nws_yarp/LLM_nws_yarp.h diff --git a/src/devices/LLM_nws_yarp/tests/CMakeLists.txt b/src/devices/networkWrappers/LLM_nws_yarp/tests/CMakeLists.txt similarity index 100% rename from src/devices/LLM_nws_yarp/tests/CMakeLists.txt rename to src/devices/networkWrappers/LLM_nws_yarp/tests/CMakeLists.txt diff --git a/src/devices/LLM_nws_yarp/tests/LLM_nws_yarp_test.cpp b/src/devices/networkWrappers/LLM_nws_yarp/tests/LLM_nws_yarp_test.cpp similarity index 100% rename from src/devices/LLM_nws_yarp/tests/LLM_nws_yarp_test.cpp rename to src/devices/networkWrappers/LLM_nws_yarp/tests/LLM_nws_yarp_test.cpp diff --git a/src/devices/RGBDSensorClient/CMakeLists.txt b/src/devices/networkWrappers/RGBDSensorClient/CMakeLists.txt similarity index 100% rename from src/devices/RGBDSensorClient/CMakeLists.txt rename to src/devices/networkWrappers/RGBDSensorClient/CMakeLists.txt diff --git a/src/devices/RGBDSensorClient/RGBDSensorClient.cpp b/src/devices/networkWrappers/RGBDSensorClient/RGBDSensorClient.cpp similarity index 100% rename from src/devices/RGBDSensorClient/RGBDSensorClient.cpp rename to src/devices/networkWrappers/RGBDSensorClient/RGBDSensorClient.cpp diff --git a/src/devices/RGBDSensorClient/RGBDSensorClient.h b/src/devices/networkWrappers/RGBDSensorClient/RGBDSensorClient.h similarity index 100% rename from src/devices/RGBDSensorClient/RGBDSensorClient.h rename to src/devices/networkWrappers/RGBDSensorClient/RGBDSensorClient.h diff --git a/src/devices/RGBDSensorClient/RGBDSensorClient_StreamingMsgParser.cpp b/src/devices/networkWrappers/RGBDSensorClient/RGBDSensorClient_StreamingMsgParser.cpp similarity index 100% rename from src/devices/RGBDSensorClient/RGBDSensorClient_StreamingMsgParser.cpp rename to src/devices/networkWrappers/RGBDSensorClient/RGBDSensorClient_StreamingMsgParser.cpp diff --git a/src/devices/RGBDSensorClient/RGBDSensorClient_StreamingMsgParser.h b/src/devices/networkWrappers/RGBDSensorClient/RGBDSensorClient_StreamingMsgParser.h similarity index 100% rename from src/devices/RGBDSensorClient/RGBDSensorClient_StreamingMsgParser.h rename to src/devices/networkWrappers/RGBDSensorClient/RGBDSensorClient_StreamingMsgParser.h diff --git a/src/devices/RGBDSensorClient/tests/CMakeLists.txt b/src/devices/networkWrappers/RGBDSensorClient/tests/CMakeLists.txt similarity index 100% rename from src/devices/RGBDSensorClient/tests/CMakeLists.txt rename to src/devices/networkWrappers/RGBDSensorClient/tests/CMakeLists.txt diff --git a/src/devices/RGBDSensorClient/tests/RGBDSensorClient_test.cpp b/src/devices/networkWrappers/RGBDSensorClient/tests/RGBDSensorClient_test.cpp similarity index 100% rename from src/devices/RGBDSensorClient/tests/RGBDSensorClient_test.cpp rename to src/devices/networkWrappers/RGBDSensorClient/tests/RGBDSensorClient_test.cpp diff --git a/src/devices/RGBDSensor_nws_yarp/CMakeLists.txt b/src/devices/networkWrappers/RGBDSensor_nws_yarp/CMakeLists.txt similarity index 100% rename from src/devices/RGBDSensor_nws_yarp/CMakeLists.txt rename to src/devices/networkWrappers/RGBDSensor_nws_yarp/CMakeLists.txt diff --git a/src/devices/RGBDSensor_nws_yarp/RgbdSensor_nws_yarp.cpp b/src/devices/networkWrappers/RGBDSensor_nws_yarp/RgbdSensor_nws_yarp.cpp similarity index 100% rename from src/devices/RGBDSensor_nws_yarp/RgbdSensor_nws_yarp.cpp rename to src/devices/networkWrappers/RGBDSensor_nws_yarp/RgbdSensor_nws_yarp.cpp diff --git a/src/devices/RGBDSensor_nws_yarp/RgbdSensor_nws_yarp.h b/src/devices/networkWrappers/RGBDSensor_nws_yarp/RgbdSensor_nws_yarp.h similarity index 100% rename from src/devices/RGBDSensor_nws_yarp/RgbdSensor_nws_yarp.h rename to src/devices/networkWrappers/RGBDSensor_nws_yarp/RgbdSensor_nws_yarp.h diff --git a/src/devices/RGBDSensor_nws_yarp/tests/CMakeLists.txt b/src/devices/networkWrappers/RGBDSensor_nws_yarp/tests/CMakeLists.txt similarity index 100% rename from src/devices/RGBDSensor_nws_yarp/tests/CMakeLists.txt rename to src/devices/networkWrappers/RGBDSensor_nws_yarp/tests/CMakeLists.txt diff --git a/src/devices/RGBDSensor_nws_yarp/tests/RGBDSensor_nws_yarp_test.cpp b/src/devices/networkWrappers/RGBDSensor_nws_yarp/tests/RGBDSensor_nws_yarp_test.cpp similarity index 100% rename from src/devices/RGBDSensor_nws_yarp/tests/RGBDSensor_nws_yarp_test.cpp rename to src/devices/networkWrappers/RGBDSensor_nws_yarp/tests/RGBDSensor_nws_yarp_test.cpp diff --git a/src/devices/Rangefinder2DClient/CMakeLists.txt b/src/devices/networkWrappers/Rangefinder2DClient/CMakeLists.txt similarity index 100% rename from src/devices/Rangefinder2DClient/CMakeLists.txt rename to src/devices/networkWrappers/Rangefinder2DClient/CMakeLists.txt diff --git a/src/devices/Rangefinder2DClient/Rangefinder2DClient.cpp b/src/devices/networkWrappers/Rangefinder2DClient/Rangefinder2DClient.cpp similarity index 100% rename from src/devices/Rangefinder2DClient/Rangefinder2DClient.cpp rename to src/devices/networkWrappers/Rangefinder2DClient/Rangefinder2DClient.cpp diff --git a/src/devices/Rangefinder2DClient/Rangefinder2DClient.h b/src/devices/networkWrappers/Rangefinder2DClient/Rangefinder2DClient.h similarity index 100% rename from src/devices/Rangefinder2DClient/Rangefinder2DClient.h rename to src/devices/networkWrappers/Rangefinder2DClient/Rangefinder2DClient.h diff --git a/src/devices/Rangefinder2DClient/tests/CMakeLists.txt b/src/devices/networkWrappers/Rangefinder2DClient/tests/CMakeLists.txt similarity index 100% rename from src/devices/Rangefinder2DClient/tests/CMakeLists.txt rename to src/devices/networkWrappers/Rangefinder2DClient/tests/CMakeLists.txt diff --git a/src/devices/Rangefinder2DClient/tests/rangefinder2DClient_test.cpp b/src/devices/networkWrappers/Rangefinder2DClient/tests/rangefinder2DClient_test.cpp similarity index 100% rename from src/devices/Rangefinder2DClient/tests/rangefinder2DClient_test.cpp rename to src/devices/networkWrappers/Rangefinder2DClient/tests/rangefinder2DClient_test.cpp diff --git a/src/devices/Rangefinder2D_nwc_yarp/CMakeLists.txt b/src/devices/networkWrappers/Rangefinder2D_nwc_yarp/CMakeLists.txt similarity index 100% rename from src/devices/Rangefinder2D_nwc_yarp/CMakeLists.txt rename to src/devices/networkWrappers/Rangefinder2D_nwc_yarp/CMakeLists.txt diff --git a/src/devices/Rangefinder2D_nwc_yarp/Rangefinder2D_nwc_yarp.cpp b/src/devices/networkWrappers/Rangefinder2D_nwc_yarp/Rangefinder2D_nwc_yarp.cpp similarity index 100% rename from src/devices/Rangefinder2D_nwc_yarp/Rangefinder2D_nwc_yarp.cpp rename to src/devices/networkWrappers/Rangefinder2D_nwc_yarp/Rangefinder2D_nwc_yarp.cpp diff --git a/src/devices/Rangefinder2D_nwc_yarp/Rangefinder2D_nwc_yarp.h b/src/devices/networkWrappers/Rangefinder2D_nwc_yarp/Rangefinder2D_nwc_yarp.h similarity index 100% rename from src/devices/Rangefinder2D_nwc_yarp/Rangefinder2D_nwc_yarp.h rename to src/devices/networkWrappers/Rangefinder2D_nwc_yarp/Rangefinder2D_nwc_yarp.h diff --git a/src/devices/Rangefinder2D_nwc_yarp/tests/CMakeLists.txt b/src/devices/networkWrappers/Rangefinder2D_nwc_yarp/tests/CMakeLists.txt similarity index 100% rename from src/devices/Rangefinder2D_nwc_yarp/tests/CMakeLists.txt rename to src/devices/networkWrappers/Rangefinder2D_nwc_yarp/tests/CMakeLists.txt diff --git a/src/devices/Rangefinder2D_nwc_yarp/tests/rangefinder2D_nwc_yarp_test.cpp b/src/devices/networkWrappers/Rangefinder2D_nwc_yarp/tests/rangefinder2D_nwc_yarp_test.cpp similarity index 100% rename from src/devices/Rangefinder2D_nwc_yarp/tests/rangefinder2D_nwc_yarp_test.cpp rename to src/devices/networkWrappers/Rangefinder2D_nwc_yarp/tests/rangefinder2D_nwc_yarp_test.cpp diff --git a/src/devices/Rangefinder2D_nws_yarp/CMakeLists.txt b/src/devices/networkWrappers/Rangefinder2D_nws_yarp/CMakeLists.txt similarity index 100% rename from src/devices/Rangefinder2D_nws_yarp/CMakeLists.txt rename to src/devices/networkWrappers/Rangefinder2D_nws_yarp/CMakeLists.txt diff --git a/src/devices/Rangefinder2D_nws_yarp/Rangefinder2D_nws_yarp.cpp b/src/devices/networkWrappers/Rangefinder2D_nws_yarp/Rangefinder2D_nws_yarp.cpp similarity index 100% rename from src/devices/Rangefinder2D_nws_yarp/Rangefinder2D_nws_yarp.cpp rename to src/devices/networkWrappers/Rangefinder2D_nws_yarp/Rangefinder2D_nws_yarp.cpp diff --git a/src/devices/Rangefinder2D_nws_yarp/Rangefinder2D_nws_yarp.h b/src/devices/networkWrappers/Rangefinder2D_nws_yarp/Rangefinder2D_nws_yarp.h similarity index 100% rename from src/devices/Rangefinder2D_nws_yarp/Rangefinder2D_nws_yarp.h rename to src/devices/networkWrappers/Rangefinder2D_nws_yarp/Rangefinder2D_nws_yarp.h diff --git a/src/devices/Rangefinder2D_nws_yarp/tests/CMakeLists.txt b/src/devices/networkWrappers/Rangefinder2D_nws_yarp/tests/CMakeLists.txt similarity index 100% rename from src/devices/Rangefinder2D_nws_yarp/tests/CMakeLists.txt rename to src/devices/networkWrappers/Rangefinder2D_nws_yarp/tests/CMakeLists.txt diff --git a/src/devices/Rangefinder2D_nws_yarp/tests/rangefinder2D_nws_yarp_test.cpp b/src/devices/networkWrappers/Rangefinder2D_nws_yarp/tests/rangefinder2D_nws_yarp_test.cpp similarity index 100% rename from src/devices/Rangefinder2D_nws_yarp/tests/rangefinder2D_nws_yarp_test.cpp rename to src/devices/networkWrappers/Rangefinder2D_nws_yarp/tests/rangefinder2D_nws_yarp_test.cpp diff --git a/src/devices/RemoteControlBoard/CMakeLists.txt b/src/devices/networkWrappers/RemoteControlBoard/CMakeLists.txt similarity index 100% rename from src/devices/RemoteControlBoard/CMakeLists.txt rename to src/devices/networkWrappers/RemoteControlBoard/CMakeLists.txt diff --git a/src/devices/RemoteControlBoard/RemoteControlBoard.cpp b/src/devices/networkWrappers/RemoteControlBoard/RemoteControlBoard.cpp similarity index 100% rename from src/devices/RemoteControlBoard/RemoteControlBoard.cpp rename to src/devices/networkWrappers/RemoteControlBoard/RemoteControlBoard.cpp diff --git a/src/devices/RemoteControlBoard/RemoteControlBoard.h b/src/devices/networkWrappers/RemoteControlBoard/RemoteControlBoard.h similarity index 100% rename from src/devices/RemoteControlBoard/RemoteControlBoard.h rename to src/devices/networkWrappers/RemoteControlBoard/RemoteControlBoard.h diff --git a/src/devices/RemoteControlBoard/RemoteControlBoardLogComponent.cpp b/src/devices/networkWrappers/RemoteControlBoard/RemoteControlBoardLogComponent.cpp similarity index 100% rename from src/devices/RemoteControlBoard/RemoteControlBoardLogComponent.cpp rename to src/devices/networkWrappers/RemoteControlBoard/RemoteControlBoardLogComponent.cpp diff --git a/src/devices/RemoteControlBoard/RemoteControlBoardLogComponent.h b/src/devices/networkWrappers/RemoteControlBoard/RemoteControlBoardLogComponent.h similarity index 100% rename from src/devices/RemoteControlBoard/RemoteControlBoardLogComponent.h rename to src/devices/networkWrappers/RemoteControlBoard/RemoteControlBoardLogComponent.h diff --git a/src/devices/RemoteControlBoard/stateExtendedReader.cpp b/src/devices/networkWrappers/RemoteControlBoard/stateExtendedReader.cpp similarity index 100% rename from src/devices/RemoteControlBoard/stateExtendedReader.cpp rename to src/devices/networkWrappers/RemoteControlBoard/stateExtendedReader.cpp diff --git a/src/devices/RemoteControlBoard/stateExtendedReader.h b/src/devices/networkWrappers/RemoteControlBoard/stateExtendedReader.h similarity index 100% rename from src/devices/RemoteControlBoard/stateExtendedReader.h rename to src/devices/networkWrappers/RemoteControlBoard/stateExtendedReader.h diff --git a/src/devices/RemoteControlBoard/tests/CMakeLists.txt b/src/devices/networkWrappers/RemoteControlBoard/tests/CMakeLists.txt similarity index 100% rename from src/devices/RemoteControlBoard/tests/CMakeLists.txt rename to src/devices/networkWrappers/RemoteControlBoard/tests/CMakeLists.txt diff --git a/src/devices/RemoteControlBoard/tests/RemoteControlBoard_test.cpp b/src/devices/networkWrappers/RemoteControlBoard/tests/RemoteControlBoard_test.cpp similarity index 100% rename from src/devices/RemoteControlBoard/tests/RemoteControlBoard_test.cpp rename to src/devices/networkWrappers/RemoteControlBoard/tests/RemoteControlBoard_test.cpp diff --git a/src/devices/RobotDescriptionClient/CMakeLists.txt b/src/devices/networkWrappers/RobotDescriptionClient/CMakeLists.txt similarity index 100% rename from src/devices/RobotDescriptionClient/CMakeLists.txt rename to src/devices/networkWrappers/RobotDescriptionClient/CMakeLists.txt diff --git a/src/devices/RobotDescriptionClient/RobotDescriptionClient.cpp b/src/devices/networkWrappers/RobotDescriptionClient/RobotDescriptionClient.cpp similarity index 100% rename from src/devices/RobotDescriptionClient/RobotDescriptionClient.cpp rename to src/devices/networkWrappers/RobotDescriptionClient/RobotDescriptionClient.cpp diff --git a/src/devices/RobotDescriptionClient/RobotDescriptionClient.h b/src/devices/networkWrappers/RobotDescriptionClient/RobotDescriptionClient.h similarity index 100% rename from src/devices/RobotDescriptionClient/RobotDescriptionClient.h rename to src/devices/networkWrappers/RobotDescriptionClient/RobotDescriptionClient.h diff --git a/src/devices/RobotDescriptionClient/tests/CMakeLists.txt b/src/devices/networkWrappers/RobotDescriptionClient/tests/CMakeLists.txt similarity index 100% rename from src/devices/RobotDescriptionClient/tests/CMakeLists.txt rename to src/devices/networkWrappers/RobotDescriptionClient/tests/CMakeLists.txt diff --git a/src/devices/RobotDescriptionClient/tests/robotDescriptionClient_test.cpp b/src/devices/networkWrappers/RobotDescriptionClient/tests/robotDescriptionClient_test.cpp similarity index 100% rename from src/devices/RobotDescriptionClient/tests/robotDescriptionClient_test.cpp rename to src/devices/networkWrappers/RobotDescriptionClient/tests/robotDescriptionClient_test.cpp diff --git a/src/devices/RobotDescriptionServer/CMakeLists.txt b/src/devices/networkWrappers/RobotDescriptionServer/CMakeLists.txt similarity index 100% rename from src/devices/RobotDescriptionServer/CMakeLists.txt rename to src/devices/networkWrappers/RobotDescriptionServer/CMakeLists.txt diff --git a/src/devices/RobotDescriptionServer/RobotDescriptionServer.cpp b/src/devices/networkWrappers/RobotDescriptionServer/RobotDescriptionServer.cpp similarity index 100% rename from src/devices/RobotDescriptionServer/RobotDescriptionServer.cpp rename to src/devices/networkWrappers/RobotDescriptionServer/RobotDescriptionServer.cpp diff --git a/src/devices/RobotDescriptionServer/RobotDescriptionServer.h b/src/devices/networkWrappers/RobotDescriptionServer/RobotDescriptionServer.h similarity index 100% rename from src/devices/RobotDescriptionServer/RobotDescriptionServer.h rename to src/devices/networkWrappers/RobotDescriptionServer/RobotDescriptionServer.h diff --git a/src/devices/RobotDescriptionServer/tests/CMakeLists.txt b/src/devices/networkWrappers/RobotDescriptionServer/tests/CMakeLists.txt similarity index 100% rename from src/devices/RobotDescriptionServer/tests/CMakeLists.txt rename to src/devices/networkWrappers/RobotDescriptionServer/tests/CMakeLists.txt diff --git a/src/devices/RobotDescriptionServer/tests/robotDescriptionServer_test.cpp b/src/devices/networkWrappers/RobotDescriptionServer/tests/robotDescriptionServer_test.cpp similarity index 100% rename from src/devices/RobotDescriptionServer/tests/robotDescriptionServer_test.cpp rename to src/devices/networkWrappers/RobotDescriptionServer/tests/robotDescriptionServer_test.cpp diff --git a/src/devices/VirtualAnalogWrapper/CMakeLists.txt b/src/devices/networkWrappers/VirtualAnalogWrapper/CMakeLists.txt similarity index 100% rename from src/devices/VirtualAnalogWrapper/CMakeLists.txt rename to src/devices/networkWrappers/VirtualAnalogWrapper/CMakeLists.txt diff --git a/src/devices/VirtualAnalogWrapper/VirtualAnalogWrapper.cpp b/src/devices/networkWrappers/VirtualAnalogWrapper/VirtualAnalogWrapper.cpp similarity index 100% rename from src/devices/VirtualAnalogWrapper/VirtualAnalogWrapper.cpp rename to src/devices/networkWrappers/VirtualAnalogWrapper/VirtualAnalogWrapper.cpp diff --git a/src/devices/VirtualAnalogWrapper/VirtualAnalogWrapper.h b/src/devices/networkWrappers/VirtualAnalogWrapper/VirtualAnalogWrapper.h similarity index 100% rename from src/devices/VirtualAnalogWrapper/VirtualAnalogWrapper.h rename to src/devices/networkWrappers/VirtualAnalogWrapper/VirtualAnalogWrapper.h diff --git a/src/devices/audioPlayerWrapper/AudioPlayerWrapper.cpp b/src/devices/networkWrappers/audioPlayerWrapper/AudioPlayerWrapper.cpp similarity index 100% rename from src/devices/audioPlayerWrapper/AudioPlayerWrapper.cpp rename to src/devices/networkWrappers/audioPlayerWrapper/AudioPlayerWrapper.cpp diff --git a/src/devices/audioPlayerWrapper/AudioPlayerWrapper.h b/src/devices/networkWrappers/audioPlayerWrapper/AudioPlayerWrapper.h similarity index 100% rename from src/devices/audioPlayerWrapper/AudioPlayerWrapper.h rename to src/devices/networkWrappers/audioPlayerWrapper/AudioPlayerWrapper.h diff --git a/src/devices/audioPlayerWrapper/CMakeLists.txt b/src/devices/networkWrappers/audioPlayerWrapper/CMakeLists.txt similarity index 100% rename from src/devices/audioPlayerWrapper/CMakeLists.txt rename to src/devices/networkWrappers/audioPlayerWrapper/CMakeLists.txt diff --git a/src/devices/audioPlayerWrapper/tests/CMakeLists.txt b/src/devices/networkWrappers/audioPlayerWrapper/tests/CMakeLists.txt similarity index 100% rename from src/devices/audioPlayerWrapper/tests/CMakeLists.txt rename to src/devices/networkWrappers/audioPlayerWrapper/tests/CMakeLists.txt diff --git a/src/devices/audioPlayerWrapper/tests/audioPlayerWrapper_test.cpp b/src/devices/networkWrappers/audioPlayerWrapper/tests/audioPlayerWrapper_test.cpp similarity index 100% rename from src/devices/audioPlayerWrapper/tests/audioPlayerWrapper_test.cpp rename to src/devices/networkWrappers/audioPlayerWrapper/tests/audioPlayerWrapper_test.cpp diff --git a/src/devices/audioRecorderWrapper/AudioRecorderWrapper.cpp b/src/devices/networkWrappers/audioRecorderWrapper/AudioRecorderWrapper.cpp similarity index 100% rename from src/devices/audioRecorderWrapper/AudioRecorderWrapper.cpp rename to src/devices/networkWrappers/audioRecorderWrapper/AudioRecorderWrapper.cpp diff --git a/src/devices/audioRecorderWrapper/AudioRecorderWrapper.h b/src/devices/networkWrappers/audioRecorderWrapper/AudioRecorderWrapper.h similarity index 100% rename from src/devices/audioRecorderWrapper/AudioRecorderWrapper.h rename to src/devices/networkWrappers/audioRecorderWrapper/AudioRecorderWrapper.h diff --git a/src/devices/audioRecorderWrapper/CMakeLists.txt b/src/devices/networkWrappers/audioRecorderWrapper/CMakeLists.txt similarity index 100% rename from src/devices/audioRecorderWrapper/CMakeLists.txt rename to src/devices/networkWrappers/audioRecorderWrapper/CMakeLists.txt diff --git a/src/devices/audioRecorderWrapper/tests/CMakeLists.txt b/src/devices/networkWrappers/audioRecorderWrapper/tests/CMakeLists.txt similarity index 100% rename from src/devices/audioRecorderWrapper/tests/CMakeLists.txt rename to src/devices/networkWrappers/audioRecorderWrapper/tests/CMakeLists.txt diff --git a/src/devices/audioRecorderWrapper/tests/audioRecorderWrapper_test.cpp b/src/devices/networkWrappers/audioRecorderWrapper/tests/audioRecorderWrapper_test.cpp similarity index 100% rename from src/devices/audioRecorderWrapper/tests/audioRecorderWrapper_test.cpp rename to src/devices/networkWrappers/audioRecorderWrapper/tests/audioRecorderWrapper_test.cpp diff --git a/src/devices/audioRecorder_nwc_yarp/CMakeLists.txt b/src/devices/networkWrappers/audioRecorder_nwc_yarp/CMakeLists.txt similarity index 100% rename from src/devices/audioRecorder_nwc_yarp/CMakeLists.txt rename to src/devices/networkWrappers/audioRecorder_nwc_yarp/CMakeLists.txt diff --git a/src/devices/audioRecorder_nwc_yarp/audioRecorder_nwc_yarp.cpp b/src/devices/networkWrappers/audioRecorder_nwc_yarp/audioRecorder_nwc_yarp.cpp similarity index 100% rename from src/devices/audioRecorder_nwc_yarp/audioRecorder_nwc_yarp.cpp rename to src/devices/networkWrappers/audioRecorder_nwc_yarp/audioRecorder_nwc_yarp.cpp diff --git a/src/devices/audioRecorder_nwc_yarp/audioRecorder_nwc_yarp.h b/src/devices/networkWrappers/audioRecorder_nwc_yarp/audioRecorder_nwc_yarp.h similarity index 100% rename from src/devices/audioRecorder_nwc_yarp/audioRecorder_nwc_yarp.h rename to src/devices/networkWrappers/audioRecorder_nwc_yarp/audioRecorder_nwc_yarp.h diff --git a/src/devices/audioRecorder_nwc_yarp/tests/CMakeLists.txt b/src/devices/networkWrappers/audioRecorder_nwc_yarp/tests/CMakeLists.txt similarity index 100% rename from src/devices/audioRecorder_nwc_yarp/tests/CMakeLists.txt rename to src/devices/networkWrappers/audioRecorder_nwc_yarp/tests/CMakeLists.txt diff --git a/src/devices/audioRecorder_nwc_yarp/tests/audioRecorder_nwc_yarp_test.cpp b/src/devices/networkWrappers/audioRecorder_nwc_yarp/tests/audioRecorder_nwc_yarp_test.cpp similarity index 100% rename from src/devices/audioRecorder_nwc_yarp/tests/audioRecorder_nwc_yarp_test.cpp rename to src/devices/networkWrappers/audioRecorder_nwc_yarp/tests/audioRecorder_nwc_yarp_test.cpp diff --git a/src/devices/audioRecorder_nws_yarp/AudioRecorderServerImpl.cpp b/src/devices/networkWrappers/audioRecorder_nws_yarp/AudioRecorderServerImpl.cpp similarity index 100% rename from src/devices/audioRecorder_nws_yarp/AudioRecorderServerImpl.cpp rename to src/devices/networkWrappers/audioRecorder_nws_yarp/AudioRecorderServerImpl.cpp diff --git a/src/devices/audioRecorder_nws_yarp/AudioRecorderServerImpl.h b/src/devices/networkWrappers/audioRecorder_nws_yarp/AudioRecorderServerImpl.h similarity index 100% rename from src/devices/audioRecorder_nws_yarp/AudioRecorderServerImpl.h rename to src/devices/networkWrappers/audioRecorder_nws_yarp/AudioRecorderServerImpl.h diff --git a/src/devices/audioRecorder_nws_yarp/AudioRecorder_nws_yarp.cpp b/src/devices/networkWrappers/audioRecorder_nws_yarp/AudioRecorder_nws_yarp.cpp similarity index 100% rename from src/devices/audioRecorder_nws_yarp/AudioRecorder_nws_yarp.cpp rename to src/devices/networkWrappers/audioRecorder_nws_yarp/AudioRecorder_nws_yarp.cpp diff --git a/src/devices/audioRecorder_nws_yarp/AudioRecorder_nws_yarp.h b/src/devices/networkWrappers/audioRecorder_nws_yarp/AudioRecorder_nws_yarp.h similarity index 100% rename from src/devices/audioRecorder_nws_yarp/AudioRecorder_nws_yarp.h rename to src/devices/networkWrappers/audioRecorder_nws_yarp/AudioRecorder_nws_yarp.h diff --git a/src/devices/audioRecorder_nws_yarp/CMakeLists.txt b/src/devices/networkWrappers/audioRecorder_nws_yarp/CMakeLists.txt similarity index 100% rename from src/devices/audioRecorder_nws_yarp/CMakeLists.txt rename to src/devices/networkWrappers/audioRecorder_nws_yarp/CMakeLists.txt diff --git a/src/devices/audioRecorder_nws_yarp/tests/CMakeLists.txt b/src/devices/networkWrappers/audioRecorder_nws_yarp/tests/CMakeLists.txt similarity index 100% rename from src/devices/audioRecorder_nws_yarp/tests/CMakeLists.txt rename to src/devices/networkWrappers/audioRecorder_nws_yarp/tests/CMakeLists.txt diff --git a/src/devices/audioRecorder_nws_yarp/tests/audioRecorder_nws_yarp_test.cpp b/src/devices/networkWrappers/audioRecorder_nws_yarp/tests/audioRecorder_nws_yarp_test.cpp similarity index 100% rename from src/devices/audioRecorder_nws_yarp/tests/audioRecorder_nws_yarp_test.cpp rename to src/devices/networkWrappers/audioRecorder_nws_yarp/tests/audioRecorder_nws_yarp_test.cpp diff --git a/src/devices/battery_nwc_yarp/CMakeLists.txt b/src/devices/networkWrappers/battery_nwc_yarp/CMakeLists.txt similarity index 100% rename from src/devices/battery_nwc_yarp/CMakeLists.txt rename to src/devices/networkWrappers/battery_nwc_yarp/CMakeLists.txt diff --git a/src/devices/battery_nwc_yarp/battery_nwc_yarp.cpp b/src/devices/networkWrappers/battery_nwc_yarp/battery_nwc_yarp.cpp similarity index 100% rename from src/devices/battery_nwc_yarp/battery_nwc_yarp.cpp rename to src/devices/networkWrappers/battery_nwc_yarp/battery_nwc_yarp.cpp diff --git a/src/devices/battery_nwc_yarp/battery_nwc_yarp.h b/src/devices/networkWrappers/battery_nwc_yarp/battery_nwc_yarp.h similarity index 100% rename from src/devices/battery_nwc_yarp/battery_nwc_yarp.h rename to src/devices/networkWrappers/battery_nwc_yarp/battery_nwc_yarp.h diff --git a/src/devices/battery_nwc_yarp/tests/CMakeLists.txt b/src/devices/networkWrappers/battery_nwc_yarp/tests/CMakeLists.txt similarity index 100% rename from src/devices/battery_nwc_yarp/tests/CMakeLists.txt rename to src/devices/networkWrappers/battery_nwc_yarp/tests/CMakeLists.txt diff --git a/src/devices/battery_nwc_yarp/tests/battery_nwc_yarp_test.cpp b/src/devices/networkWrappers/battery_nwc_yarp/tests/battery_nwc_yarp_test.cpp similarity index 100% rename from src/devices/battery_nwc_yarp/tests/battery_nwc_yarp_test.cpp rename to src/devices/networkWrappers/battery_nwc_yarp/tests/battery_nwc_yarp_test.cpp diff --git a/src/devices/battery_nws_yarp/CMakeLists.txt b/src/devices/networkWrappers/battery_nws_yarp/CMakeLists.txt similarity index 100% rename from src/devices/battery_nws_yarp/CMakeLists.txt rename to src/devices/networkWrappers/battery_nws_yarp/CMakeLists.txt diff --git a/src/devices/battery_nws_yarp/battery_nws_yarp.cpp b/src/devices/networkWrappers/battery_nws_yarp/battery_nws_yarp.cpp similarity index 100% rename from src/devices/battery_nws_yarp/battery_nws_yarp.cpp rename to src/devices/networkWrappers/battery_nws_yarp/battery_nws_yarp.cpp diff --git a/src/devices/battery_nws_yarp/battery_nws_yarp.h b/src/devices/networkWrappers/battery_nws_yarp/battery_nws_yarp.h similarity index 100% rename from src/devices/battery_nws_yarp/battery_nws_yarp.h rename to src/devices/networkWrappers/battery_nws_yarp/battery_nws_yarp.h diff --git a/src/devices/battery_nws_yarp/tests/CMakeLists.txt b/src/devices/networkWrappers/battery_nws_yarp/tests/CMakeLists.txt similarity index 100% rename from src/devices/battery_nws_yarp/tests/CMakeLists.txt rename to src/devices/networkWrappers/battery_nws_yarp/tests/CMakeLists.txt diff --git a/src/devices/battery_nws_yarp/tests/battery_nws_yarp_test.cpp b/src/devices/networkWrappers/battery_nws_yarp/tests/battery_nws_yarp_test.cpp similarity index 100% rename from src/devices/battery_nws_yarp/tests/battery_nws_yarp_test.cpp rename to src/devices/networkWrappers/battery_nws_yarp/tests/battery_nws_yarp_test.cpp diff --git a/src/devices/chatBot_nwc_yarp/CMakeLists.txt b/src/devices/networkWrappers/chatBot_nwc_yarp/CMakeLists.txt similarity index 100% rename from src/devices/chatBot_nwc_yarp/CMakeLists.txt rename to src/devices/networkWrappers/chatBot_nwc_yarp/CMakeLists.txt diff --git a/src/devices/chatBot_nwc_yarp/ChatBot_nwc_yarp.cpp b/src/devices/networkWrappers/chatBot_nwc_yarp/ChatBot_nwc_yarp.cpp similarity index 100% rename from src/devices/chatBot_nwc_yarp/ChatBot_nwc_yarp.cpp rename to src/devices/networkWrappers/chatBot_nwc_yarp/ChatBot_nwc_yarp.cpp diff --git a/src/devices/chatBot_nwc_yarp/ChatBot_nwc_yarp.h b/src/devices/networkWrappers/chatBot_nwc_yarp/ChatBot_nwc_yarp.h similarity index 100% rename from src/devices/chatBot_nwc_yarp/ChatBot_nwc_yarp.h rename to src/devices/networkWrappers/chatBot_nwc_yarp/ChatBot_nwc_yarp.h diff --git a/src/devices/chatBot_nwc_yarp/tests/CMakeLists.txt b/src/devices/networkWrappers/chatBot_nwc_yarp/tests/CMakeLists.txt similarity index 100% rename from src/devices/chatBot_nwc_yarp/tests/CMakeLists.txt rename to src/devices/networkWrappers/chatBot_nwc_yarp/tests/CMakeLists.txt diff --git a/src/devices/chatBot_nwc_yarp/tests/chatBot_nwc_yarp_test.cpp b/src/devices/networkWrappers/chatBot_nwc_yarp/tests/chatBot_nwc_yarp_test.cpp similarity index 100% rename from src/devices/chatBot_nwc_yarp/tests/chatBot_nwc_yarp_test.cpp rename to src/devices/networkWrappers/chatBot_nwc_yarp/tests/chatBot_nwc_yarp_test.cpp diff --git a/src/devices/chatBot_nws_yarp/CMakeLists.txt b/src/devices/networkWrappers/chatBot_nws_yarp/CMakeLists.txt similarity index 100% rename from src/devices/chatBot_nws_yarp/CMakeLists.txt rename to src/devices/networkWrappers/chatBot_nws_yarp/CMakeLists.txt diff --git a/src/devices/chatBot_nws_yarp/ChatBotRPC_CallbackHelper.cpp b/src/devices/networkWrappers/chatBot_nws_yarp/ChatBotRPC_CallbackHelper.cpp similarity index 100% rename from src/devices/chatBot_nws_yarp/ChatBotRPC_CallbackHelper.cpp rename to src/devices/networkWrappers/chatBot_nws_yarp/ChatBotRPC_CallbackHelper.cpp diff --git a/src/devices/chatBot_nws_yarp/ChatBot_nws_yarp.cpp b/src/devices/networkWrappers/chatBot_nws_yarp/ChatBot_nws_yarp.cpp similarity index 100% rename from src/devices/chatBot_nws_yarp/ChatBot_nws_yarp.cpp rename to src/devices/networkWrappers/chatBot_nws_yarp/ChatBot_nws_yarp.cpp diff --git a/src/devices/chatBot_nws_yarp/ChatBot_nws_yarp.h b/src/devices/networkWrappers/chatBot_nws_yarp/ChatBot_nws_yarp.h similarity index 100% rename from src/devices/chatBot_nws_yarp/ChatBot_nws_yarp.h rename to src/devices/networkWrappers/chatBot_nws_yarp/ChatBot_nws_yarp.h diff --git a/src/devices/chatBot_nws_yarp/IChatBotMsgsImpl.cpp b/src/devices/networkWrappers/chatBot_nws_yarp/IChatBotMsgsImpl.cpp similarity index 100% rename from src/devices/chatBot_nws_yarp/IChatBotMsgsImpl.cpp rename to src/devices/networkWrappers/chatBot_nws_yarp/IChatBotMsgsImpl.cpp diff --git a/src/devices/chatBot_nws_yarp/tests/CMakeLists.txt b/src/devices/networkWrappers/chatBot_nws_yarp/tests/CMakeLists.txt similarity index 100% rename from src/devices/chatBot_nws_yarp/tests/CMakeLists.txt rename to src/devices/networkWrappers/chatBot_nws_yarp/tests/CMakeLists.txt diff --git a/src/devices/chatBot_nws_yarp/tests/chatBot_nws_yarp_test.cpp b/src/devices/networkWrappers/chatBot_nws_yarp/tests/chatBot_nws_yarp_test.cpp similarity index 100% rename from src/devices/chatBot_nws_yarp/tests/chatBot_nws_yarp_test.cpp rename to src/devices/networkWrappers/chatBot_nws_yarp/tests/chatBot_nws_yarp_test.cpp diff --git a/src/devices/controlBoard_nws_yarp/CMakeLists.txt b/src/devices/networkWrappers/controlBoard_nws_yarp/CMakeLists.txt similarity index 100% rename from src/devices/controlBoard_nws_yarp/CMakeLists.txt rename to src/devices/networkWrappers/controlBoard_nws_yarp/CMakeLists.txt diff --git a/src/devices/controlBoard_nws_yarp/ControlBoardLogComponent.cpp b/src/devices/networkWrappers/controlBoard_nws_yarp/ControlBoardLogComponent.cpp similarity index 100% rename from src/devices/controlBoard_nws_yarp/ControlBoardLogComponent.cpp rename to src/devices/networkWrappers/controlBoard_nws_yarp/ControlBoardLogComponent.cpp diff --git a/src/devices/controlBoard_nws_yarp/ControlBoardLogComponent.h b/src/devices/networkWrappers/controlBoard_nws_yarp/ControlBoardLogComponent.h similarity index 100% rename from src/devices/controlBoard_nws_yarp/ControlBoardLogComponent.h rename to src/devices/networkWrappers/controlBoard_nws_yarp/ControlBoardLogComponent.h diff --git a/src/devices/controlBoard_nws_yarp/ControlBoard_nws_yarp.cpp b/src/devices/networkWrappers/controlBoard_nws_yarp/ControlBoard_nws_yarp.cpp similarity index 100% rename from src/devices/controlBoard_nws_yarp/ControlBoard_nws_yarp.cpp rename to src/devices/networkWrappers/controlBoard_nws_yarp/ControlBoard_nws_yarp.cpp diff --git a/src/devices/controlBoard_nws_yarp/ControlBoard_nws_yarp.h b/src/devices/networkWrappers/controlBoard_nws_yarp/ControlBoard_nws_yarp.h similarity index 100% rename from src/devices/controlBoard_nws_yarp/ControlBoard_nws_yarp.h rename to src/devices/networkWrappers/controlBoard_nws_yarp/ControlBoard_nws_yarp.h diff --git a/src/devices/controlBoard_nws_yarp/RPCMessagesParser.cpp b/src/devices/networkWrappers/controlBoard_nws_yarp/RPCMessagesParser.cpp similarity index 100% rename from src/devices/controlBoard_nws_yarp/RPCMessagesParser.cpp rename to src/devices/networkWrappers/controlBoard_nws_yarp/RPCMessagesParser.cpp diff --git a/src/devices/controlBoard_nws_yarp/RPCMessagesParser.h b/src/devices/networkWrappers/controlBoard_nws_yarp/RPCMessagesParser.h similarity index 100% rename from src/devices/controlBoard_nws_yarp/RPCMessagesParser.h rename to src/devices/networkWrappers/controlBoard_nws_yarp/RPCMessagesParser.h diff --git a/src/devices/controlBoard_nws_yarp/StreamingMessagesParser.cpp b/src/devices/networkWrappers/controlBoard_nws_yarp/StreamingMessagesParser.cpp similarity index 100% rename from src/devices/controlBoard_nws_yarp/StreamingMessagesParser.cpp rename to src/devices/networkWrappers/controlBoard_nws_yarp/StreamingMessagesParser.cpp diff --git a/src/devices/controlBoard_nws_yarp/StreamingMessagesParser.h b/src/devices/networkWrappers/controlBoard_nws_yarp/StreamingMessagesParser.h similarity index 100% rename from src/devices/controlBoard_nws_yarp/StreamingMessagesParser.h rename to src/devices/networkWrappers/controlBoard_nws_yarp/StreamingMessagesParser.h diff --git a/src/devices/controlBoard_nws_yarp/tests/CMakeLists.txt b/src/devices/networkWrappers/controlBoard_nws_yarp/tests/CMakeLists.txt similarity index 100% rename from src/devices/controlBoard_nws_yarp/tests/CMakeLists.txt rename to src/devices/networkWrappers/controlBoard_nws_yarp/tests/CMakeLists.txt diff --git a/src/devices/controlBoard_nws_yarp/tests/controlBoard_nws_yarp_test.cpp b/src/devices/networkWrappers/controlBoard_nws_yarp/tests/controlBoard_nws_yarp_test.cpp similarity index 100% rename from src/devices/controlBoard_nws_yarp/tests/controlBoard_nws_yarp_test.cpp rename to src/devices/networkWrappers/controlBoard_nws_yarp/tests/controlBoard_nws_yarp_test.cpp diff --git a/src/devices/frameGrabber_nwc_yarp/CMakeLists.txt b/src/devices/networkWrappers/frameGrabber_nwc_yarp/CMakeLists.txt similarity index 100% rename from src/devices/frameGrabber_nwc_yarp/CMakeLists.txt rename to src/devices/networkWrappers/frameGrabber_nwc_yarp/CMakeLists.txt diff --git a/src/devices/frameGrabber_nwc_yarp/FrameGrabber_nwc_yarp.cpp b/src/devices/networkWrappers/frameGrabber_nwc_yarp/FrameGrabber_nwc_yarp.cpp similarity index 100% rename from src/devices/frameGrabber_nwc_yarp/FrameGrabber_nwc_yarp.cpp rename to src/devices/networkWrappers/frameGrabber_nwc_yarp/FrameGrabber_nwc_yarp.cpp diff --git a/src/devices/frameGrabber_nwc_yarp/FrameGrabber_nwc_yarp.h b/src/devices/networkWrappers/frameGrabber_nwc_yarp/FrameGrabber_nwc_yarp.h similarity index 100% rename from src/devices/frameGrabber_nwc_yarp/FrameGrabber_nwc_yarp.h rename to src/devices/networkWrappers/frameGrabber_nwc_yarp/FrameGrabber_nwc_yarp.h diff --git a/src/devices/frameGrabber_nwc_yarp/tests/CMakeLists.txt b/src/devices/networkWrappers/frameGrabber_nwc_yarp/tests/CMakeLists.txt similarity index 100% rename from src/devices/frameGrabber_nwc_yarp/tests/CMakeLists.txt rename to src/devices/networkWrappers/frameGrabber_nwc_yarp/tests/CMakeLists.txt diff --git a/src/devices/frameGrabber_nwc_yarp/tests/frameGrabber_nwc_yarp_test.cpp b/src/devices/networkWrappers/frameGrabber_nwc_yarp/tests/frameGrabber_nwc_yarp_test.cpp similarity index 100% rename from src/devices/frameGrabber_nwc_yarp/tests/frameGrabber_nwc_yarp_test.cpp rename to src/devices/networkWrappers/frameGrabber_nwc_yarp/tests/frameGrabber_nwc_yarp_test.cpp diff --git a/src/devices/frameGrabber_nws_yarp/CMakeLists.txt b/src/devices/networkWrappers/frameGrabber_nws_yarp/CMakeLists.txt similarity index 100% rename from src/devices/frameGrabber_nws_yarp/CMakeLists.txt rename to src/devices/networkWrappers/frameGrabber_nws_yarp/CMakeLists.txt diff --git a/src/devices/frameGrabber_nws_yarp/FrameGrabber_nws_yarp.cpp b/src/devices/networkWrappers/frameGrabber_nws_yarp/FrameGrabber_nws_yarp.cpp similarity index 100% rename from src/devices/frameGrabber_nws_yarp/FrameGrabber_nws_yarp.cpp rename to src/devices/networkWrappers/frameGrabber_nws_yarp/FrameGrabber_nws_yarp.cpp diff --git a/src/devices/frameGrabber_nws_yarp/FrameGrabber_nws_yarp.h b/src/devices/networkWrappers/frameGrabber_nws_yarp/FrameGrabber_nws_yarp.h similarity index 100% rename from src/devices/frameGrabber_nws_yarp/FrameGrabber_nws_yarp.h rename to src/devices/networkWrappers/frameGrabber_nws_yarp/FrameGrabber_nws_yarp.h diff --git a/src/devices/frameGrabber_nws_yarp/tests/CMakeLists.txt b/src/devices/networkWrappers/frameGrabber_nws_yarp/tests/CMakeLists.txt similarity index 100% rename from src/devices/frameGrabber_nws_yarp/tests/CMakeLists.txt rename to src/devices/networkWrappers/frameGrabber_nws_yarp/tests/CMakeLists.txt diff --git a/src/devices/frameGrabber_nws_yarp/tests/frameGrabber_nws_yarp_test.cpp b/src/devices/networkWrappers/frameGrabber_nws_yarp/tests/frameGrabber_nws_yarp_test.cpp similarity index 100% rename from src/devices/frameGrabber_nws_yarp/tests/frameGrabber_nws_yarp_test.cpp rename to src/devices/networkWrappers/frameGrabber_nws_yarp/tests/frameGrabber_nws_yarp_test.cpp diff --git a/src/devices/localization2D_nwc_yarp/CMakeLists.txt b/src/devices/networkWrappers/localization2D_nwc_yarp/CMakeLists.txt similarity index 100% rename from src/devices/localization2D_nwc_yarp/CMakeLists.txt rename to src/devices/networkWrappers/localization2D_nwc_yarp/CMakeLists.txt diff --git a/src/devices/localization2D_nwc_yarp/Localization2D_nwc_yarp.cpp b/src/devices/networkWrappers/localization2D_nwc_yarp/Localization2D_nwc_yarp.cpp similarity index 100% rename from src/devices/localization2D_nwc_yarp/Localization2D_nwc_yarp.cpp rename to src/devices/networkWrappers/localization2D_nwc_yarp/Localization2D_nwc_yarp.cpp diff --git a/src/devices/localization2D_nwc_yarp/Localization2D_nwc_yarp.h b/src/devices/networkWrappers/localization2D_nwc_yarp/Localization2D_nwc_yarp.h similarity index 100% rename from src/devices/localization2D_nwc_yarp/Localization2D_nwc_yarp.h rename to src/devices/networkWrappers/localization2D_nwc_yarp/Localization2D_nwc_yarp.h diff --git a/src/devices/localization2D_nwc_yarp/tests/CMakeLists.txt b/src/devices/networkWrappers/localization2D_nwc_yarp/tests/CMakeLists.txt similarity index 100% rename from src/devices/localization2D_nwc_yarp/tests/CMakeLists.txt rename to src/devices/networkWrappers/localization2D_nwc_yarp/tests/CMakeLists.txt diff --git a/src/devices/localization2D_nwc_yarp/tests/localization2D_nwc_yarp_test.cpp b/src/devices/networkWrappers/localization2D_nwc_yarp/tests/localization2D_nwc_yarp_test.cpp similarity index 100% rename from src/devices/localization2D_nwc_yarp/tests/localization2D_nwc_yarp_test.cpp rename to src/devices/networkWrappers/localization2D_nwc_yarp/tests/localization2D_nwc_yarp_test.cpp diff --git a/src/devices/localization2D_nws_yarp/CMakeLists.txt b/src/devices/networkWrappers/localization2D_nws_yarp/CMakeLists.txt similarity index 100% rename from src/devices/localization2D_nws_yarp/CMakeLists.txt rename to src/devices/networkWrappers/localization2D_nws_yarp/CMakeLists.txt diff --git a/src/devices/localization2D_nws_yarp/ILocalization2DServerImpl.cpp b/src/devices/networkWrappers/localization2D_nws_yarp/ILocalization2DServerImpl.cpp similarity index 100% rename from src/devices/localization2D_nws_yarp/ILocalization2DServerImpl.cpp rename to src/devices/networkWrappers/localization2D_nws_yarp/ILocalization2DServerImpl.cpp diff --git a/src/devices/localization2D_nws_yarp/ILocalization2DServerImpl.h b/src/devices/networkWrappers/localization2D_nws_yarp/ILocalization2DServerImpl.h similarity index 100% rename from src/devices/localization2D_nws_yarp/ILocalization2DServerImpl.h rename to src/devices/networkWrappers/localization2D_nws_yarp/ILocalization2DServerImpl.h diff --git a/src/devices/localization2D_nws_yarp/Localization2D_nws_yarp.cpp b/src/devices/networkWrappers/localization2D_nws_yarp/Localization2D_nws_yarp.cpp similarity index 100% rename from src/devices/localization2D_nws_yarp/Localization2D_nws_yarp.cpp rename to src/devices/networkWrappers/localization2D_nws_yarp/Localization2D_nws_yarp.cpp diff --git a/src/devices/localization2D_nws_yarp/Localization2D_nws_yarp.h b/src/devices/networkWrappers/localization2D_nws_yarp/Localization2D_nws_yarp.h similarity index 100% rename from src/devices/localization2D_nws_yarp/Localization2D_nws_yarp.h rename to src/devices/networkWrappers/localization2D_nws_yarp/Localization2D_nws_yarp.h diff --git a/src/devices/localization2D_nws_yarp/tests/CMakeLists.txt b/src/devices/networkWrappers/localization2D_nws_yarp/tests/CMakeLists.txt similarity index 100% rename from src/devices/localization2D_nws_yarp/tests/CMakeLists.txt rename to src/devices/networkWrappers/localization2D_nws_yarp/tests/CMakeLists.txt diff --git a/src/devices/localization2D_nws_yarp/tests/localization2D_nws_yarp_test.cpp b/src/devices/networkWrappers/localization2D_nws_yarp/tests/localization2D_nws_yarp_test.cpp similarity index 100% rename from src/devices/localization2D_nws_yarp/tests/localization2D_nws_yarp_test.cpp rename to src/devices/networkWrappers/localization2D_nws_yarp/tests/localization2D_nws_yarp_test.cpp diff --git a/src/devices/map2D_nwc_yarp/CMakeLists.txt b/src/devices/networkWrappers/map2D_nwc_yarp/CMakeLists.txt similarity index 100% rename from src/devices/map2D_nwc_yarp/CMakeLists.txt rename to src/devices/networkWrappers/map2D_nwc_yarp/CMakeLists.txt diff --git a/src/devices/map2D_nwc_yarp/Map2D_nwc_yarp.cpp b/src/devices/networkWrappers/map2D_nwc_yarp/Map2D_nwc_yarp.cpp similarity index 100% rename from src/devices/map2D_nwc_yarp/Map2D_nwc_yarp.cpp rename to src/devices/networkWrappers/map2D_nwc_yarp/Map2D_nwc_yarp.cpp diff --git a/src/devices/map2D_nwc_yarp/Map2D_nwc_yarp.h b/src/devices/networkWrappers/map2D_nwc_yarp/Map2D_nwc_yarp.h similarity index 100% rename from src/devices/map2D_nwc_yarp/Map2D_nwc_yarp.h rename to src/devices/networkWrappers/map2D_nwc_yarp/Map2D_nwc_yarp.h diff --git a/src/devices/map2D_nwc_yarp/tests/CMakeLists.txt b/src/devices/networkWrappers/map2D_nwc_yarp/tests/CMakeLists.txt similarity index 100% rename from src/devices/map2D_nwc_yarp/tests/CMakeLists.txt rename to src/devices/networkWrappers/map2D_nwc_yarp/tests/CMakeLists.txt diff --git a/src/devices/map2D_nwc_yarp/tests/map2D_nwc_test.cpp b/src/devices/networkWrappers/map2D_nwc_yarp/tests/map2D_nwc_test.cpp similarity index 100% rename from src/devices/map2D_nwc_yarp/tests/map2D_nwc_test.cpp rename to src/devices/networkWrappers/map2D_nwc_yarp/tests/map2D_nwc_test.cpp diff --git a/src/devices/map2D_nws_yarp/CMakeLists.txt b/src/devices/networkWrappers/map2D_nws_yarp/CMakeLists.txt similarity index 100% rename from src/devices/map2D_nws_yarp/CMakeLists.txt rename to src/devices/networkWrappers/map2D_nws_yarp/CMakeLists.txt diff --git a/src/devices/map2D_nws_yarp/Map2DServerImpl.cpp b/src/devices/networkWrappers/map2D_nws_yarp/Map2DServerImpl.cpp similarity index 100% rename from src/devices/map2D_nws_yarp/Map2DServerImpl.cpp rename to src/devices/networkWrappers/map2D_nws_yarp/Map2DServerImpl.cpp diff --git a/src/devices/map2D_nws_yarp/Map2DServerImpl.h b/src/devices/networkWrappers/map2D_nws_yarp/Map2DServerImpl.h similarity index 100% rename from src/devices/map2D_nws_yarp/Map2DServerImpl.h rename to src/devices/networkWrappers/map2D_nws_yarp/Map2DServerImpl.h diff --git a/src/devices/map2D_nws_yarp/Map2D_nws_yarp.cpp b/src/devices/networkWrappers/map2D_nws_yarp/Map2D_nws_yarp.cpp similarity index 100% rename from src/devices/map2D_nws_yarp/Map2D_nws_yarp.cpp rename to src/devices/networkWrappers/map2D_nws_yarp/Map2D_nws_yarp.cpp diff --git a/src/devices/map2D_nws_yarp/Map2D_nws_yarp.h b/src/devices/networkWrappers/map2D_nws_yarp/Map2D_nws_yarp.h similarity index 100% rename from src/devices/map2D_nws_yarp/Map2D_nws_yarp.h rename to src/devices/networkWrappers/map2D_nws_yarp/Map2D_nws_yarp.h diff --git a/src/devices/map2D_nws_yarp/tests/CMakeLists.txt b/src/devices/networkWrappers/map2D_nws_yarp/tests/CMakeLists.txt similarity index 100% rename from src/devices/map2D_nws_yarp/tests/CMakeLists.txt rename to src/devices/networkWrappers/map2D_nws_yarp/tests/CMakeLists.txt diff --git a/src/devices/map2D_nws_yarp/tests/map2D_nws_test.cpp b/src/devices/networkWrappers/map2D_nws_yarp/tests/map2D_nws_test.cpp similarity index 100% rename from src/devices/map2D_nws_yarp/tests/map2D_nws_test.cpp rename to src/devices/networkWrappers/map2D_nws_yarp/tests/map2D_nws_test.cpp diff --git a/src/devices/mobileBaseVelocityControl_nwc_yarp/CMakeLists.txt b/src/devices/networkWrappers/mobileBaseVelocityControl_nwc_yarp/CMakeLists.txt similarity index 100% rename from src/devices/mobileBaseVelocityControl_nwc_yarp/CMakeLists.txt rename to src/devices/networkWrappers/mobileBaseVelocityControl_nwc_yarp/CMakeLists.txt diff --git a/src/devices/mobileBaseVelocityControl_nwc_yarp/MobileBaseVelocityControl_nwc_yarp.cpp b/src/devices/networkWrappers/mobileBaseVelocityControl_nwc_yarp/MobileBaseVelocityControl_nwc_yarp.cpp similarity index 100% rename from src/devices/mobileBaseVelocityControl_nwc_yarp/MobileBaseVelocityControl_nwc_yarp.cpp rename to src/devices/networkWrappers/mobileBaseVelocityControl_nwc_yarp/MobileBaseVelocityControl_nwc_yarp.cpp diff --git a/src/devices/mobileBaseVelocityControl_nwc_yarp/MobileBaseVelocityControl_nwc_yarp.h b/src/devices/networkWrappers/mobileBaseVelocityControl_nwc_yarp/MobileBaseVelocityControl_nwc_yarp.h similarity index 100% rename from src/devices/mobileBaseVelocityControl_nwc_yarp/MobileBaseVelocityControl_nwc_yarp.h rename to src/devices/networkWrappers/mobileBaseVelocityControl_nwc_yarp/MobileBaseVelocityControl_nwc_yarp.h diff --git a/src/devices/mobileBaseVelocityControl_nwc_yarp/tests/CMakeLists.txt b/src/devices/networkWrappers/mobileBaseVelocityControl_nwc_yarp/tests/CMakeLists.txt similarity index 100% rename from src/devices/mobileBaseVelocityControl_nwc_yarp/tests/CMakeLists.txt rename to src/devices/networkWrappers/mobileBaseVelocityControl_nwc_yarp/tests/CMakeLists.txt diff --git a/src/devices/mobileBaseVelocityControl_nwc_yarp/tests/mobileBaseVelocityControl_nwc_yarp_test.cpp b/src/devices/networkWrappers/mobileBaseVelocityControl_nwc_yarp/tests/mobileBaseVelocityControl_nwc_yarp_test.cpp similarity index 100% rename from src/devices/mobileBaseVelocityControl_nwc_yarp/tests/mobileBaseVelocityControl_nwc_yarp_test.cpp rename to src/devices/networkWrappers/mobileBaseVelocityControl_nwc_yarp/tests/mobileBaseVelocityControl_nwc_yarp_test.cpp diff --git a/src/devices/mobileBaseVelocityControl_nws_yarp/CMakeLists.txt b/src/devices/networkWrappers/mobileBaseVelocityControl_nws_yarp/CMakeLists.txt similarity index 100% rename from src/devices/mobileBaseVelocityControl_nws_yarp/CMakeLists.txt rename to src/devices/networkWrappers/mobileBaseVelocityControl_nws_yarp/CMakeLists.txt diff --git a/src/devices/mobileBaseVelocityControl_nws_yarp/MobileBaseVelocityControl_nws_yarp.cpp b/src/devices/networkWrappers/mobileBaseVelocityControl_nws_yarp/MobileBaseVelocityControl_nws_yarp.cpp similarity index 100% rename from src/devices/mobileBaseVelocityControl_nws_yarp/MobileBaseVelocityControl_nws_yarp.cpp rename to src/devices/networkWrappers/mobileBaseVelocityControl_nws_yarp/MobileBaseVelocityControl_nws_yarp.cpp diff --git a/src/devices/mobileBaseVelocityControl_nws_yarp/MobileBaseVelocityControl_nws_yarp.h b/src/devices/networkWrappers/mobileBaseVelocityControl_nws_yarp/MobileBaseVelocityControl_nws_yarp.h similarity index 100% rename from src/devices/mobileBaseVelocityControl_nws_yarp/MobileBaseVelocityControl_nws_yarp.h rename to src/devices/networkWrappers/mobileBaseVelocityControl_nws_yarp/MobileBaseVelocityControl_nws_yarp.h diff --git a/src/devices/mobileBaseVelocityControl_nws_yarp/tests/CMakeLists.txt b/src/devices/networkWrappers/mobileBaseVelocityControl_nws_yarp/tests/CMakeLists.txt similarity index 100% rename from src/devices/mobileBaseVelocityControl_nws_yarp/tests/CMakeLists.txt rename to src/devices/networkWrappers/mobileBaseVelocityControl_nws_yarp/tests/CMakeLists.txt diff --git a/src/devices/mobileBaseVelocityControl_nws_yarp/tests/mobileBaseVelocityControl_nws_yarp_test.cpp b/src/devices/networkWrappers/mobileBaseVelocityControl_nws_yarp/tests/mobileBaseVelocityControl_nws_yarp_test.cpp similarity index 100% rename from src/devices/mobileBaseVelocityControl_nws_yarp/tests/mobileBaseVelocityControl_nws_yarp_test.cpp rename to src/devices/networkWrappers/mobileBaseVelocityControl_nws_yarp/tests/mobileBaseVelocityControl_nws_yarp_test.cpp diff --git a/src/devices/multipleanalogsensorsclient/CMakeLists.txt b/src/devices/networkWrappers/multipleanalogsensorsclient/CMakeLists.txt similarity index 100% rename from src/devices/multipleanalogsensorsclient/CMakeLists.txt rename to src/devices/networkWrappers/multipleanalogsensorsclient/CMakeLists.txt diff --git a/src/devices/multipleanalogsensorsclient/MultipleAnalogSensorsClient.cpp b/src/devices/networkWrappers/multipleanalogsensorsclient/MultipleAnalogSensorsClient.cpp similarity index 100% rename from src/devices/multipleanalogsensorsclient/MultipleAnalogSensorsClient.cpp rename to src/devices/networkWrappers/multipleanalogsensorsclient/MultipleAnalogSensorsClient.cpp diff --git a/src/devices/multipleanalogsensorsclient/MultipleAnalogSensorsClient.h b/src/devices/networkWrappers/multipleanalogsensorsclient/MultipleAnalogSensorsClient.h similarity index 100% rename from src/devices/multipleanalogsensorsclient/MultipleAnalogSensorsClient.h rename to src/devices/networkWrappers/multipleanalogsensorsclient/MultipleAnalogSensorsClient.h diff --git a/src/devices/multipleanalogsensorsclient/tests/CMakeLists.txt b/src/devices/networkWrappers/multipleanalogsensorsclient/tests/CMakeLists.txt similarity index 100% rename from src/devices/multipleanalogsensorsclient/tests/CMakeLists.txt rename to src/devices/networkWrappers/multipleanalogsensorsclient/tests/CMakeLists.txt diff --git a/src/devices/multipleanalogsensorsclient/tests/multipleAnalogSensorsClient_test.cpp b/src/devices/networkWrappers/multipleanalogsensorsclient/tests/multipleAnalogSensorsClient_test.cpp similarity index 100% rename from src/devices/multipleanalogsensorsclient/tests/multipleAnalogSensorsClient_test.cpp rename to src/devices/networkWrappers/multipleanalogsensorsclient/tests/multipleAnalogSensorsClient_test.cpp diff --git a/src/devices/multipleanalogsensorsserver/CMakeLists.txt b/src/devices/networkWrappers/multipleanalogsensorsserver/CMakeLists.txt similarity index 100% rename from src/devices/multipleanalogsensorsserver/CMakeLists.txt rename to src/devices/networkWrappers/multipleanalogsensorsserver/CMakeLists.txt diff --git a/src/devices/multipleanalogsensorsserver/MultipleAnalogSensorsServer.cpp b/src/devices/networkWrappers/multipleanalogsensorsserver/MultipleAnalogSensorsServer.cpp similarity index 100% rename from src/devices/multipleanalogsensorsserver/MultipleAnalogSensorsServer.cpp rename to src/devices/networkWrappers/multipleanalogsensorsserver/MultipleAnalogSensorsServer.cpp diff --git a/src/devices/multipleanalogsensorsserver/MultipleAnalogSensorsServer.h b/src/devices/networkWrappers/multipleanalogsensorsserver/MultipleAnalogSensorsServer.h similarity index 100% rename from src/devices/multipleanalogsensorsserver/MultipleAnalogSensorsServer.h rename to src/devices/networkWrappers/multipleanalogsensorsserver/MultipleAnalogSensorsServer.h diff --git a/src/devices/multipleanalogsensorsserver/tests/CMakeLists.txt b/src/devices/networkWrappers/multipleanalogsensorsserver/tests/CMakeLists.txt similarity index 100% rename from src/devices/multipleanalogsensorsserver/tests/CMakeLists.txt rename to src/devices/networkWrappers/multipleanalogsensorsserver/tests/CMakeLists.txt diff --git a/src/devices/multipleanalogsensorsserver/tests/multipleAnalogSensorsServer_test.cpp b/src/devices/networkWrappers/multipleanalogsensorsserver/tests/multipleAnalogSensorsServer_test.cpp similarity index 100% rename from src/devices/multipleanalogsensorsserver/tests/multipleAnalogSensorsServer_test.cpp rename to src/devices/networkWrappers/multipleanalogsensorsserver/tests/multipleAnalogSensorsServer_test.cpp diff --git a/src/devices/navigation2D_nwc_yarp/CMakeLists.txt b/src/devices/networkWrappers/navigation2D_nwc_yarp/CMakeLists.txt similarity index 100% rename from src/devices/navigation2D_nwc_yarp/CMakeLists.txt rename to src/devices/networkWrappers/navigation2D_nwc_yarp/CMakeLists.txt diff --git a/src/devices/navigation2D_nwc_yarp/Navigation2D_nwc_yarp.cpp b/src/devices/networkWrappers/navigation2D_nwc_yarp/Navigation2D_nwc_yarp.cpp similarity index 100% rename from src/devices/navigation2D_nwc_yarp/Navigation2D_nwc_yarp.cpp rename to src/devices/networkWrappers/navigation2D_nwc_yarp/Navigation2D_nwc_yarp.cpp diff --git a/src/devices/navigation2D_nwc_yarp/Navigation2D_nwc_yarp.h b/src/devices/networkWrappers/navigation2D_nwc_yarp/Navigation2D_nwc_yarp.h similarity index 100% rename from src/devices/navigation2D_nwc_yarp/Navigation2D_nwc_yarp.h rename to src/devices/networkWrappers/navigation2D_nwc_yarp/Navigation2D_nwc_yarp.h diff --git a/src/devices/navigation2D_nwc_yarp/Navigation2D_nwc_yarp_iLocalization2D.cpp b/src/devices/networkWrappers/navigation2D_nwc_yarp/Navigation2D_nwc_yarp_iLocalization2D.cpp similarity index 100% rename from src/devices/navigation2D_nwc_yarp/Navigation2D_nwc_yarp_iLocalization2D.cpp rename to src/devices/networkWrappers/navigation2D_nwc_yarp/Navigation2D_nwc_yarp_iLocalization2D.cpp diff --git a/src/devices/navigation2D_nwc_yarp/Navigation2D_nwc_yarp_iMap2D.cpp b/src/devices/networkWrappers/navigation2D_nwc_yarp/Navigation2D_nwc_yarp_iMap2D.cpp similarity index 100% rename from src/devices/navigation2D_nwc_yarp/Navigation2D_nwc_yarp_iMap2D.cpp rename to src/devices/networkWrappers/navigation2D_nwc_yarp/Navigation2D_nwc_yarp_iMap2D.cpp diff --git a/src/devices/navigation2D_nwc_yarp/Navigation2D_nwc_yarp_iNav2DCtrl.cpp b/src/devices/networkWrappers/navigation2D_nwc_yarp/Navigation2D_nwc_yarp_iNav2DCtrl.cpp similarity index 100% rename from src/devices/navigation2D_nwc_yarp/Navigation2D_nwc_yarp_iNav2DCtrl.cpp rename to src/devices/networkWrappers/navigation2D_nwc_yarp/Navigation2D_nwc_yarp_iNav2DCtrl.cpp diff --git a/src/devices/navigation2D_nwc_yarp/Navigation2D_nwc_yarp_iNav2DTarget.cpp b/src/devices/networkWrappers/navigation2D_nwc_yarp/Navigation2D_nwc_yarp_iNav2DTarget.cpp similarity index 100% rename from src/devices/navigation2D_nwc_yarp/Navigation2D_nwc_yarp_iNav2DTarget.cpp rename to src/devices/networkWrappers/navigation2D_nwc_yarp/Navigation2D_nwc_yarp_iNav2DTarget.cpp diff --git a/src/devices/navigation2D_nwc_yarp/Navigation2D_nwc_yarp_iVelActs.cpp b/src/devices/networkWrappers/navigation2D_nwc_yarp/Navigation2D_nwc_yarp_iVelActs.cpp similarity index 100% rename from src/devices/navigation2D_nwc_yarp/Navigation2D_nwc_yarp_iVelActs.cpp rename to src/devices/networkWrappers/navigation2D_nwc_yarp/Navigation2D_nwc_yarp_iVelActs.cpp diff --git a/src/devices/navigation2D_nwc_yarp/tests/CMakeLists.txt b/src/devices/networkWrappers/navigation2D_nwc_yarp/tests/CMakeLists.txt similarity index 100% rename from src/devices/navigation2D_nwc_yarp/tests/CMakeLists.txt rename to src/devices/networkWrappers/navigation2D_nwc_yarp/tests/CMakeLists.txt diff --git a/src/devices/navigation2D_nwc_yarp/tests/navigation2D_nwc_test.cpp b/src/devices/networkWrappers/navigation2D_nwc_yarp/tests/navigation2D_nwc_test.cpp similarity index 100% rename from src/devices/navigation2D_nwc_yarp/tests/navigation2D_nwc_test.cpp rename to src/devices/networkWrappers/navigation2D_nwc_yarp/tests/navigation2D_nwc_test.cpp diff --git a/src/devices/navigation2D_nws_yarp/CMakeLists.txt b/src/devices/networkWrappers/navigation2D_nws_yarp/CMakeLists.txt similarity index 100% rename from src/devices/navigation2D_nws_yarp/CMakeLists.txt rename to src/devices/networkWrappers/navigation2D_nws_yarp/CMakeLists.txt diff --git a/src/devices/navigation2D_nws_yarp/INavigation2DServerImpl.cpp b/src/devices/networkWrappers/navigation2D_nws_yarp/INavigation2DServerImpl.cpp similarity index 100% rename from src/devices/navigation2D_nws_yarp/INavigation2DServerImpl.cpp rename to src/devices/networkWrappers/navigation2D_nws_yarp/INavigation2DServerImpl.cpp diff --git a/src/devices/navigation2D_nws_yarp/INavigation2DServerImpl.h b/src/devices/networkWrappers/navigation2D_nws_yarp/INavigation2DServerImpl.h similarity index 100% rename from src/devices/navigation2D_nws_yarp/INavigation2DServerImpl.h rename to src/devices/networkWrappers/navigation2D_nws_yarp/INavigation2DServerImpl.h diff --git a/src/devices/navigation2D_nws_yarp/navigation2D_nws_yarp.cpp b/src/devices/networkWrappers/navigation2D_nws_yarp/navigation2D_nws_yarp.cpp similarity index 100% rename from src/devices/navigation2D_nws_yarp/navigation2D_nws_yarp.cpp rename to src/devices/networkWrappers/navigation2D_nws_yarp/navigation2D_nws_yarp.cpp diff --git a/src/devices/navigation2D_nws_yarp/navigation2D_nws_yarp.h b/src/devices/networkWrappers/navigation2D_nws_yarp/navigation2D_nws_yarp.h similarity index 100% rename from src/devices/navigation2D_nws_yarp/navigation2D_nws_yarp.h rename to src/devices/networkWrappers/navigation2D_nws_yarp/navigation2D_nws_yarp.h diff --git a/src/devices/navigation2D_nws_yarp/tests/CMakeLists.txt b/src/devices/networkWrappers/navigation2D_nws_yarp/tests/CMakeLists.txt similarity index 100% rename from src/devices/navigation2D_nws_yarp/tests/CMakeLists.txt rename to src/devices/networkWrappers/navigation2D_nws_yarp/tests/CMakeLists.txt diff --git a/src/devices/navigation2D_nws_yarp/tests/navigation2D_nws_test.cpp b/src/devices/networkWrappers/navigation2D_nws_yarp/tests/navigation2D_nws_test.cpp similarity index 100% rename from src/devices/navigation2D_nws_yarp/tests/navigation2D_nws_test.cpp rename to src/devices/networkWrappers/navigation2D_nws_yarp/tests/navigation2D_nws_test.cpp diff --git a/src/devices/odometry2D_nws_yarp/CMakeLists.txt b/src/devices/networkWrappers/odometry2D_nws_yarp/CMakeLists.txt similarity index 100% rename from src/devices/odometry2D_nws_yarp/CMakeLists.txt rename to src/devices/networkWrappers/odometry2D_nws_yarp/CMakeLists.txt diff --git a/src/devices/odometry2D_nws_yarp/Odometry2DServerImpl.cpp b/src/devices/networkWrappers/odometry2D_nws_yarp/Odometry2DServerImpl.cpp similarity index 100% rename from src/devices/odometry2D_nws_yarp/Odometry2DServerImpl.cpp rename to src/devices/networkWrappers/odometry2D_nws_yarp/Odometry2DServerImpl.cpp diff --git a/src/devices/odometry2D_nws_yarp/Odometry2DServerImpl.h b/src/devices/networkWrappers/odometry2D_nws_yarp/Odometry2DServerImpl.h similarity index 100% rename from src/devices/odometry2D_nws_yarp/Odometry2DServerImpl.h rename to src/devices/networkWrappers/odometry2D_nws_yarp/Odometry2DServerImpl.h diff --git a/src/devices/odometry2D_nws_yarp/Odometry2D_nws_yarp.cpp b/src/devices/networkWrappers/odometry2D_nws_yarp/Odometry2D_nws_yarp.cpp similarity index 100% rename from src/devices/odometry2D_nws_yarp/Odometry2D_nws_yarp.cpp rename to src/devices/networkWrappers/odometry2D_nws_yarp/Odometry2D_nws_yarp.cpp diff --git a/src/devices/odometry2D_nws_yarp/Odometry2D_nws_yarp.h b/src/devices/networkWrappers/odometry2D_nws_yarp/Odometry2D_nws_yarp.h similarity index 100% rename from src/devices/odometry2D_nws_yarp/Odometry2D_nws_yarp.h rename to src/devices/networkWrappers/odometry2D_nws_yarp/Odometry2D_nws_yarp.h diff --git a/src/devices/odometry2D_nws_yarp/tests/CMakeLists.txt b/src/devices/networkWrappers/odometry2D_nws_yarp/tests/CMakeLists.txt similarity index 100% rename from src/devices/odometry2D_nws_yarp/tests/CMakeLists.txt rename to src/devices/networkWrappers/odometry2D_nws_yarp/tests/CMakeLists.txt diff --git a/src/devices/odometry2D_nws_yarp/tests/odometry2D_nws_yarp_test.cpp b/src/devices/networkWrappers/odometry2D_nws_yarp/tests/odometry2D_nws_yarp_test.cpp similarity index 100% rename from src/devices/odometry2D_nws_yarp/tests/odometry2D_nws_yarp_test.cpp rename to src/devices/networkWrappers/odometry2D_nws_yarp/tests/odometry2D_nws_yarp_test.cpp diff --git a/src/devices/serialPort_nwc_yarp/CMakeLists.txt b/src/devices/networkWrappers/serialPort_nwc_yarp/CMakeLists.txt similarity index 100% rename from src/devices/serialPort_nwc_yarp/CMakeLists.txt rename to src/devices/networkWrappers/serialPort_nwc_yarp/CMakeLists.txt diff --git a/src/devices/serialPort_nwc_yarp/serialPort_nwc_yarp.cpp b/src/devices/networkWrappers/serialPort_nwc_yarp/serialPort_nwc_yarp.cpp similarity index 100% rename from src/devices/serialPort_nwc_yarp/serialPort_nwc_yarp.cpp rename to src/devices/networkWrappers/serialPort_nwc_yarp/serialPort_nwc_yarp.cpp diff --git a/src/devices/serialPort_nwc_yarp/serialPort_nwc_yarp.h b/src/devices/networkWrappers/serialPort_nwc_yarp/serialPort_nwc_yarp.h similarity index 100% rename from src/devices/serialPort_nwc_yarp/serialPort_nwc_yarp.h rename to src/devices/networkWrappers/serialPort_nwc_yarp/serialPort_nwc_yarp.h diff --git a/src/devices/serialPort_nwc_yarp/tests/CMakeLists.txt b/src/devices/networkWrappers/serialPort_nwc_yarp/tests/CMakeLists.txt similarity index 100% rename from src/devices/serialPort_nwc_yarp/tests/CMakeLists.txt rename to src/devices/networkWrappers/serialPort_nwc_yarp/tests/CMakeLists.txt diff --git a/src/devices/serialPort_nwc_yarp/tests/serialPort_nwc_yarp_test.cpp b/src/devices/networkWrappers/serialPort_nwc_yarp/tests/serialPort_nwc_yarp_test.cpp similarity index 100% rename from src/devices/serialPort_nwc_yarp/tests/serialPort_nwc_yarp_test.cpp rename to src/devices/networkWrappers/serialPort_nwc_yarp/tests/serialPort_nwc_yarp_test.cpp diff --git a/src/devices/serialPort_nws_yarp/CMakeLists.txt b/src/devices/networkWrappers/serialPort_nws_yarp/CMakeLists.txt similarity index 100% rename from src/devices/serialPort_nws_yarp/CMakeLists.txt rename to src/devices/networkWrappers/serialPort_nws_yarp/CMakeLists.txt diff --git a/src/devices/serialPort_nws_yarp/serialPort_nws_yarp.cpp b/src/devices/networkWrappers/serialPort_nws_yarp/serialPort_nws_yarp.cpp similarity index 100% rename from src/devices/serialPort_nws_yarp/serialPort_nws_yarp.cpp rename to src/devices/networkWrappers/serialPort_nws_yarp/serialPort_nws_yarp.cpp diff --git a/src/devices/serialPort_nws_yarp/serialPort_nws_yarp.h b/src/devices/networkWrappers/serialPort_nws_yarp/serialPort_nws_yarp.h similarity index 100% rename from src/devices/serialPort_nws_yarp/serialPort_nws_yarp.h rename to src/devices/networkWrappers/serialPort_nws_yarp/serialPort_nws_yarp.h diff --git a/src/devices/serialPort_nws_yarp/tests/CMakeLists.txt b/src/devices/networkWrappers/serialPort_nws_yarp/tests/CMakeLists.txt similarity index 100% rename from src/devices/serialPort_nws_yarp/tests/CMakeLists.txt rename to src/devices/networkWrappers/serialPort_nws_yarp/tests/CMakeLists.txt diff --git a/src/devices/serialPort_nws_yarp/tests/serialPort_nws_yarp_test.cpp b/src/devices/networkWrappers/serialPort_nws_yarp/tests/serialPort_nws_yarp_test.cpp similarity index 100% rename from src/devices/serialPort_nws_yarp/tests/serialPort_nws_yarp_test.cpp rename to src/devices/networkWrappers/serialPort_nws_yarp/tests/serialPort_nws_yarp_test.cpp diff --git a/src/devices/speechSynthesizer_nwc_yarp/CMakeLists.txt b/src/devices/networkWrappers/speechSynthesizer_nwc_yarp/CMakeLists.txt similarity index 100% rename from src/devices/speechSynthesizer_nwc_yarp/CMakeLists.txt rename to src/devices/networkWrappers/speechSynthesizer_nwc_yarp/CMakeLists.txt diff --git a/src/devices/speechSynthesizer_nwc_yarp/SpeechSynthesizer_nwc_yarp.cpp b/src/devices/networkWrappers/speechSynthesizer_nwc_yarp/SpeechSynthesizer_nwc_yarp.cpp similarity index 100% rename from src/devices/speechSynthesizer_nwc_yarp/SpeechSynthesizer_nwc_yarp.cpp rename to src/devices/networkWrappers/speechSynthesizer_nwc_yarp/SpeechSynthesizer_nwc_yarp.cpp diff --git a/src/devices/speechSynthesizer_nwc_yarp/SpeechSynthesizer_nwc_yarp.h b/src/devices/networkWrappers/speechSynthesizer_nwc_yarp/SpeechSynthesizer_nwc_yarp.h similarity index 100% rename from src/devices/speechSynthesizer_nwc_yarp/SpeechSynthesizer_nwc_yarp.h rename to src/devices/networkWrappers/speechSynthesizer_nwc_yarp/SpeechSynthesizer_nwc_yarp.h diff --git a/src/devices/speechSynthesizer_nwc_yarp/tests/CMakeLists.txt b/src/devices/networkWrappers/speechSynthesizer_nwc_yarp/tests/CMakeLists.txt similarity index 100% rename from src/devices/speechSynthesizer_nwc_yarp/tests/CMakeLists.txt rename to src/devices/networkWrappers/speechSynthesizer_nwc_yarp/tests/CMakeLists.txt diff --git a/src/devices/speechSynthesizer_nwc_yarp/tests/speechSynthesizer_nwc_yarp_test.cpp b/src/devices/networkWrappers/speechSynthesizer_nwc_yarp/tests/speechSynthesizer_nwc_yarp_test.cpp similarity index 100% rename from src/devices/speechSynthesizer_nwc_yarp/tests/speechSynthesizer_nwc_yarp_test.cpp rename to src/devices/networkWrappers/speechSynthesizer_nwc_yarp/tests/speechSynthesizer_nwc_yarp_test.cpp diff --git a/src/devices/speechSynthesizer_nws_yarp/CMakeLists.txt b/src/devices/networkWrappers/speechSynthesizer_nws_yarp/CMakeLists.txt similarity index 100% rename from src/devices/speechSynthesizer_nws_yarp/CMakeLists.txt rename to src/devices/networkWrappers/speechSynthesizer_nws_yarp/CMakeLists.txt diff --git a/src/devices/speechSynthesizer_nws_yarp/speechSynthesizer_nws_yarp.cpp b/src/devices/networkWrappers/speechSynthesizer_nws_yarp/speechSynthesizer_nws_yarp.cpp similarity index 100% rename from src/devices/speechSynthesizer_nws_yarp/speechSynthesizer_nws_yarp.cpp rename to src/devices/networkWrappers/speechSynthesizer_nws_yarp/speechSynthesizer_nws_yarp.cpp diff --git a/src/devices/speechSynthesizer_nws_yarp/speechSynthesizer_nws_yarp.h b/src/devices/networkWrappers/speechSynthesizer_nws_yarp/speechSynthesizer_nws_yarp.h similarity index 100% rename from src/devices/speechSynthesizer_nws_yarp/speechSynthesizer_nws_yarp.h rename to src/devices/networkWrappers/speechSynthesizer_nws_yarp/speechSynthesizer_nws_yarp.h diff --git a/src/devices/speechSynthesizer_nws_yarp/tests/CMakeLists.txt b/src/devices/networkWrappers/speechSynthesizer_nws_yarp/tests/CMakeLists.txt similarity index 100% rename from src/devices/speechSynthesizer_nws_yarp/tests/CMakeLists.txt rename to src/devices/networkWrappers/speechSynthesizer_nws_yarp/tests/CMakeLists.txt diff --git a/src/devices/speechSynthesizer_nws_yarp/tests/speechSynthesizer_nws_yarp_test.cpp b/src/devices/networkWrappers/speechSynthesizer_nws_yarp/tests/speechSynthesizer_nws_yarp_test.cpp similarity index 100% rename from src/devices/speechSynthesizer_nws_yarp/tests/speechSynthesizer_nws_yarp_test.cpp rename to src/devices/networkWrappers/speechSynthesizer_nws_yarp/tests/speechSynthesizer_nws_yarp_test.cpp diff --git a/src/devices/speechTranscription_nwc_yarp/CMakeLists.txt b/src/devices/networkWrappers/speechTranscription_nwc_yarp/CMakeLists.txt similarity index 100% rename from src/devices/speechTranscription_nwc_yarp/CMakeLists.txt rename to src/devices/networkWrappers/speechTranscription_nwc_yarp/CMakeLists.txt diff --git a/src/devices/speechTranscription_nwc_yarp/SpeechTranscription_nwc_yarp.cpp b/src/devices/networkWrappers/speechTranscription_nwc_yarp/SpeechTranscription_nwc_yarp.cpp similarity index 100% rename from src/devices/speechTranscription_nwc_yarp/SpeechTranscription_nwc_yarp.cpp rename to src/devices/networkWrappers/speechTranscription_nwc_yarp/SpeechTranscription_nwc_yarp.cpp diff --git a/src/devices/speechTranscription_nwc_yarp/SpeechTranscription_nwc_yarp.h b/src/devices/networkWrappers/speechTranscription_nwc_yarp/SpeechTranscription_nwc_yarp.h similarity index 100% rename from src/devices/speechTranscription_nwc_yarp/SpeechTranscription_nwc_yarp.h rename to src/devices/networkWrappers/speechTranscription_nwc_yarp/SpeechTranscription_nwc_yarp.h diff --git a/src/devices/speechTranscription_nwc_yarp/tests/CMakeLists.txt b/src/devices/networkWrappers/speechTranscription_nwc_yarp/tests/CMakeLists.txt similarity index 100% rename from src/devices/speechTranscription_nwc_yarp/tests/CMakeLists.txt rename to src/devices/networkWrappers/speechTranscription_nwc_yarp/tests/CMakeLists.txt diff --git a/src/devices/speechTranscription_nwc_yarp/tests/speechTranscription_nwc_yarp_test.cpp b/src/devices/networkWrappers/speechTranscription_nwc_yarp/tests/speechTranscription_nwc_yarp_test.cpp similarity index 100% rename from src/devices/speechTranscription_nwc_yarp/tests/speechTranscription_nwc_yarp_test.cpp rename to src/devices/networkWrappers/speechTranscription_nwc_yarp/tests/speechTranscription_nwc_yarp_test.cpp diff --git a/src/devices/speechTranscription_nws_yarp/CMakeLists.txt b/src/devices/networkWrappers/speechTranscription_nws_yarp/CMakeLists.txt similarity index 100% rename from src/devices/speechTranscription_nws_yarp/CMakeLists.txt rename to src/devices/networkWrappers/speechTranscription_nws_yarp/CMakeLists.txt diff --git a/src/devices/speechTranscription_nws_yarp/speechTranscription_nws_yarp.cpp b/src/devices/networkWrappers/speechTranscription_nws_yarp/speechTranscription_nws_yarp.cpp similarity index 100% rename from src/devices/speechTranscription_nws_yarp/speechTranscription_nws_yarp.cpp rename to src/devices/networkWrappers/speechTranscription_nws_yarp/speechTranscription_nws_yarp.cpp diff --git a/src/devices/speechTranscription_nws_yarp/speechTranscription_nws_yarp.h b/src/devices/networkWrappers/speechTranscription_nws_yarp/speechTranscription_nws_yarp.h similarity index 100% rename from src/devices/speechTranscription_nws_yarp/speechTranscription_nws_yarp.h rename to src/devices/networkWrappers/speechTranscription_nws_yarp/speechTranscription_nws_yarp.h diff --git a/src/devices/speechTranscription_nws_yarp/tests/CMakeLists.txt b/src/devices/networkWrappers/speechTranscription_nws_yarp/tests/CMakeLists.txt similarity index 100% rename from src/devices/speechTranscription_nws_yarp/tests/CMakeLists.txt rename to src/devices/networkWrappers/speechTranscription_nws_yarp/tests/CMakeLists.txt diff --git a/src/devices/speechTranscription_nws_yarp/tests/speechTranscription_nws_yarp_test.cpp b/src/devices/networkWrappers/speechTranscription_nws_yarp/tests/speechTranscription_nws_yarp_test.cpp similarity index 100% rename from src/devices/speechTranscription_nws_yarp/tests/speechTranscription_nws_yarp_test.cpp rename to src/devices/networkWrappers/speechTranscription_nws_yarp/tests/speechTranscription_nws_yarp_test.cpp diff --git a/tests/misc/check_license_skip.txt b/tests/misc/check_license_skip.txt index 91ade1c0e37..21c6defb981 100644 --- a/tests/misc/check_license_skip.txt +++ b/tests/misc/check_license_skip.txt @@ -1,5 +1,5 @@ bindings/lua/argcargv.i src/devices/opencv/OpenCVGrabber.cpp src/devices/opencv/OpenCVGrabber.h -src/devices/fakeLaserWithMotor/robotinterface_xml/ +src/devices/fake/fakeLaserWithMotor/robotinterface_xml/ src/libYARP_robotinterface/tests/RobotinterfaceFile.xml diff --git a/tests/misc/check_tests.py b/tests/misc/check_tests.py index c80a878232c..00880d372ab 100644 --- a/tests/misc/check_tests.py +++ b/tests/misc/check_tests.py @@ -4,28 +4,34 @@ import os import sys -verbose = 0 +verbose = 1 +verbose_devel = 0 def check_subfolders(root_dir): non_compliant_folders = [] skip_folders = [] with open('./tests/misc/check_tests_skip.txt', 'r') as f: skip_folders = [folder.strip() for folder in f.readlines()] - if (verbose): print(skip_folders) - for dirpath, dirnames, filenames in os.walk(root_dir): - if dirpath == root_dir: - for dirname in dirnames: - subfolder_path = os.path.join(dirpath, dirname, 'tests') - if (verbose): print (subfolder_path, skip_folders) - if os.path.join(dirpath, dirname) not in skip_folders: - if not os.path.exists(subfolder_path): - non_compliant_folders.append(os.path.join(dirpath, dirname)) - else: - if (verbose): print("Skipping folder:", os.path.join(dirpath, dirname)) + if (verbose_devel): print(skip_folders) + + for root_dir in root_dirs: + for dirpath, dirnames, filenames in os.walk(root_dir): + if dirpath == root_dir: + for dirname in dirnames: + subfolder_path = os.path.join(dirpath, dirname, 'tests') + if (verbose_devel): print (subfolder_path, skip_folders) + if os.path.join(dirpath, dirname) not in skip_folders: + if not os.path.exists(subfolder_path): + if (verbose): print("Tests NOT found in folder:", os.path.join(dirpath, dirname)) + non_compliant_folders.append(os.path.join(dirpath, dirname)) + else: + if (verbose): print("Tests found in folder:", os.path.join(dirpath, dirname)) + else: + if (verbose): print("Skipping folder:", os.path.join(dirpath, dirname)) return non_compliant_folders -root_dir = './src/devices' +root_dirs = ['./src/devices', './src/devices/networkWrappers', './src/devices/fake'] -non_compliant_folders = check_subfolders(root_dir) +non_compliant_folders = check_subfolders(root_dirs) if non_compliant_folders: print("The following subfolders (",len(non_compliant_folders),") do not contain a 'tests' subfolder:") diff --git a/tests/misc/check_tests_skip.txt b/tests/misc/check_tests_skip.txt index c1ed7eb1614..a74c6b47cde 100644 --- a/tests/misc/check_tests_skip.txt +++ b/tests/misc/check_tests_skip.txt @@ -1,14 +1,10 @@ -./src/devices/mobileBaseVelocityControlMsgs -./src/devices/IMap2DMsgs -./src/devices/multipleAnalogSensorsMsgs -./src/devices/IOdometry2DMsgs -./src/devices/ILocalization2DMsgs -./src/devices/frameTransformStorageMsgs -./src/devices/IAudioGrabberMsgs -./src/devices/INavigation2DMsgs -./src/devices/ISerialMsgs -./src/devices/ISpeechSynthesizerMsgs -./src/devices/ISpeechTranscriptionMsgs +./src/devices/fake +./src/devices/messages +./src/devices/networkWrappers +./src/devices/fake/fakebot +./src/devices/networkWrappers/VirtualAnalogWrapper +./src/devices/networkWrappers/AnalogSensorClient +./src/devices/networkWrappers/AnalogWrapper ./src/devices/test_segfault ./src/devices/test_nop ./src/devices/DynamixelAX12Ftdi @@ -24,12 +20,6 @@ ./src/devices/framegrabber_protocol ./src/devices/opencv ./src/devices/ffmpeg -./src/devices/fakebot ./src/devices/serialport ./src/devices/JoypadControlNetUtils ./src/devices/SerialServoBoard -./src/devices/VirtualAnalogWrapper -./src/devices/AnalogSensorClient -./src/devices/AnalogWrapper -./src/devices/ILLMMsgs -./src/devices/IChatBotMsgs