diff --git a/convex-benchmarks/src/main/java/convex/benchmarks/BigBlockBenchmark.java b/convex-benchmarks/src/main/java/convex/benchmarks/BigBlockBenchmark.java
index 915c7f206..97e1922e4 100644
--- a/convex-benchmarks/src/main/java/convex/benchmarks/BigBlockBenchmark.java
+++ b/convex-benchmarks/src/main/java/convex/benchmarks/BigBlockBenchmark.java
@@ -11,14 +11,14 @@
 import convex.core.cpos.Block;
 import convex.core.cpos.BlockResult;
 import convex.core.cvm.State;
+import convex.core.cvm.transactions.ATransaction;
+import convex.core.cvm.transactions.Transfer;
 import convex.core.crypto.AKeyPair;
 import convex.core.cvm.AccountStatus;
 import convex.core.data.Address;
 import convex.core.data.Cells;
 import convex.core.data.SignedData;
 import convex.core.exceptions.BadSignatureException;
-import convex.core.transactions.ATransaction;
-import convex.core.transactions.Transfer;
 
 public class BigBlockBenchmark {
 
diff --git a/convex-benchmarks/src/main/java/convex/benchmarks/CVMBenchmark.java b/convex-benchmarks/src/main/java/convex/benchmarks/CVMBenchmark.java
index 4713973ff..173f39098 100644
--- a/convex-benchmarks/src/main/java/convex/benchmarks/CVMBenchmark.java
+++ b/convex-benchmarks/src/main/java/convex/benchmarks/CVMBenchmark.java
@@ -6,6 +6,10 @@
 
 import convex.core.ResultContext;
 import convex.core.cvm.State;
+import convex.core.cvm.transactions.ATransaction;
+import convex.core.cvm.transactions.Call;
+import convex.core.cvm.transactions.Invoke;
+import convex.core.cvm.transactions.Transfer;
 import convex.core.data.ACell;
 import convex.core.data.Address;
 import convex.core.data.Keywords;
@@ -19,10 +23,6 @@
 import convex.core.lang.Symbols;
 import convex.core.lang.ops.Constant;
 import convex.core.lang.ops.Lookup;
-import convex.core.transactions.ATransaction;
-import convex.core.transactions.Call;
-import convex.core.transactions.Invoke;
-import convex.core.transactions.Transfer;
 
 
 /**
diff --git a/convex-benchmarks/src/main/java/convex/benchmarks/LatencyBenchmark.java b/convex-benchmarks/src/main/java/convex/benchmarks/LatencyBenchmark.java
index 804a2efb1..33d872416 100644
--- a/convex-benchmarks/src/main/java/convex/benchmarks/LatencyBenchmark.java
+++ b/convex-benchmarks/src/main/java/convex/benchmarks/LatencyBenchmark.java
@@ -15,9 +15,9 @@
 import convex.core.Coin;
 import convex.core.Result;
 import convex.core.crypto.AKeyPair;
+import convex.core.cvm.transactions.Invoke;
 import convex.core.data.Address;
 import convex.core.lang.ops.Constant;
-import convex.core.transactions.Invoke;
 import convex.peer.API;
 import convex.peer.Server;
 
diff --git a/convex-benchmarks/src/main/java/convex/benchmarks/LocalPeerBenchmark.java b/convex-benchmarks/src/main/java/convex/benchmarks/LocalPeerBenchmark.java
index 6c1fbf193..b82d43f09 100644
--- a/convex-benchmarks/src/main/java/convex/benchmarks/LocalPeerBenchmark.java
+++ b/convex-benchmarks/src/main/java/convex/benchmarks/LocalPeerBenchmark.java
@@ -14,6 +14,7 @@
 import convex.api.ConvexLocal;
 import convex.core.Result;
 import convex.core.cvm.State;
+import convex.core.cvm.transactions.Invoke;
 import convex.core.crypto.AKeyPair;
 import convex.core.data.ACell;
 import convex.core.data.AccountKey;
@@ -22,7 +23,6 @@
 import convex.core.init.Init;
 import convex.core.lang.Reader;
 import convex.core.lang.ops.Constant;
-import convex.core.transactions.Invoke;
 import convex.peer.API;
 import convex.peer.Server;
 
diff --git a/convex-cli/src/main/java/convex/cli/client/Transact.java b/convex-cli/src/main/java/convex/cli/client/Transact.java
index ce238f0fd..1cdbb16f7 100644
--- a/convex-cli/src/main/java/convex/cli/client/Transact.java
+++ b/convex-cli/src/main/java/convex/cli/client/Transact.java
@@ -10,12 +10,12 @@
 import convex.cli.CLIError;
 import convex.cli.ExitCodes;
 import convex.core.Result;
+import convex.core.cvm.transactions.ATransaction;
+import convex.core.cvm.transactions.Invoke;
 import convex.core.data.ACell;
 import convex.core.data.Address;
 import convex.core.data.Format;
 import convex.core.lang.Reader;
-import convex.core.transactions.ATransaction;
-import convex.core.transactions.Invoke;
 import convex.core.util.FileUtils;
 import picocli.CommandLine.Command;
 import picocli.CommandLine.Option;
diff --git a/convex-cli/src/main/java/convex/cli/peer/PeerCreate.java b/convex-cli/src/main/java/convex/cli/peer/PeerCreate.java
index 5370fba55..b95150228 100644
--- a/convex-cli/src/main/java/convex/cli/peer/PeerCreate.java
+++ b/convex-cli/src/main/java/convex/cli/peer/PeerCreate.java
@@ -14,12 +14,12 @@
 import convex.core.Result;
 import convex.core.crypto.AKeyPair;
 import convex.core.crypto.PFXTools;
+import convex.core.cvm.transactions.ATransaction;
+import convex.core.cvm.transactions.Invoke;
 import convex.core.data.ACell;
 import convex.core.data.Address;
 import convex.core.exceptions.ResultException;
 import convex.core.lang.Reader;
-import convex.core.transactions.ATransaction;
-import convex.core.transactions.Invoke;
 import picocli.CommandLine.Command;
 import picocli.CommandLine.Mixin;
 import picocli.CommandLine.Model.CommandSpec;
diff --git a/convex-gui/src/main/java/convex/gui/actor/SmartOpComponent.java b/convex-gui/src/main/java/convex/gui/actor/SmartOpComponent.java
index c770d3444..0ed94fa7e 100644
--- a/convex-gui/src/main/java/convex/gui/actor/SmartOpComponent.java
+++ b/convex-gui/src/main/java/convex/gui/actor/SmartOpComponent.java
@@ -18,6 +18,8 @@
 import convex.core.data.AList;
 import convex.core.data.AVector;
 import convex.core.cvm.AccountStatus;
+import convex.core.cvm.transactions.ATransaction;
+import convex.core.cvm.transactions.Invoke;
 import convex.core.data.Address;
 import convex.core.data.Lists;
 import convex.core.data.Symbol;
@@ -27,8 +29,6 @@
 import convex.core.lang.Reader;
 import convex.core.lang.Symbols;
 import convex.core.lang.impl.Fn;
-import convex.core.transactions.ATransaction;
-import convex.core.transactions.Invoke;
 import convex.gui.components.BaseListComponent;
 import convex.gui.components.CodeLabel;
 import convex.gui.components.Toast;
diff --git a/convex-gui/src/main/java/convex/gui/panels/REPLPanel.java b/convex-gui/src/main/java/convex/gui/panels/REPLPanel.java
index 0a189b660..67c46c84e 100644
--- a/convex-gui/src/main/java/convex/gui/panels/REPLPanel.java
+++ b/convex-gui/src/main/java/convex/gui/panels/REPLPanel.java
@@ -30,6 +30,7 @@
 import convex.api.ConvexRemote;
 import convex.core.Result;
 import convex.core.crypto.AKeyPair;
+import convex.core.cvm.transactions.ATransaction;
 import convex.core.data.ACell;
 import convex.core.data.AList;
 import convex.core.data.AString;
@@ -41,7 +42,6 @@
 import convex.core.lang.RT;
 import convex.core.lang.Reader;
 import convex.core.lang.Symbols;
-import convex.core.transactions.ATransaction;
 import convex.core.util.Utils;
 import convex.gui.components.ActionButton;
 import convex.gui.components.ActionPanel;
diff --git a/convex-gui/src/main/java/convex/gui/server/StressPanel.java b/convex-gui/src/main/java/convex/gui/server/StressPanel.java
index 172a5801a..34ba04105 100644
--- a/convex-gui/src/main/java/convex/gui/server/StressPanel.java
+++ b/convex-gui/src/main/java/convex/gui/server/StressPanel.java
@@ -31,16 +31,16 @@
 import convex.api.Convex;
 import convex.core.Result;
 import convex.core.crypto.AKeyPair;
+import convex.core.cvm.transactions.ATransaction;
+import convex.core.cvm.transactions.Invoke;
+import convex.core.cvm.transactions.Multi;
+import convex.core.cvm.transactions.Transfer;
 import convex.core.data.ACell;
 import convex.core.data.AVector;
 import convex.core.data.Address;
 import convex.core.data.Strings;
 import convex.core.lang.Reader;
 import convex.core.text.Text;
-import convex.core.transactions.ATransaction;
-import convex.core.transactions.Invoke;
-import convex.core.transactions.Multi;
-import convex.core.transactions.Transfer;
 import convex.core.util.ThreadUtils;
 import convex.core.util.Utils;
 import convex.gui.components.ActionPanel;
diff --git a/convex-java/src/main/java/convex/java/ConvexHTTP.java b/convex-java/src/main/java/convex/java/ConvexHTTP.java
index f634b69b1..62bfcd924 100644
--- a/convex-java/src/main/java/convex/java/ConvexHTTP.java
+++ b/convex-java/src/main/java/convex/java/ConvexHTTP.java
@@ -14,6 +14,7 @@
 import convex.core.Result;
 import convex.core.SourceCodes;
 import convex.core.crypto.AKeyPair;
+import convex.core.cvm.transactions.ATransaction;
 import convex.core.data.ACell;
 import convex.core.data.AMap;
 import convex.core.data.Address;
@@ -30,7 +31,6 @@
 import convex.core.lang.RT;
 import convex.core.lang.Reader;
 import convex.core.store.AStore;
-import convex.core.transactions.ATransaction;
 import convex.core.util.Utils;
 import convex.net.Message;
 
diff --git a/convex-observer/src/main/java/convex/observer/LogObserver.java b/convex-observer/src/main/java/convex/observer/LogObserver.java
index 572eef321..c2c139ec9 100644
--- a/convex-observer/src/main/java/convex/observer/LogObserver.java
+++ b/convex-observer/src/main/java/convex/observer/LogObserver.java
@@ -7,8 +7,8 @@
 import org.slf4j.LoggerFactory;
 
 import convex.core.Result;
+import convex.core.cvm.transactions.ATransaction;
 import convex.core.data.SignedData;
-import convex.core.transactions.ATransaction;
 import convex.peer.Server;
 
 public class LogObserver {
diff --git a/convex-observer/src/main/java/convex/observer/StrimziKafka.java b/convex-observer/src/main/java/convex/observer/StrimziKafka.java
index 92a25c866..ec729aec4 100644
--- a/convex-observer/src/main/java/convex/observer/StrimziKafka.java
+++ b/convex-observer/src/main/java/convex/observer/StrimziKafka.java
@@ -18,10 +18,10 @@
 import org.json.simple.JSONValue;
 
 import convex.core.cpos.Order;
+import convex.core.cvm.transactions.ATransaction;
 import convex.core.Result;
 import convex.core.data.SignedData;
 import convex.core.lang.RT;
-import convex.core.transactions.ATransaction;
 import convex.core.util.Shutdown;
 import convex.core.util.Utils;
 import convex.peer.Server;
diff --git a/convex-peer/src/main/java/convex/api/Convex.java b/convex-peer/src/main/java/convex/api/Convex.java
index 7c86a3aeb..04eb256b5 100644
--- a/convex-peer/src/main/java/convex/api/Convex.java
+++ b/convex-peer/src/main/java/convex/api/Convex.java
@@ -20,6 +20,9 @@
 import convex.core.crypto.AKeyPair;
 import convex.core.cvm.AccountStatus;
 import convex.core.cvm.State;
+import convex.core.cvm.transactions.ATransaction;
+import convex.core.cvm.transactions.Invoke;
+import convex.core.cvm.transactions.Transfer;
 import convex.core.data.ABlob;
 import convex.core.data.ACell;
 import convex.core.data.AList;
@@ -40,9 +43,6 @@
 import convex.core.lang.ops.Special;
 import convex.core.store.AStore;
 import convex.core.store.Stores;
-import convex.core.transactions.ATransaction;
-import convex.core.transactions.Invoke;
-import convex.core.transactions.Transfer;
 import convex.core.util.Utils;
 import convex.net.IPUtils;
 import convex.net.Message;
diff --git a/convex-peer/src/main/java/convex/api/ConvexLocal.java b/convex-peer/src/main/java/convex/api/ConvexLocal.java
index 44cfc9558..7bbd83e26 100644
--- a/convex-peer/src/main/java/convex/api/ConvexLocal.java
+++ b/convex-peer/src/main/java/convex/api/ConvexLocal.java
@@ -11,6 +11,7 @@
 import convex.core.crypto.AKeyPair;
 import convex.core.cvm.AccountStatus;
 import convex.core.cvm.State;
+import convex.core.cvm.transactions.ATransaction;
 import convex.core.data.ACell;
 import convex.core.data.Address;
 import convex.core.data.Blob;
@@ -22,7 +23,6 @@
 import convex.core.data.prim.CVMLong;
 import convex.core.exceptions.MissingDataException;
 import convex.core.store.AStore;
-import convex.core.transactions.ATransaction;
 import convex.core.util.ThreadUtils;
 import convex.net.Message;
 import convex.net.MessageType;
diff --git a/convex-peer/src/main/java/convex/api/ConvexRemote.java b/convex-peer/src/main/java/convex/api/ConvexRemote.java
index fb051497b..eb5141efb 100644
--- a/convex-peer/src/main/java/convex/api/ConvexRemote.java
+++ b/convex-peer/src/main/java/convex/api/ConvexRemote.java
@@ -13,6 +13,7 @@
 import convex.core.SourceCodes;
 import convex.core.crypto.AKeyPair;
 import convex.core.cvm.State;
+import convex.core.cvm.transactions.ATransaction;
 import convex.core.data.ACell;
 import convex.core.data.Address;
 import convex.core.data.Blob;
@@ -25,7 +26,6 @@
 import convex.core.lang.RT;
 import convex.core.store.AStore;
 import convex.core.store.Stores;
-import convex.core.transactions.ATransaction;
 import convex.net.Connection;
 import convex.net.Message;
 import convex.peer.Server;
diff --git a/convex-peer/src/main/java/convex/net/Connection.java b/convex-peer/src/main/java/convex/net/Connection.java
index b542827c2..340aeaa05 100644
--- a/convex-peer/src/main/java/convex/net/Connection.java
+++ b/convex-peer/src/main/java/convex/net/Connection.java
@@ -23,6 +23,7 @@
 
 import convex.core.Constants;
 import convex.core.Result;
+import convex.core.cvm.transactions.ATransaction;
 import convex.core.data.ACell;
 import convex.core.data.AccountKey;
 import convex.core.data.AVector;
@@ -38,7 +39,6 @@
 import convex.core.exceptions.BadFormatException;
 import convex.core.store.AStore;
 import convex.core.store.Stores;
-import convex.core.transactions.ATransaction;
 import convex.core.util.Counters;
 import convex.core.util.Utils;
 import convex.core.util.Shutdown;
diff --git a/convex-peer/src/main/java/convex/peer/TransactionHandler.java b/convex-peer/src/main/java/convex/peer/TransactionHandler.java
index 113daf34f..c392b65a3 100644
--- a/convex-peer/src/main/java/convex/peer/TransactionHandler.java
+++ b/convex-peer/src/main/java/convex/peer/TransactionHandler.java
@@ -23,6 +23,8 @@
 import convex.core.cvm.Peer;
 import convex.core.cvm.PeerStatus;
 import convex.core.cvm.State;
+import convex.core.cvm.transactions.ATransaction;
+import convex.core.cvm.transactions.Invoke;
 import convex.core.data.ACell;
 import convex.core.data.AString;
 import convex.core.data.AVector;
@@ -40,8 +42,6 @@
 import convex.core.exceptions.MissingDataException;
 import convex.core.lang.RT;
 import convex.core.lang.Reader;
-import convex.core.transactions.ATransaction;
-import convex.core.transactions.Invoke;
 import convex.core.util.LoadMonitor;
 import convex.core.util.Utils;
 import convex.net.Message;
diff --git a/convex-peer/src/test/java/convex/api/ConvexLocalTest.java b/convex-peer/src/test/java/convex/api/ConvexLocalTest.java
index 3465608d1..5d864a708 100644
--- a/convex-peer/src/test/java/convex/api/ConvexLocalTest.java
+++ b/convex-peer/src/test/java/convex/api/ConvexLocalTest.java
@@ -18,6 +18,8 @@
 import convex.core.Result;
 import convex.core.crypto.AKeyPair;
 import convex.core.crypto.Ed25519Signature;
+import convex.core.cvm.transactions.ATransaction;
+import convex.core.cvm.transactions.Invoke;
 import convex.core.data.ABlob;
 import convex.core.data.ACell;
 import convex.core.data.Address;
@@ -27,8 +29,6 @@
 import convex.core.exceptions.ResultException;
 import convex.core.lang.Reader;
 import convex.core.lang.ops.Constant;
-import convex.core.transactions.ATransaction;
-import convex.core.transactions.Invoke;
 import convex.net.Message;
 import convex.peer.TestNetwork;
 
diff --git a/convex-peer/src/test/java/convex/api/ConvexRemoteTest.java b/convex-peer/src/test/java/convex/api/ConvexRemoteTest.java
index 5bc6984ea..1b73b0f2c 100644
--- a/convex-peer/src/test/java/convex/api/ConvexRemoteTest.java
+++ b/convex-peer/src/test/java/convex/api/ConvexRemoteTest.java
@@ -21,6 +21,8 @@
 import convex.core.SourceCodes;
 import convex.core.crypto.AKeyPair;
 import convex.core.crypto.Ed25519Signature;
+import convex.core.cvm.transactions.ATransaction;
+import convex.core.cvm.transactions.Invoke;
 import convex.core.data.Address;
 import convex.core.data.Blobs;
 import convex.core.data.Ref;
@@ -30,8 +32,6 @@
 import convex.core.lang.RT;
 import convex.core.lang.Reader;
 import convex.core.lang.ops.Constant;
-import convex.core.transactions.ATransaction;
-import convex.core.transactions.Invoke;
 import convex.net.Connection;
 import convex.net.Message;
 import convex.net.MessageType;
diff --git a/convex-peer/src/test/java/convex/peer/JoinNetworkTest.java b/convex-peer/src/test/java/convex/peer/JoinNetworkTest.java
index 5477f4bcb..39907207c 100644
--- a/convex-peer/src/test/java/convex/peer/JoinNetworkTest.java
+++ b/convex-peer/src/test/java/convex/peer/JoinNetworkTest.java
@@ -16,6 +16,7 @@
 import convex.core.Result;
 import convex.core.cpos.CPoSConstants;
 import convex.core.crypto.AKeyPair;
+import convex.core.cvm.transactions.Invoke;
 import convex.core.data.AccountKey;
 import convex.core.data.Address;
 import convex.core.data.Keyword;
@@ -23,7 +24,6 @@
 import convex.core.exceptions.BadSignatureException;
 import convex.core.exceptions.ResultException;
 import convex.core.lang.RT;
-import convex.core.transactions.Invoke;
 import convex.etch.EtchStore;
 
 public class JoinNetworkTest {
diff --git a/convex-peer/src/test/java/convex/peer/RestoreTest.java b/convex-peer/src/test/java/convex/peer/RestoreTest.java
index 001ab4d68..2c06251db 100644
--- a/convex-peer/src/test/java/convex/peer/RestoreTest.java
+++ b/convex-peer/src/test/java/convex/peer/RestoreTest.java
@@ -18,6 +18,7 @@
 import convex.core.Result;
 import convex.core.crypto.AKeyPair;
 import convex.core.cvm.State;
+import convex.core.cvm.transactions.Invoke;
 import convex.core.data.AccountKey;
 import convex.core.data.Address;
 import convex.core.data.Keyword;
@@ -28,7 +29,6 @@
 import convex.core.init.Init;
 import convex.core.lang.Symbols;
 import convex.core.store.AStore;
-import convex.core.transactions.Invoke;
 import convex.etch.Etch;
 import convex.etch.EtchStore;
 import convex.etch.EtchUtils;
diff --git a/convex-peer/src/test/java/convex/peer/ServerTest.java b/convex-peer/src/test/java/convex/peer/ServerTest.java
index 4cf3666d4..867062e0b 100644
--- a/convex-peer/src/test/java/convex/peer/ServerTest.java
+++ b/convex-peer/src/test/java/convex/peer/ServerTest.java
@@ -23,6 +23,8 @@
 import convex.core.cpos.Belief;
 import convex.core.crypto.AKeyPair;
 import convex.core.cvm.State;
+import convex.core.cvm.transactions.ATransaction;
+import convex.core.cvm.transactions.Invoke;
 import convex.core.data.ACell;
 import convex.core.data.AVector;
 import convex.core.data.Address;
@@ -41,8 +43,6 @@
 import convex.core.lang.Symbols;
 import convex.core.store.AStore;
 import convex.core.store.Stores;
-import convex.core.transactions.ATransaction;
-import convex.core.transactions.Invoke;
 import convex.net.Connection;
 
 /**
diff --git a/convex-restapi/src/main/java/convex/restapi/api/ChainAPI.java b/convex-restapi/src/main/java/convex/restapi/api/ChainAPI.java
index fa8674beb..7bd58540a 100644
--- a/convex-restapi/src/main/java/convex/restapi/api/ChainAPI.java
+++ b/convex-restapi/src/main/java/convex/restapi/api/ChainAPI.java
@@ -33,6 +33,8 @@
 import convex.core.data.Keywords;
 import convex.core.data.Lists;
 import convex.core.cvm.PeerStatus;
+import convex.core.cvm.transactions.ATransaction;
+import convex.core.cvm.transactions.Invoke;
 import convex.core.data.Ref;
 import convex.core.data.SignedData;
 import convex.core.data.Strings;
@@ -44,8 +46,6 @@
 import convex.core.lang.RT;
 import convex.core.lang.Reader;
 import convex.core.lang.Symbols;
-import convex.core.transactions.ATransaction;
-import convex.core.transactions.Invoke;
 import convex.core.util.Utils;
 import convex.java.JSON;
 import convex.restapi.RESTServer;