diff --git a/arch/arc/soc/quark_se_c1000_ss/CMakeLists.txt b/arch/arc/soc/quark_se_c1000_ss/CMakeLists.txt
index 575c3614b39..60d932b9567 100644
--- a/arch/arc/soc/quark_se_c1000_ss/CMakeLists.txt
+++ b/arch/arc/soc/quark_se_c1000_ss/CMakeLists.txt
@@ -1,5 +1,5 @@
 zephyr_library_include_directories(${ZEPHYR_BASE}/drivers)
-zephyr_include_directories(${ZEPHYR_BASE}/arch/x86/soc/intel_quark)
+zephyr_include_directories(${ZEPHYR_BASE}/soc/x86/intel_quark)
 
 zephyr_cc_option(-mcpu=quarkse_em -mno-sdata)
 
diff --git a/arch/x86/CMakeLists.txt b/arch/x86/CMakeLists.txt
index f0f7d6c265d..fc14df5714c 100644
--- a/arch/x86/CMakeLists.txt
+++ b/arch/x86/CMakeLists.txt
@@ -68,7 +68,6 @@ add_custom_command(
   WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
   )
 
-add_subdirectory(soc/${SOC_PATH})
 # Must be last so that soc/ can override default exception handlers
 add_subdirectory(core)
 
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 0acb9ddf260..e1ce6fff500 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -10,7 +10,7 @@ choice
 	prompt "x86 SoC Selection"
 	depends on X86
 
-	source "arch/x86/soc/*/Kconfig.soc"
+	source "soc/x86/*/Kconfig.soc"
 endchoice
 
 menu "X86 Architecture Options"
@@ -18,7 +18,7 @@ menu "X86 Architecture Options"
 
 # Include these first so that any properties (e.g. defaults) below can be
 # overriden (by defining symbols in multiple locations)
-source "arch/x86/soc/*/Kconfig"
+source "soc/x86/*/Kconfig"
 
 config ARCH
 	default "x86"
