diff --git a/builds/Resources/Include_Common.mk b/builds/Resources/Include_Common.mk
index 29462d5..19a5fec 100644
--- a/builds/Resources/Include_Common.mk
+++ b/builds/Resources/Include_Common.mk
@@ -54,7 +54,12 @@ CORE_DIRS = $(REPO)/src_Core/CPU:$(REPO)/src_Core/ISA:$(REPO)/src_Core/Core:$(RE
 
 TESTBENCH_DIRS = $(REPO)/src_Testbench/Top:$(REPO)/src_Testbench/SoC
 
-BLUESTUFF_DIRS = $(REPO)/libs/BlueStuff:$(REPO)/libs/BlueStuff/AXI:$(REPO)/libs/BlueStuff/BlueUtils:$(REPO)/libs/BlueStuff/BlueBasics
+BLUESTUFFDIR = $(REPO)/libs/BlueStuff
+BLUEAXI4DIR = $(BLUESTUFFDIR)/BlueAXI4
+BLUEAXI4DIRS = $(BLUEAXI4DIR):$(BLUEAXI4DIR)/AXI4:$(BLUEAXI4DIR)/AXI4Lite:$(BLUEAXI4DIR)/AXI4Stream:$(BLUEAXI4DIR)/BlueUnixBridges
+BLUEBASICSDIR = $(BLUESTUFFDIR)/BlueBasics
+BLUEUTILSDIR = $(BLUESTUFFDIR)/BlueUtils
+BLUESTUFF_DIRS = $(BLUESTUFFDIR):$(BLUEAXI4DIRS):$(BLUEBASICSDIR):$(BLUEUTILSDIR)
 
 WINDCOREIFC_DIRS = $(REPO)/libs/WindCoreInterface
 
diff --git a/libs/BlueStuff b/libs/BlueStuff
index c2cae9e..fbd3b9f 160000
--- a/libs/BlueStuff
+++ b/libs/BlueStuff
@@ -1 +1 @@
-Subproject commit c2cae9ea3ba3f3a99f462e11cef9cde85616f5c4
+Subproject commit fbd3b9fc685b0e898dde49fb9d8e54d43d9c5e20
diff --git a/libs/TagController b/libs/TagController
index 2e2198b..a64b2c8 160000
--- a/libs/TagController
+++ b/libs/TagController
@@ -1 +1 @@
-Subproject commit 2e2198b05f3c7cea61d690e3aa438211d0de9e8d
+Subproject commit a64b2c89252775672e198e89005977dcc25bd1b4
diff --git a/libs/WindCoreInterface b/libs/WindCoreInterface
index 81fc7b1..3845af2 160000
--- a/libs/WindCoreInterface
+++ b/libs/WindCoreInterface
@@ -1 +1 @@
-Subproject commit 81fc7b1512c9a7374285168551a34226456c7c5e
+Subproject commit 3845af2b14cd5cd29b220c3e82f77165b0319226