diff --git a/lib/bosch/BHy1_driver_and_MCU_solution/README.md b/lib/vendor/Bosch/BHy1/README.md
similarity index 100%
rename from lib/bosch/BHy1_driver_and_MCU_solution/README.md
rename to lib/vendor/Bosch/BHy1/README.md
diff --git a/lib/bosch/BHy1_driver_and_MCU_solution/doc/BHy MCU driver porting guide_v1.8.pdf b/lib/vendor/Bosch/BHy1/doc/BHy MCU driver porting guide_v1.8.pdf
similarity index 100%
rename from lib/bosch/BHy1_driver_and_MCU_solution/doc/BHy MCU driver porting guide_v1.8.pdf
rename to lib/vendor/Bosch/BHy1/doc/BHy MCU driver porting guide_v1.8.pdf
diff --git a/lib/bosch/BHy1_driver_and_MCU_solution/driver/inc/bhy.h b/lib/vendor/Bosch/BHy1/driver/inc/bhy.h
similarity index 100%
rename from lib/bosch/BHy1_driver_and_MCU_solution/driver/inc/bhy.h
rename to lib/vendor/Bosch/BHy1/driver/inc/bhy.h
diff --git a/lib/bosch/BHy1_driver_and_MCU_solution/driver/inc/bhy_support.h b/lib/vendor/Bosch/BHy1/driver/inc/bhy_support.h
similarity index 100%
rename from lib/bosch/BHy1_driver_and_MCU_solution/driver/inc/bhy_support.h
rename to lib/vendor/Bosch/BHy1/driver/inc/bhy_support.h
diff --git a/lib/bosch/BHy1_driver_and_MCU_solution/driver/inc/bhy_uc_driver.h b/lib/vendor/Bosch/BHy1/driver/inc/bhy_uc_driver.h
similarity index 100%
rename from lib/bosch/BHy1_driver_and_MCU_solution/driver/inc/bhy_uc_driver.h
rename to lib/vendor/Bosch/BHy1/driver/inc/bhy_uc_driver.h
diff --git a/lib/bosch/BHy1_driver_and_MCU_solution/driver/inc/bhy_uc_driver_config.h b/lib/vendor/Bosch/BHy1/driver/inc/bhy_uc_driver_config.h
similarity index 100%
rename from lib/bosch/BHy1_driver_and_MCU_solution/driver/inc/bhy_uc_driver_config.h
rename to lib/vendor/Bosch/BHy1/driver/inc/bhy_uc_driver_config.h
diff --git a/lib/bosch/BHy1_driver_and_MCU_solution/driver/inc/bhy_uc_driver_constants.h b/lib/vendor/Bosch/BHy1/driver/inc/bhy_uc_driver_constants.h
similarity index 100%
rename from lib/bosch/BHy1_driver_and_MCU_solution/driver/inc/bhy_uc_driver_constants.h
rename to lib/vendor/Bosch/BHy1/driver/inc/bhy_uc_driver_constants.h
diff --git a/lib/bosch/BHy1_driver_and_MCU_solution/driver/inc/bhy_uc_driver_types.h b/lib/vendor/Bosch/BHy1/driver/inc/bhy_uc_driver_types.h
similarity index 100%
rename from lib/bosch/BHy1_driver_and_MCU_solution/driver/inc/bhy_uc_driver_types.h
rename to lib/vendor/Bosch/BHy1/driver/inc/bhy_uc_driver_types.h
diff --git a/lib/bosch/BHy1_driver_and_MCU_solution/driver/src/bhy.c b/lib/vendor/Bosch/BHy1/driver/src/bhy.c
similarity index 100%
rename from lib/bosch/BHy1_driver_and_MCU_solution/driver/src/bhy.c
rename to lib/vendor/Bosch/BHy1/driver/src/bhy.c
diff --git a/lib/bosch/BHy1_driver_and_MCU_solution/driver/src/bhy_support.c b/lib/vendor/Bosch/BHy1/driver/src/bhy_support.c
similarity index 100%
rename from lib/bosch/BHy1_driver_and_MCU_solution/driver/src/bhy_support.c
rename to lib/vendor/Bosch/BHy1/driver/src/bhy_support.c
diff --git a/lib/bosch/BHy1_driver_and_MCU_solution/driver/src/bhy_uc_driver.c b/lib/vendor/Bosch/BHy1/driver/src/bhy_uc_driver.c
similarity index 100%
rename from lib/bosch/BHy1_driver_and_MCU_solution/driver/src/bhy_uc_driver.c
rename to lib/vendor/Bosch/BHy1/driver/src/bhy_uc_driver.c
diff --git a/lib/bosch/BHy1_driver_and_MCU_solution/examples/accelerometer_remapping_example.c b/lib/vendor/Bosch/BHy1/examples/accelerometer_remapping_example.c
similarity index 100%
rename from lib/bosch/BHy1_driver_and_MCU_solution/examples/accelerometer_remapping_example.c
rename to lib/vendor/Bosch/BHy1/examples/accelerometer_remapping_example.c
diff --git a/lib/bosch/BHy1_driver_and_MCU_solution/examples/activity_recognition_example.c b/lib/vendor/Bosch/BHy1/examples/activity_recognition_example.c
similarity index 100%
rename from lib/bosch/BHy1_driver_and_MCU_solution/examples/activity_recognition_example.c
rename to lib/vendor/Bosch/BHy1/examples/activity_recognition_example.c
diff --git a/lib/bosch/BHy1_driver_and_MCU_solution/examples/bmp280_example.c b/lib/vendor/Bosch/BHy1/examples/bmp280_example.c
similarity index 100%
rename from lib/bosch/BHy1_driver_and_MCU_solution/examples/bmp280_example.c
rename to lib/vendor/Bosch/BHy1/examples/bmp280_example.c
diff --git a/lib/bosch/BHy1_driver_and_MCU_solution/examples/calib_profile_example.c b/lib/vendor/Bosch/BHy1/examples/calib_profile_example.c
similarity index 100%
rename from lib/bosch/BHy1_driver_and_MCU_solution/examples/calib_profile_example.c
rename to lib/vendor/Bosch/BHy1/examples/calib_profile_example.c
diff --git a/lib/bosch/BHy1_driver_and_MCU_solution/examples/custom_sensor_example.c b/lib/vendor/Bosch/BHy1/examples/custom_sensor_example.c
similarity index 100%
rename from lib/bosch/BHy1_driver_and_MCU_solution/examples/custom_sensor_example.c
rename to lib/vendor/Bosch/BHy1/examples/custom_sensor_example.c
diff --git a/lib/bosch/BHy1_driver_and_MCU_solution/examples/fifo_watermark_example.c b/lib/vendor/Bosch/BHy1/examples/fifo_watermark_example.c
similarity index 100%
rename from lib/bosch/BHy1_driver_and_MCU_solution/examples/fifo_watermark_example.c
rename to lib/vendor/Bosch/BHy1/examples/fifo_watermark_example.c
diff --git a/lib/bosch/BHy1_driver_and_MCU_solution/examples/firmware/Bosch_PCB_7183_di01_BMI160-7183_di01.2.1.10836_170103.h b/lib/vendor/Bosch/BHy1/examples/firmware/Bosch_PCB_7183_di01_BMI160-7183_di01.2.1.10836_170103.h
similarity index 100%
rename from lib/bosch/BHy1_driver_and_MCU_solution/examples/firmware/Bosch_PCB_7183_di01_BMI160-7183_di01.2.1.10836_170103.h
rename to lib/vendor/Bosch/BHy1/examples/firmware/Bosch_PCB_7183_di01_BMI160-7183_di01.2.1.10836_170103.h
diff --git a/lib/bosch/BHy1_driver_and_MCU_solution/examples/firmware/Bosch_PCB_7183_di01_BMI160_BMP280-7183_di01.2.1.10836.h b/lib/vendor/Bosch/BHy1/examples/firmware/Bosch_PCB_7183_di01_BMI160_BMP280-7183_di01.2.1.10836.h
similarity index 100%
rename from lib/bosch/BHy1_driver_and_MCU_solution/examples/firmware/Bosch_PCB_7183_di01_BMI160_BMP280-7183_di01.2.1.10836.h
rename to lib/vendor/Bosch/BHy1/examples/firmware/Bosch_PCB_7183_di01_BMI160_BMP280-7183_di01.2.1.10836.h
diff --git a/lib/bosch/BHy1_driver_and_MCU_solution/examples/firmware/Bosch_PCB_7183_di03_BMA2x2_Cus-7183_di03.2.1.11703.h b/lib/vendor/Bosch/BHy1/examples/firmware/Bosch_PCB_7183_di03_BMA2x2_Cus-7183_di03.2.1.11703.h
similarity index 100%
rename from lib/bosch/BHy1_driver_and_MCU_solution/examples/firmware/Bosch_PCB_7183_di03_BMA2x2_Cus-7183_di03.2.1.11703.h
rename to lib/vendor/Bosch/BHy1/examples/firmware/Bosch_PCB_7183_di03_BMA2x2_Cus-7183_di03.2.1.11703.h
diff --git a/lib/bosch/BHy1_driver_and_MCU_solution/examples/firmware/Bosch_PCB_7183_di03_BMI160-7183_di03.2.1.11696_170103.h b/lib/vendor/Bosch/BHy1/examples/firmware/Bosch_PCB_7183_di03_BMI160-7183_di03.2.1.11696_170103.h
similarity index 100%
rename from lib/bosch/BHy1_driver_and_MCU_solution/examples/firmware/Bosch_PCB_7183_di03_BMI160-7183_di03.2.1.11696_170103.h
rename to lib/vendor/Bosch/BHy1/examples/firmware/Bosch_PCB_7183_di03_BMI160-7183_di03.2.1.11696_170103.h
diff --git a/lib/bosch/BHy1_driver_and_MCU_solution/examples/firmware/Bosch_PCB_7183_di03_BMI160_BMM150-7183_di03.2.1.11696_170103.h b/lib/vendor/Bosch/BHy1/examples/firmware/Bosch_PCB_7183_di03_BMI160_BMM150-7183_di03.2.1.11696_170103.h
similarity index 100%
rename from lib/bosch/BHy1_driver_and_MCU_solution/examples/firmware/Bosch_PCB_7183_di03_BMI160_BMM150-7183_di03.2.1.11696_170103.h
rename to lib/vendor/Bosch/BHy1/examples/firmware/Bosch_PCB_7183_di03_BMI160_BMM150-7183_di03.2.1.11696_170103.h
diff --git a/lib/bosch/BHy1_driver_and_MCU_solution/examples/gesture_recognition_example.c b/lib/vendor/Bosch/BHy1/examples/gesture_recognition_example.c
similarity index 100%
rename from lib/bosch/BHy1_driver_and_MCU_solution/examples/gesture_recognition_example.c
rename to lib/vendor/Bosch/BHy1/examples/gesture_recognition_example.c
diff --git a/lib/bosch/BHy1_driver_and_MCU_solution/examples/rotation_vector_example.c b/lib/vendor/Bosch/BHy1/examples/rotation_vector_example.c
similarity index 100%
rename from lib/bosch/BHy1_driver_and_MCU_solution/examples/rotation_vector_example.c
rename to lib/vendor/Bosch/BHy1/examples/rotation_vector_example.c
diff --git a/lib/bosch/BHy1_driver_and_MCU_solution/examples/selftest_example.c b/lib/vendor/Bosch/BHy1/examples/selftest_example.c
similarity index 100%
rename from lib/bosch/BHy1_driver_and_MCU_solution/examples/selftest_example.c
rename to lib/vendor/Bosch/BHy1/examples/selftest_example.c
diff --git a/lib/bosch/BMA400-API/README.md b/lib/vendor/Bosch/BMA400/README.md
similarity index 100%
rename from lib/bosch/BMA400-API/README.md
rename to lib/vendor/Bosch/BMA400/README.md
diff --git a/lib/bosch/BMA400-API/bma400.c b/lib/vendor/Bosch/BMA400/bma400.c
similarity index 100%
rename from lib/bosch/BMA400-API/bma400.c
rename to lib/vendor/Bosch/BMA400/bma400.c
diff --git a/lib/bosch/BMA400-API/bma400.h b/lib/vendor/Bosch/BMA400/bma400.h
similarity index 100%
rename from lib/bosch/BMA400-API/bma400.h
rename to lib/vendor/Bosch/BMA400/bma400.h
diff --git a/lib/bosch/BMA400-API/bma400_defs.h b/lib/vendor/Bosch/BMA400/bma400_defs.h
similarity index 100%
rename from lib/bosch/BMA400-API/bma400_defs.h
rename to lib/vendor/Bosch/BMA400/bma400_defs.h
diff --git a/lib/bosch/BMA400-API/examples/accelerometer.c b/lib/vendor/Bosch/BMA400/examples/accelerometer.c
similarity index 100%
rename from lib/bosch/BMA400-API/examples/accelerometer.c
rename to lib/vendor/Bosch/BMA400/examples/accelerometer.c
diff --git a/lib/bosch/BMA400-API/examples/basic.c b/lib/vendor/Bosch/BMA400/examples/basic.c
similarity index 100%
rename from lib/bosch/BMA400-API/examples/basic.c
rename to lib/vendor/Bosch/BMA400/examples/basic.c
diff --git a/lib/bosch/BMA400-API/examples/fifo.c b/lib/vendor/Bosch/BMA400/examples/fifo.c
similarity index 100%
rename from lib/bosch/BMA400-API/examples/fifo.c
rename to lib/vendor/Bosch/BMA400/examples/fifo.c
diff --git a/lib/bosch/BMA400-API/examples/self_test.c b/lib/vendor/Bosch/BMA400/examples/self_test.c
similarity index 100%
rename from lib/bosch/BMA400-API/examples/self_test.c
rename to lib/vendor/Bosch/BMA400/examples/self_test.c
diff --git a/lib/bosch/BMA400-API/examples/step_counter.c b/lib/vendor/Bosch/BMA400/examples/step_counter.c
similarity index 100%
rename from lib/bosch/BMA400-API/examples/step_counter.c
rename to lib/vendor/Bosch/BMA400/examples/step_counter.c
diff --git a/lib/bosch/BMA400-API/examples/tap_detection.c b/lib/vendor/Bosch/BMA400/examples/tap_detection.c
similarity index 100%
rename from lib/bosch/BMA400-API/examples/tap_detection.c
rename to lib/vendor/Bosch/BMA400/examples/tap_detection.c
diff --git a/lib/bosch/BME680_driver/LICENSE b/lib/vendor/Bosch/BME680/LICENSE
similarity index 100%
rename from lib/bosch/BME680_driver/LICENSE
rename to lib/vendor/Bosch/BME680/LICENSE
diff --git a/lib/bosch/BME680_driver/README.md b/lib/vendor/Bosch/BME680/README.md
similarity index 100%
rename from lib/bosch/BME680_driver/README.md
rename to lib/vendor/Bosch/BME680/README.md
diff --git a/lib/bosch/BME680_driver/Self test/bme680_selftest.c b/lib/vendor/Bosch/BME680/Self test/bme680_selftest.c
similarity index 100%
rename from lib/bosch/BME680_driver/Self test/bme680_selftest.c
rename to lib/vendor/Bosch/BME680/Self test/bme680_selftest.c
diff --git a/lib/bosch/BME680_driver/Self test/bme680_selftest.h b/lib/vendor/Bosch/BME680/Self test/bme680_selftest.h
similarity index 100%
rename from lib/bosch/BME680_driver/Self test/bme680_selftest.h
rename to lib/vendor/Bosch/BME680/Self test/bme680_selftest.h
diff --git a/lib/bosch/BME680_driver/bme680.c b/lib/vendor/Bosch/BME680/bme680.c
similarity index 100%
rename from lib/bosch/BME680_driver/bme680.c
rename to lib/vendor/Bosch/BME680/bme680.c
diff --git a/lib/bosch/BME680_driver/bme680.h b/lib/vendor/Bosch/BME680/bme680.h
similarity index 100%
rename from lib/bosch/BME680_driver/bme680.h
rename to lib/vendor/Bosch/BME680/bme680.h
diff --git a/lib/bosch/BME680_driver/bme680_defs.h b/lib/vendor/Bosch/BME680/bme680_defs.h
similarity index 100%
rename from lib/bosch/BME680_driver/bme680_defs.h
rename to lib/vendor/Bosch/BME680/bme680_defs.h
diff --git a/lib/maxim/MAX77650-Arduino-Library/LICENSE b/lib/vendor/Maxim/MAX77650/LICENSE
similarity index 100%
rename from lib/maxim/MAX77650-Arduino-Library/LICENSE
rename to lib/vendor/Maxim/MAX77650/LICENSE
diff --git a/lib/maxim/MAX77650-Arduino-Library/MAX77650-Arduino-Library.c b/lib/vendor/Maxim/MAX77650/MAX77650-Arduino-Library.c
similarity index 100%
rename from lib/maxim/MAX77650-Arduino-Library/MAX77650-Arduino-Library.c
rename to lib/vendor/Maxim/MAX77650/MAX77650-Arduino-Library.c
diff --git a/lib/maxim/MAX77650-Arduino-Library/MAX77650-Arduino-Library.h b/lib/vendor/Maxim/MAX77650/MAX77650-Arduino-Library.h
similarity index 100%
rename from lib/maxim/MAX77650-Arduino-Library/MAX77650-Arduino-Library.h
rename to lib/vendor/Maxim/MAX77650/MAX77650-Arduino-Library.h
diff --git a/lib/maxim/MAX77650-Arduino-Library/README.md b/lib/vendor/Maxim/MAX77650/README.md
similarity index 100%
rename from lib/maxim/MAX77650-Arduino-Library/README.md
rename to lib/vendor/Maxim/MAX77650/README.md
diff --git a/lib/maxim/MAX77650-Arduino-Library/examples/MAX77650_Interrupt-Handler_Charge-LED/MAX77650_Interrupt-Handler_Charge-LED/MAX77650_Interrupt-Handler_Charge-LED.ino b/lib/vendor/Maxim/MAX77650/examples/MAX77650_Interrupt-Handler_Charge-LED/MAX77650_Interrupt-Handler_Charge-LED/MAX77650_Interrupt-Handler_Charge-LED.ino
similarity index 100%
rename from lib/maxim/MAX77650-Arduino-Library/examples/MAX77650_Interrupt-Handler_Charge-LED/MAX77650_Interrupt-Handler_Charge-LED/MAX77650_Interrupt-Handler_Charge-LED.ino
rename to lib/vendor/Maxim/MAX77650/examples/MAX77650_Interrupt-Handler_Charge-LED/MAX77650_Interrupt-Handler_Charge-LED/MAX77650_Interrupt-Handler_Charge-LED.ino
diff --git a/lib/maxim/MAX77650-Arduino-Library/examples/MAX77650_PMIC_LED_example/MAX77650_PMIC_LED_example.ino b/lib/vendor/Maxim/MAX77650/examples/MAX77650_PMIC_LED_example/MAX77650_PMIC_LED_example.ino
similarity index 100%
rename from lib/maxim/MAX77650-Arduino-Library/examples/MAX77650_PMIC_LED_example/MAX77650_PMIC_LED_example.ino
rename to lib/vendor/Maxim/MAX77650/examples/MAX77650_PMIC_LED_example/MAX77650_PMIC_LED_example.ino
diff --git a/lib/maxim/MAX77650-Arduino-Library/examples/MAX77650_PowerHold_example/MAX77650_PowerHold_example.ino b/lib/vendor/Maxim/MAX77650/examples/MAX77650_PowerHold_example/MAX77650_PowerHold_example.ino
similarity index 100%
rename from lib/maxim/MAX77650-Arduino-Library/examples/MAX77650_PowerHold_example/MAX77650_PowerHold_example.ino
rename to lib/vendor/Maxim/MAX77650/examples/MAX77650_PowerHold_example/MAX77650_PowerHold_example.ino
diff --git a/lib/maxim/MAX77650-Arduino-Library/examples/MAX77650_SIMO_Buck_Boost_example/MAX77650_SIMO_Buck_Boost_example.ino b/lib/vendor/Maxim/MAX77650/examples/MAX77650_SIMO_Buck_Boost_example/MAX77650_SIMO_Buck_Boost_example.ino
similarity index 100%
rename from lib/maxim/MAX77650-Arduino-Library/examples/MAX77650_SIMO_Buck_Boost_example/MAX77650_SIMO_Buck_Boost_example.ino
rename to lib/vendor/Maxim/MAX77650/examples/MAX77650_SIMO_Buck_Boost_example/MAX77650_SIMO_Buck_Boost_example.ino
diff --git a/lib/maxim/MAX77650-Arduino-Library/examples/MAX77650_analog_multiplexer_example/MAX77650_analog_multiplexer_example.ino b/lib/vendor/Maxim/MAX77650/examples/MAX77650_analog_multiplexer_example/MAX77650_analog_multiplexer_example.ino
similarity index 100%
rename from lib/maxim/MAX77650-Arduino-Library/examples/MAX77650_analog_multiplexer_example/MAX77650_analog_multiplexer_example.ino
rename to lib/vendor/Maxim/MAX77650/examples/MAX77650_analog_multiplexer_example/MAX77650_analog_multiplexer_example.ino
diff --git a/lib/maxim/MAX77650-Arduino-Library/examples/MAX77650_complete_init_example/MAX77650_complete_init_example.ino b/lib/vendor/Maxim/MAX77650/examples/MAX77650_complete_init_example/MAX77650_complete_init_example.ino
similarity index 100%
rename from lib/maxim/MAX77650-Arduino-Library/examples/MAX77650_complete_init_example/MAX77650_complete_init_example.ino
rename to lib/vendor/Maxim/MAX77650/examples/MAX77650_complete_init_example/MAX77650_complete_init_example.ino
diff --git a/lib/maxim/MAX77650-Arduino-Library/keywords.txt b/lib/vendor/Maxim/MAX77650/keywords.txt
similarity index 100%
rename from lib/maxim/MAX77650-Arduino-Library/keywords.txt
rename to lib/vendor/Maxim/MAX77650/keywords.txt
diff --git a/lib/maxim/MAX77650-Arduino-Library/library.properties b/lib/vendor/Maxim/MAX77650/library.properties
similarity index 100%
rename from lib/maxim/MAX77650-Arduino-Library/library.properties
rename to lib/vendor/Maxim/MAX77650/library.properties