diff --git a/.gitmodules b/.gitmodules
index 4be9799dc..da4ce37c1 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -30,5 +30,5 @@
 	path = addins/ahbsdc
 	url = http://github.com/JacobPease/ahbsdc.git
 [submodule "src/uncore/basejump_stl"]
-	path = src/uncore/basejump_stl
+	path = soc/basejump_stl
 	url = https://github.com/bespoke-silicon-group/basejump_stl
diff --git a/src/uncore/ahbxuiconverter.sv b/soc/ahbxuiconverter.sv
similarity index 100%
rename from src/uncore/ahbxuiconverter.sv
rename to soc/ahbxuiconverter.sv
diff --git a/src/uncore/basejump_stl b/soc/basejump_stl
similarity index 100%
rename from src/uncore/basejump_stl
rename to soc/basejump_stl
diff --git a/src/uncore/bsg_dmc_ahb.sv b/soc/bsg_dmc_ahb.sv
similarity index 100%
rename from src/uncore/bsg_dmc_ahb.sv
rename to soc/bsg_dmc_ahb.sv
diff --git a/src/uncore/fifo/fifo.sv b/soc/fifo/fifo.sv
similarity index 100%
rename from src/uncore/fifo/fifo.sv
rename to soc/fifo/fifo.sv
diff --git a/src/uncore/fifo/fifomem.sv b/soc/fifo/fifomem.sv
similarity index 100%
rename from src/uncore/fifo/fifomem.sv
rename to soc/fifo/fifomem.sv
diff --git a/src/uncore/fifo/rptr_empty.sv b/soc/fifo/rptr_empty.sv
similarity index 100%
rename from src/uncore/fifo/rptr_empty.sv
rename to soc/fifo/rptr_empty.sv
diff --git a/src/uncore/fifo/sync_r2w.sv b/soc/fifo/sync_r2w.sv
similarity index 100%
rename from src/uncore/fifo/sync_r2w.sv
rename to soc/fifo/sync_r2w.sv
diff --git a/src/uncore/fifo/sync_w2r.sv b/soc/fifo/sync_w2r.sv
similarity index 100%
rename from src/uncore/fifo/sync_w2r.sv
rename to soc/fifo/sync_w2r.sv
diff --git a/src/uncore/fifo/wptr_full.sv b/soc/fifo/wptr_full.sv
similarity index 100%
rename from src/uncore/fifo/wptr_full.sv
rename to soc/fifo/wptr_full.sv