diff --git a/examples/bluetooth/esp_ble_mesh/common_vendor_models/fast_prov_vendor_model/components/CMakeLists.txt b/examples/bluetooth/esp_ble_mesh/common_components/fast_prov_vendor_model/CMakeLists.txt
similarity index 100%
rename from examples/bluetooth/esp_ble_mesh/common_vendor_models/fast_prov_vendor_model/components/CMakeLists.txt
rename to examples/bluetooth/esp_ble_mesh/common_components/fast_prov_vendor_model/CMakeLists.txt
diff --git a/examples/bluetooth/esp_ble_mesh/common_vendor_models/fast_prov_vendor_model/components/component.mk b/examples/bluetooth/esp_ble_mesh/common_components/fast_prov_vendor_model/component.mk
similarity index 100%
rename from examples/bluetooth/esp_ble_mesh/common_vendor_models/fast_prov_vendor_model/components/component.mk
rename to examples/bluetooth/esp_ble_mesh/common_components/fast_prov_vendor_model/component.mk
diff --git a/examples/bluetooth/esp_ble_mesh/common_vendor_models/fast_prov_vendor_model/components/esp_fast_prov_client_model.c b/examples/bluetooth/esp_ble_mesh/common_components/fast_prov_vendor_model/esp_fast_prov_client_model.c
similarity index 100%
rename from examples/bluetooth/esp_ble_mesh/common_vendor_models/fast_prov_vendor_model/components/esp_fast_prov_client_model.c
rename to examples/bluetooth/esp_ble_mesh/common_components/fast_prov_vendor_model/esp_fast_prov_client_model.c
diff --git a/examples/bluetooth/esp_ble_mesh/common_vendor_models/fast_prov_vendor_model/components/esp_fast_prov_client_model.h b/examples/bluetooth/esp_ble_mesh/common_components/fast_prov_vendor_model/esp_fast_prov_client_model.h
similarity index 100%
rename from examples/bluetooth/esp_ble_mesh/common_vendor_models/fast_prov_vendor_model/components/esp_fast_prov_client_model.h
rename to examples/bluetooth/esp_ble_mesh/common_components/fast_prov_vendor_model/esp_fast_prov_client_model.h
diff --git a/examples/bluetooth/esp_ble_mesh/common_vendor_models/fast_prov_vendor_model/components/esp_fast_prov_common.h b/examples/bluetooth/esp_ble_mesh/common_components/fast_prov_vendor_model/esp_fast_prov_common.h
similarity index 100%
rename from examples/bluetooth/esp_ble_mesh/common_vendor_models/fast_prov_vendor_model/components/esp_fast_prov_common.h
rename to examples/bluetooth/esp_ble_mesh/common_components/fast_prov_vendor_model/esp_fast_prov_common.h
diff --git a/examples/bluetooth/esp_ble_mesh/common_vendor_models/fast_prov_vendor_model/components/esp_fast_prov_operation.c b/examples/bluetooth/esp_ble_mesh/common_components/fast_prov_vendor_model/esp_fast_prov_operation.c
similarity index 100%
rename from examples/bluetooth/esp_ble_mesh/common_vendor_models/fast_prov_vendor_model/components/esp_fast_prov_operation.c
rename to examples/bluetooth/esp_ble_mesh/common_components/fast_prov_vendor_model/esp_fast_prov_operation.c
diff --git a/examples/bluetooth/esp_ble_mesh/common_vendor_models/fast_prov_vendor_model/components/esp_fast_prov_operation.h b/examples/bluetooth/esp_ble_mesh/common_components/fast_prov_vendor_model/esp_fast_prov_operation.h
similarity index 100%
rename from examples/bluetooth/esp_ble_mesh/common_vendor_models/fast_prov_vendor_model/components/esp_fast_prov_operation.h
rename to examples/bluetooth/esp_ble_mesh/common_components/fast_prov_vendor_model/esp_fast_prov_operation.h
diff --git a/examples/bluetooth/esp_ble_mesh/common_vendor_models/fast_prov_vendor_model/components/esp_fast_prov_server_model.c b/examples/bluetooth/esp_ble_mesh/common_components/fast_prov_vendor_model/esp_fast_prov_server_model.c
similarity index 100%
rename from examples/bluetooth/esp_ble_mesh/common_vendor_models/fast_prov_vendor_model/components/esp_fast_prov_server_model.c
rename to examples/bluetooth/esp_ble_mesh/common_components/fast_prov_vendor_model/esp_fast_prov_server_model.c
diff --git a/examples/bluetooth/esp_ble_mesh/common_vendor_models/fast_prov_vendor_model/components/esp_fast_prov_server_model.h b/examples/bluetooth/esp_ble_mesh/common_components/fast_prov_vendor_model/esp_fast_prov_server_model.h
similarity index 100%
rename from examples/bluetooth/esp_ble_mesh/common_vendor_models/fast_prov_vendor_model/components/esp_fast_prov_server_model.h
rename to examples/bluetooth/esp_ble_mesh/common_components/fast_prov_vendor_model/esp_fast_prov_server_model.h
diff --git a/examples/bluetooth/esp_ble_mesh/common_vendor_models/fast_prov_vendor_model/CMakeLists.txt b/examples/bluetooth/esp_ble_mesh/common_vendor_models/fast_prov_vendor_model/CMakeLists.txt
deleted file mode 100644
index 9ca35d2569..0000000000
--- a/examples/bluetooth/esp_ble_mesh/common_vendor_models/fast_prov_vendor_model/CMakeLists.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-# The following lines of boilerplate have to be in your project's CMakeLists
-# in this exact order for cmake to work correctly
-cmake_minimum_required(VERSION 3.5)
-
-include($ENV{IDF_PATH}/tools/cmake/project.cmake)
-set(SUPPORTED_TARGETS esp32)
-project(fast_prov_vendor_model)
diff --git a/examples/bluetooth/esp_ble_mesh/common_vendor_models/fast_prov_vendor_model/Makefile b/examples/bluetooth/esp_ble_mesh/common_vendor_models/fast_prov_vendor_model/Makefile
deleted file mode 100644
index 274dd33494..0000000000
--- a/examples/bluetooth/esp_ble_mesh/common_vendor_models/fast_prov_vendor_model/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := fast_prov_vendor_model
-
-COMPONENT_ADD_INCLUDEDIRS := components/include
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/bluetooth/esp_ble_mesh/common_vendor_models/fast_prov_vendor_model/main/CMakeLists.txt b/examples/bluetooth/esp_ble_mesh/common_vendor_models/fast_prov_vendor_model/main/CMakeLists.txt
deleted file mode 100644
index f475ba4612..0000000000
--- a/examples/bluetooth/esp_ble_mesh/common_vendor_models/fast_prov_vendor_model/main/CMakeLists.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-set(COMPONENT_SRCS "main.c")
-
-register_component()
diff --git a/examples/bluetooth/esp_ble_mesh/common_vendor_models/fast_prov_vendor_model/main/component.mk b/examples/bluetooth/esp_ble_mesh/common_vendor_models/fast_prov_vendor_model/main/component.mk
deleted file mode 100644
index d68c5375e9..0000000000
--- a/examples/bluetooth/esp_ble_mesh/common_vendor_models/fast_prov_vendor_model/main/component.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# "main" pseudo-component makefile.
-#
-# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
-#
\ No newline at end of file
diff --git a/examples/bluetooth/esp_ble_mesh/common_vendor_models/fast_prov_vendor_model/main/main.c b/examples/bluetooth/esp_ble_mesh/common_vendor_models/fast_prov_vendor_model/main/main.c
deleted file mode 100644
index 3c9f9632ff..0000000000
--- a/examples/bluetooth/esp_ble_mesh/common_vendor_models/fast_prov_vendor_model/main/main.c
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2017-2019 Espressif Systems (Shanghai) PTE LTD
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-void app_main(void)
-{
-    /* This main.c is for CI. The fast_prov_vendor_model shall be
-     * included by other ble mesh examples which need vendor fast
-     * provisioning client/server models.
-     */
-}
diff --git a/examples/bluetooth/esp_ble_mesh/common_vendor_models/fast_prov_vendor_model/sdkconfig.defaults b/examples/bluetooth/esp_ble_mesh/common_vendor_models/fast_prov_vendor_model/sdkconfig.defaults
deleted file mode 100644
index afce3cf464..0000000000
--- a/examples/bluetooth/esp_ble_mesh/common_vendor_models/fast_prov_vendor_model/sdkconfig.defaults
+++ /dev/null
@@ -1,7 +0,0 @@
-# Override some defaults so BT stack is enabled
-# by default in this example
-CONFIG_BT_ENABLED=y
-
-# Override some defaults of ESP BLE Mesh
-CONFIG_BLE_MESH=y
-CONFIG_BLE_MESH_FAST_PROV=y