diff --git a/src/gov-action-contracts/AIPs/ArbOS11/SetArbOS11ModuleRootAciton.sol b/src/gov-action-contracts/AIPs/ArbOS11/SetArbOS11ModuleRootAciton.sol
new file mode 100644
index 00000000..5910ffa0
--- /dev/null
+++ b/src/gov-action-contracts/AIPs/ArbOS11/SetArbOS11ModuleRootAciton.sol
@@ -0,0 +1,17 @@
+// SPDX-License-Identifier: Apache-2.0
+pragma solidity 0.8.16;
+
+import "../../arbos-upgrade/SetWasmModuleRootAction.sol";
+import "../../address-registries/L1AddressRegistry.sol";
+
+contract SetArbOS11ModuleRootAciton is SetWasmModuleRootAction {
+    constructor()
+        SetWasmModuleRootAction(
+            L1AddressRegistry(0xd514C2b3aaBDBfa10800B9C96dc1eB25427520A0),
+            // TODO
+            bytes32(0)
+        )
+    {
+        require(newWasmModuleRoot != bytes32(0), "TODO: remove");
+    }
+}
diff --git a/src/gov-action-contracts/AIPs/ArbOS11/SetArbOS11VersionAction.sol b/src/gov-action-contracts/AIPs/ArbOS11/SetArbOS11VersionAction.sol
new file mode 100644
index 00000000..9f9ae075
--- /dev/null
+++ b/src/gov-action-contracts/AIPs/ArbOS11/SetArbOS11VersionAction.sol
@@ -0,0 +1,17 @@
+// SPDX-License-Identifier: Apache-2.0
+pragma solidity 0.8.16;
+
+import "../../arbos-upgrade/UpgradeArbOSVersionAction.sol";
+import "../../address-registries/L1AddressRegistry.sol";
+
+contract SetArbOS11VersionAction is UpgradeArbOSVersionAction {
+    constructor()
+        UpgradeArbOSVersionAction(
+            uint64(11),
+            // TODO:
+            uint64(0)
+        )
+    {
+        require(upgradeTimeDelaySeconds != uint64(0), "TODO: remove");
+    }
+}
diff --git a/src/gov-action-contracts/AIPs/UpgradeArbOS/SetWASMModuleRootAction.sol b/src/gov-action-contracts/arbos-upgrade/SetWasmModuleRootAction.sol
similarity index 93%
rename from src/gov-action-contracts/AIPs/UpgradeArbOS/SetWASMModuleRootAction.sol
rename to src/gov-action-contracts/arbos-upgrade/SetWasmModuleRootAction.sol
index 16e2f0d5..5cbf94a1 100644
--- a/src/gov-action-contracts/AIPs/UpgradeArbOS/SetWASMModuleRootAction.sol
+++ b/src/gov-action-contracts/arbos-upgrade/SetWasmModuleRootAction.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity 0.8.16;
 
-import "../../address-registries/L1AddressRegistry.sol";
+import "../address-registries/L1AddressRegistry.sol";
 
 /// @notice should be included in an operation batch in the L1 timelock along with UpgradeArbOSVersionAction
 contract SetWasmModuleRootAction {
diff --git a/src/gov-action-contracts/AIPs/UpgradeArbOS/UpgradeArbOSVersionAction.sol b/src/gov-action-contracts/arbos-upgrade/UpgradeArbOSVersionAction.sol
similarity index 100%
rename from src/gov-action-contracts/AIPs/UpgradeArbOS/UpgradeArbOSVersionAction.sol
rename to src/gov-action-contracts/arbos-upgrade/UpgradeArbOSVersionAction.sol