diff --git a/arch/x86/soc/intel_quark/Kconfig.defconfig b/arch/x86/soc/intel_quark/Kconfig.defconfig
deleted file mode 100644
index 2908606825c..00000000000
--- a/arch/x86/soc/intel_quark/Kconfig.defconfig
+++ /dev/null
@@ -1 +0,0 @@
-source "arch/x86/soc/intel_quark/*/Kconfig.defconfig.series"
diff --git a/arch/x86/soc/apollo_lake/CMakeLists.txt b/soc/x86/apollo_lake/CMakeLists.txt
similarity index 100%
rename from arch/x86/soc/apollo_lake/CMakeLists.txt
rename to soc/x86/apollo_lake/CMakeLists.txt
diff --git a/arch/x86/soc/apollo_lake/Kconfig.defconfig b/soc/x86/apollo_lake/Kconfig.defconfig
similarity index 100%
rename from arch/x86/soc/apollo_lake/Kconfig.defconfig
rename to soc/x86/apollo_lake/Kconfig.defconfig
diff --git a/arch/x86/soc/apollo_lake/Kconfig.soc b/soc/x86/apollo_lake/Kconfig.soc
similarity index 100%
rename from arch/x86/soc/apollo_lake/Kconfig.soc
rename to soc/x86/apollo_lake/Kconfig.soc
diff --git a/arch/x86/soc/apollo_lake/dts.fixup b/soc/x86/apollo_lake/dts.fixup
similarity index 100%
rename from arch/x86/soc/apollo_lake/dts.fixup
rename to soc/x86/apollo_lake/dts.fixup
diff --git a/arch/x86/soc/apollo_lake/linker.ld b/soc/x86/apollo_lake/linker.ld
similarity index 100%
rename from arch/x86/soc/apollo_lake/linker.ld
rename to soc/x86/apollo_lake/linker.ld
diff --git a/arch/x86/soc/apollo_lake/soc.c b/soc/x86/apollo_lake/soc.c
similarity index 100%
rename from arch/x86/soc/apollo_lake/soc.c
rename to soc/x86/apollo_lake/soc.c
diff --git a/arch/x86/soc/apollo_lake/soc.h b/soc/x86/apollo_lake/soc.h
similarity index 100%
rename from arch/x86/soc/apollo_lake/soc.h
rename to soc/x86/apollo_lake/soc.h
diff --git a/arch/x86/soc/atom/CMakeLists.txt b/soc/x86/atom/CMakeLists.txt
similarity index 100%
rename from arch/x86/soc/atom/CMakeLists.txt
rename to soc/x86/atom/CMakeLists.txt
diff --git a/arch/x86/soc/atom/Kconfig.defconfig b/soc/x86/atom/Kconfig.defconfig
similarity index 100%
rename from arch/x86/soc/atom/Kconfig.defconfig
rename to soc/x86/atom/Kconfig.defconfig
diff --git a/arch/x86/soc/atom/Kconfig.soc b/soc/x86/atom/Kconfig.soc
similarity index 100%
rename from arch/x86/soc/atom/Kconfig.soc
rename to soc/x86/atom/Kconfig.soc
diff --git a/arch/x86/soc/atom/dts.fixup b/soc/x86/atom/dts.fixup
similarity index 100%
rename from arch/x86/soc/atom/dts.fixup
rename to soc/x86/atom/dts.fixup
diff --git a/arch/x86/soc/atom/linker.ld b/soc/x86/atom/linker.ld
similarity index 100%
rename from arch/x86/soc/atom/linker.ld
rename to soc/x86/atom/linker.ld
diff --git a/arch/x86/soc/atom/soc.c b/soc/x86/atom/soc.c
similarity index 100%
rename from arch/x86/soc/atom/soc.c
rename to soc/x86/atom/soc.c
diff --git a/arch/x86/soc/atom/soc.h b/soc/x86/atom/soc.h
similarity index 100%
rename from arch/x86/soc/atom/soc.h
rename to soc/x86/atom/soc.h
diff --git a/arch/x86/soc/ia32/CMakeLists.txt b/soc/x86/ia32/CMakeLists.txt
similarity index 100%
rename from arch/x86/soc/ia32/CMakeLists.txt
rename to soc/x86/ia32/CMakeLists.txt
diff --git a/arch/x86/soc/ia32/Kconfig.defconfig b/soc/x86/ia32/Kconfig.defconfig
similarity index 100%
rename from arch/x86/soc/ia32/Kconfig.defconfig
rename to soc/x86/ia32/Kconfig.defconfig
diff --git a/arch/x86/soc/ia32/Kconfig.soc b/soc/x86/ia32/Kconfig.soc
similarity index 100%
rename from arch/x86/soc/ia32/Kconfig.soc
rename to soc/x86/ia32/Kconfig.soc
diff --git a/arch/x86/soc/ia32/dts.fixup b/soc/x86/ia32/dts.fixup
similarity index 100%
rename from arch/x86/soc/ia32/dts.fixup
rename to soc/x86/ia32/dts.fixup
diff --git a/arch/x86/soc/ia32/linker.ld b/soc/x86/ia32/linker.ld
similarity index 100%
rename from arch/x86/soc/ia32/linker.ld
rename to soc/x86/ia32/linker.ld
diff --git a/arch/x86/soc/ia32/soc.c b/soc/x86/ia32/soc.c
similarity index 100%
rename from arch/x86/soc/ia32/soc.c
rename to soc/x86/ia32/soc.c
diff --git a/arch/x86/soc/ia32/soc.h b/soc/x86/ia32/soc.h
similarity index 100%
rename from arch/x86/soc/ia32/soc.h
rename to soc/x86/ia32/soc.h
diff --git a/arch/x86/soc/intel_quark/Kconfig b/soc/x86/intel_quark/Kconfig
similarity index 67%
rename from arch/x86/soc/intel_quark/Kconfig
rename to soc/x86/intel_quark/Kconfig
index e73a68af339..1a065e05735 100644
--- a/arch/x86/soc/intel_quark/Kconfig
+++ b/soc/x86/intel_quark/Kconfig
@@ -13,6 +13,6 @@ config SOC_FAMILY
 	default "intel_quark"
 endif
 
