diff --git a/.gitmodules b/.gitmodules
index 0685253..5588aac 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -4,9 +4,6 @@
 [submodule "lib/osx"]
 	path = lib/osx
 	url = https://github.com/aragon/osx
-[submodule "lib/osx-commons"]
-	path = lib/osx-commons
-	url = https://github.com/aragon/osx-commons
 [submodule "lib/admin-plugin"]
 	path = lib/admin-plugin
 	url = https://github.com/aragon/admin-plugin
diff --git a/README.md b/README.md
index 36ef2ad..1b8b368 100644
--- a/README.md
+++ b/README.md
@@ -193,10 +193,10 @@ forge install aragon/protocol-factory
 Given that this repository already depends on OSx, you may want to replace the existing `remappings.txt` entry and use the OSx path provided by `protocol-factory` itself.
 
 ```diff
--@aragon/osx/=lib/osx/packages/contracts/src/
+-@aragon/osx/=lib/osx/src/
 
 +@aragon/protocol-factory/=lib/protocol-factory/
-+@aragon/osx/=lib/protocol-factory/lib/osx/packages/contracts/src/
++@aragon/osx/=lib/protocol-factory/lib/osx/src/
 ```
 
 #### The simplest example
diff --git a/docs/modules/ROOT/pages/osx-local-testing.adoc b/docs/modules/ROOT/pages/osx-local-testing.adoc
index 5393625..8f90fd3 100644
--- a/docs/modules/ROOT/pages/osx-local-testing.adoc
+++ b/docs/modules/ROOT/pages/osx-local-testing.adoc
@@ -13,10 +13,10 @@ forge install aragon/protocol-factory
 Given that this repository already depends on OSx, you may want to replace the existing `remappings.txt` entry and use the OSx path provided by `protocol-factory` itself.
 
 ```
--@aragon/osx/=lib/osx/packages/contracts/src/
+-@aragon/osx/=lib/osx/src/
 
 +@aragon/protocol-factory/=lib/protocol-factory/
-+@aragon/osx/=lib/protocol-factory/lib/osx/packages/contracts/src/
++@aragon/osx/=lib/protocol-factory/lib/osx/src/
 ```
 
 === The simplest example
diff --git a/lib/just-foundry b/lib/just-foundry
index be7160d..b580e97 160000
--- a/lib/just-foundry
+++ b/lib/just-foundry
@@ -1 +1 @@
-Subproject commit be7160d555906f43c192203ca9b92a612c0e3f17
+Subproject commit b580e97b22ec97735d574a1b81ba66367eb3d63a
diff --git a/lib/osx b/lib/osx
index 6f35a85..1fff7dc 160000
--- a/lib/osx
+++ b/lib/osx
@@ -1 +1 @@
-Subproject commit 6f35a85f6159ae62c68776c5cff57d4e8cfe1549
+Subproject commit 1fff7dc4d416d869b5c8c24182125ccd385529ab
diff --git a/lib/osx-commons b/lib/osx-commons
deleted file mode 160000
index 7a6dc58..0000000
--- a/lib/osx-commons
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 7a6dc5839772e3b1de3c550fa2f405e11c6dd22b
diff --git a/lib/staged-proposal-processor-plugin b/lib/staged-proposal-processor-plugin
index 9457e52..c751b1c 160000
--- a/lib/staged-proposal-processor-plugin
+++ b/lib/staged-proposal-processor-plugin
@@ -1 +1 @@
-Subproject commit 9457e52ee316565cac1bf754084f74c79eeba64b
+Subproject commit c751b1c3df916eb549653c7d7ae4683a849d9713
diff --git a/remappings.txt b/remappings.txt
index 0886008..216505b 100644
--- a/remappings.txt
+++ b/remappings.txt
@@ -1,8 +1,8 @@
 @openzeppelin/contracts/=lib/openzeppelin-contracts/contracts/
 @openzeppelin/contracts-upgradeable/=lib/openzeppelin-contracts-upgradeable/contracts/
 
-@aragon/osx/=lib/osx/packages/contracts/src/
-@aragon/osx-commons-contracts/=lib/osx-commons/contracts/
+@aragon/osx/=lib/osx/src/
+@aragon/osx-commons-contracts/src/=lib/osx/src/common/
 @aragon/admin-plugin/=lib/admin-plugin/packages/contracts/src/
 @aragon/multisig-plugin/=lib/multisig-plugin/packages/contracts/src/
 @aragon/token-voting-plugin/=lib/token-voting-plugin/src/