-source "arch/x86/soc/intel_quark/*/Kconfig.soc"
+source "soc/x86/intel_quark/*/Kconfig.soc"
 
-source "arch/x86/soc/intel_quark/*/Kconfig"
+source "soc/x86/intel_quark/*/Kconfig"
diff --git a/soc/x86/intel_quark/Kconfig.defconfig b/soc/x86/intel_quark/Kconfig.defconfig
new file mode 100644
index 00000000000..791971875ad
--- /dev/null
+++ b/soc/x86/intel_quark/Kconfig.defconfig
@@ -0,0 +1 @@
+source "soc/x86/intel_quark/*/Kconfig.defconfig.series"
diff --git a/arch/x86/soc/intel_quark/Kconfig.soc b/soc/x86/intel_quark/Kconfig.soc
similarity index 62%
rename from arch/x86/soc/intel_quark/Kconfig.soc
rename to soc/x86/intel_quark/Kconfig.soc
index de93ceb83ce..3ab62aa9104 100644
--- a/arch/x86/soc/intel_quark/Kconfig.soc
+++ b/soc/x86/intel_quark/Kconfig.soc
@@ -4,4 +4,4 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-source "arch/x86/soc/intel_quark/*/Kconfig.series"
+source "soc/x86/intel_quark/*/Kconfig.series"
diff --git a/arch/x86/soc/intel_quark/include/pinmux_quark_mcu.h b/soc/x86/intel_quark/include/pinmux_quark_mcu.h
similarity index 100%
rename from arch/x86/soc/intel_quark/include/pinmux_quark_mcu.h
rename to soc/x86/intel_quark/include/pinmux_quark_mcu.h
diff --git a/arch/x86/soc/intel_quark/quark_d2000/CMakeLists.txt b/soc/x86/intel_quark/quark_d2000/CMakeLists.txt
similarity index 100%
rename from arch/x86/soc/intel_quark/quark_d2000/CMakeLists.txt
rename to soc/x86/intel_quark/quark_d2000/CMakeLists.txt
diff --git a/arch/x86/soc/intel_quark/quark_d2000/Kconfig b/soc/x86/intel_quark/quark_d2000/Kconfig
similarity index 100%
rename from arch/x86/soc/intel_quark/quark_d2000/Kconfig
rename to soc/x86/intel_quark/quark_d2000/Kconfig
diff --git a/arch/x86/soc/intel_quark/quark_d2000/Kconfig.defconfig.quark_d2000 b/soc/x86/intel_quark/quark_d2000/Kconfig.defconfig.quark_d2000
similarity index 100%
rename from arch/x86/soc/intel_quark/quark_d2000/Kconfig.defconfig.quark_d2000
rename to soc/x86/intel_quark/quark_d2000/Kconfig.defconfig.quark_d2000
diff --git a/arch/x86/soc/intel_quark/quark_d2000/Kconfig.defconfig.series b/soc/x86/intel_quark/quark_d2000/Kconfig.defconfig.series
similarity index 96%
rename from arch/x86/soc/intel_quark/quark_d2000/Kconfig.defconfig.series
rename to soc/x86/intel_quark/quark_d2000/Kconfig.defconfig.series
index cfe711f5f13..1f8a3bafcde 100644
--- a/arch/x86/soc/intel_quark/quark_d2000/Kconfig.defconfig.series
+++ b/soc/x86/intel_quark/quark_d2000/Kconfig.defconfig.series
@@ -154,6 +154,6 @@ config SOC_FLASH_QMSI_SYS_SIZE
 endif # SOC_FLASH_QMSI
 
 
-source "arch/x86/soc/intel_quark/quark_d2000/Kconfig.defconfig.quark_d2000"
+source "soc/x86/intel_quark/quark_d2000/Kconfig.defconfig.quark_d2000"
 
 endif # SOC_SERIES_QUARK_D2000
diff --git a/arch/x86/soc/intel_quark/quark_d2000/Kconfig.series b/soc/x86/intel_quark/quark_d2000/Kconfig.series
similarity index 100%
rename from arch/x86/soc/intel_quark/quark_d2000/Kconfig.series
rename to soc/x86/intel_quark/quark_d2000/Kconfig.series
diff --git a/arch/x86/soc/intel_quark/quark_d2000/Kconfig.soc b/soc/x86/intel_quark/quark_d2000/Kconfig.soc
similarity index 100%
rename from arch/x86/soc/intel_quark/quark_d2000/Kconfig.soc
rename to soc/x86/intel_quark/quark_d2000/Kconfig.soc
diff --git a/arch/x86/soc/intel_quark/quark_d2000/dts.fixup b/soc/x86/intel_quark/quark_d2000/dts.fixup
similarity index 100%
rename from arch/x86/soc/intel_quark/quark_d2000/dts.fixup
rename to soc/x86/intel_quark/quark_d2000/dts.fixup
diff --git a/arch/x86/soc/intel_quark/quark_d2000/linker.ld b/soc/x86/intel_quark/quark_d2000/linker.ld
similarity index 100%
rename from arch/x86/soc/intel_quark/quark_d2000/linker.ld
rename to soc/x86/intel_quark/quark_d2000/linker.ld
diff --git a/arch/x86/soc/intel_quark/quark_d2000/soc.h b/soc/x86/intel_quark/quark_d2000/soc.h
similarity index 100%
rename from arch/x86/soc/intel_quark/quark_d2000/soc.h
rename to soc/x86/intel_quark/quark_d2000/soc.h
diff --git a/arch/x86/soc/intel_quark/quark_se/CMakeLists.txt b/soc/x86/intel_quark/quark_se/CMakeLists.txt
similarity index 100%
rename from arch/x86/soc/intel_quark/quark_se/CMakeLists.txt
rename to soc/x86/intel_quark/quark_se/CMakeLists.txt
diff --git a/arch/x86/soc/intel_quark/quark_se/Kconfig b/soc/x86/intel_quark/quark_se/Kconfig
similarity index 100%
rename from arch/x86/soc/intel_quark/quark_se/Kconfig
rename to soc/x86/intel_quark/quark_se/Kconfig
diff --git a/arch/x86/soc/intel_quark/quark_se/Kconfig.defconfig.curie b/soc/x86/intel_quark/quark_se/Kconfig.defconfig.curie
similarity index 100%
rename from arch/x86/soc/intel_quark/quark_se/Kconfig.defconfig.curie
rename to soc/x86/intel_quark/quark_se/Kconfig.defconfig.curie
diff --git a/arch/x86/soc/intel_quark/quark_se/Kconfig.defconfig.quark_se_c1000 b/soc/x86/intel_quark/quark_se/Kconfig.defconfig.quark_se_c1000
similarity index 100%
rename from arch/x86/soc/intel_quark/quark_se/Kconfig.defconfig.quark_se_c1000
rename to soc/x86/intel_quark/quark_se/Kconfig.defconfig.quark_se_c1000
diff --git a/arch/x86/soc/intel_quark/quark_se/Kconfig.defconfig.series b/soc/x86/intel_quark/quark_se/Kconfig.defconfig.series
similarity index 94%
rename from arch/x86/soc/intel_quark/quark_se/Kconfig.defconfig.series
rename to soc/x86/intel_quark/quark_se/Kconfig.defconfig.series
index 76ecbe3832d..730283815ac 100644
--- a/arch/x86/soc/intel_quark/quark_se/Kconfig.defconfig.series
+++ b/soc/x86/intel_quark/quark_se/Kconfig.defconfig.series
@@ -201,7 +201,7 @@ config USB_DW_IRQ_PRI
 	default 3
 endif # USB
 
-source "arch/x86/soc/intel_quark/quark_se/Kconfig.defconfig.quark_se*"
-source "arch/x86/soc/intel_quark/quark_se/Kconfig.defconfig.curie*"
+source "soc/x86/intel_quark/quark_se/Kconfig.defconfig.quark_se*"
+source "soc/x86/intel_quark/quark_se/Kconfig.defconfig.curie*"
 
 endif # SOC_SERIES_QUARK_SE
diff --git a/arch/x86/soc/intel_quark/quark_se/Kconfig.series b/soc/x86/intel_quark/quark_se/Kconfig.series
similarity index 100%
rename from arch/x86/soc/intel_quark/quark_se/Kconfig.series
rename to soc/x86/intel_quark/quark_se/Kconfig.series
diff --git a/arch/x86/soc/intel_quark/quark_se/Kconfig.soc b/soc/x86/intel_quark/quark_se/Kconfig.soc
similarity index 100%
rename from arch/x86/soc/intel_quark/quark_se/Kconfig.soc
rename to soc/x86/intel_quark/quark_se/Kconfig.soc
diff --git a/arch/x86/soc/intel_quark/quark_se/dts.fixup b/soc/x86/intel_quark/quark_se/dts.fixup
similarity index 100%
rename from arch/x86/soc/intel_quark/quark_se/dts.fixup
rename to soc/x86/intel_quark/quark_se/dts.fixup
diff --git a/arch/x86/soc/intel_quark/quark_se/eoi.c b/soc/x86/intel_quark/quark_se/eoi.c
similarity index 100%
rename from arch/x86/soc/intel_quark/quark_se/eoi.c
rename to soc/x86/intel_quark/quark_se/eoi.c
diff --git a/arch/x86/soc/intel_quark/quark_se/linker.ld b/soc/x86/intel_quark/quark_se/linker.ld
similarity index 100%
rename from arch/x86/soc/intel_quark/quark_se/linker.ld
rename to soc/x86/intel_quark/quark_se/linker.ld
diff --git a/arch/x86/soc/intel_quark/quark_se/power.c b/soc/x86/intel_quark/quark_se/power.c
similarity index 100%
rename from arch/x86/soc/intel_quark/quark_se/power.c
rename to soc/x86/intel_quark/quark_se/power.c
diff --git a/arch/x86/soc/intel_quark/quark_se/shared_mem.h b/soc/x86/intel_quark/quark_se/shared_mem.h
similarity index 100%
rename from arch/x86/soc/intel_quark/quark_se/shared_mem.h
rename to soc/x86/intel_quark/quark_se/shared_mem.h
diff --git a/arch/x86/soc/intel_quark/quark_se/soc.c b/soc/x86/intel_quark/quark_se/soc.c
similarity index 100%
rename from arch/x86/soc/intel_quark/quark_se/soc.c
rename to soc/x86/intel_quark/quark_se/soc.c
diff --git a/arch/x86/soc/intel_quark/quark_se/soc.h b/soc/x86/intel_quark/quark_se/soc.h
similarity index 100%
rename from arch/x86/soc/intel_quark/quark_se/soc.h
rename to soc/x86/intel_quark/quark_se/soc.h
diff --git a/arch/x86/soc/intel_quark/quark_se/soc_config.c b/soc/x86/intel_quark/quark_se/soc_config.c
similarity index 100%
rename from arch/x86/soc/intel_quark/quark_se/soc_config.c
rename to soc/x86/intel_quark/quark_se/soc_config.c
diff --git a/arch/x86/soc/intel_quark/quark_se/soc_power.S b/soc/x86/intel_quark/quark_se/soc_power.S
similarity index 100%
rename from arch/x86/soc/intel_quark/quark_se/soc_power.S
rename to soc/x86/intel_quark/quark_se/soc_power.S
diff --git a/arch/x86/soc/intel_quark/quark_se/soc_power.h b/soc/x86/intel_quark/quark_se/soc_power.h
similarity index 100%
rename from arch/x86/soc/intel_quark/quark_se/soc_power.h
rename to soc/x86/intel_quark/quark_se/soc_power.h
diff --git a/arch/x86/soc/intel_quark/quark_x1000/CMakeLists.txt b/soc/x86/intel_quark/quark_x1000/CMakeLists.txt
similarity index 100%
rename from arch/x86/soc/intel_quark/quark_x1000/CMakeLists.txt
rename to soc/x86/intel_quark/quark_x1000/CMakeLists.txt
diff --git a/arch/x86/soc/intel_quark/quark_x1000/Kconfig.defconfig.quark_x1000 b/soc/x86/intel_quark/quark_x1000/Kconfig.defconfig.quark_x1000
similarity index 100%
rename from arch/x86/soc/intel_quark/quark_x1000/Kconfig.defconfig.quark_x1000
rename to soc/x86/intel_quark/quark_x1000/Kconfig.defconfig.quark_x1000
diff --git a/arch/x86/soc/intel_quark/quark_x1000/Kconfig.defconfig.series b/soc/x86/intel_quark/quark_x1000/Kconfig.defconfig.series
similarity index 97%
rename from arch/x86/soc/intel_quark/quark_x1000/Kconfig.defconfig.series
rename to soc/x86/intel_quark/quark_x1000/Kconfig.defconfig.series
index 8bf5672751e..0bc66225cfe 100644
--- a/arch/x86/soc/intel_quark/quark_x1000/Kconfig.defconfig.series
+++ b/soc/x86/intel_quark/quark_x1000/Kconfig.defconfig.series
@@ -243,5 +243,5 @@ config BT_UART_ON_DEV_NAME
 
 endif
 
-source "arch/x86/soc/intel_quark/quark_x1000/Kconfig.defconfig.quark_x1000"
+source "soc/x86/intel_quark/quark_x1000/Kconfig.defconfig.quark_x1000"
 endif # SOC_SERIES_QUARK_X1000
diff --git a/arch/x86/soc/intel_quark/quark_x1000/Kconfig.series b/soc/x86/intel_quark/quark_x1000/Kconfig.series
similarity index 100%
rename from arch/x86/soc/intel_quark/quark_x1000/Kconfig.series
rename to soc/x86/intel_quark/quark_x1000/Kconfig.series
diff --git a/arch/x86/soc/intel_quark/quark_x1000/Kconfig.soc b/soc/x86/intel_quark/quark_x1000/Kconfig.soc
similarity index 100%
rename from arch/x86/soc/intel_quark/quark_x1000/Kconfig.soc
rename to soc/x86/intel_quark/quark_x1000/Kconfig.soc
diff --git a/arch/x86/soc/intel_quark/quark_x1000/dts.fixup b/soc/x86/intel_quark/quark_x1000/dts.fixup
similarity index 100%
rename from arch/x86/soc/intel_quark/quark_x1000/dts.fixup
rename to soc/x86/intel_quark/quark_x1000/dts.fixup
diff --git a/arch/x86/soc/intel_quark/quark_x1000/linker.ld b/soc/x86/intel_quark/quark_x1000/linker.ld
similarity index 100%
rename from arch/x86/soc/intel_quark/quark_x1000/linker.ld
rename to soc/x86/intel_quark/quark_x1000/linker.ld
diff --git a/arch/x86/soc/intel_quark/quark_x1000/soc.c b/soc/x86/intel_quark/quark_x1000/soc.c
similarity index 100%
rename from arch/x86/soc/intel_quark/quark_x1000/soc.c
rename to soc/x86/intel_quark/quark_x1000/soc.c
diff --git a/arch/x86/soc/intel_quark/quark_x1000/soc.h b/soc/x86/intel_quark/quark_x1000/soc.h
similarity index 100%
rename from arch/x86/soc/intel_quark/quark_x1000/soc.h
rename to soc/x86/intel_quark/quark_x1000/soc.h