Remove redundant package

29 files changed, 42 insertions, 51 deletions

diff --git a/src/test/java/org/shedlang/compiler/backends/llvm/PatioToLlvmTests.java b/src/test/java/org/shedlang/compiler/backends/llvm/PatioToLlvmTests.java
index 84083666..592a54a4 100644
--- a/src/test/java/org/shedlang/compiler/backends/llvm/PatioToLlvmTests.java
+++ b/src/test/java/org/shedlang/compiler/backends/llvm/PatioToLlvmTests.java
@@ -12,7 +12,7 @@ import org.shedlang.compiler.backends.llvm.ir.ast.operands.LlvmVariableLocal;
 import org.shedlang.compiler.backends.llvm.ir.ast.types.LlvmTypes;
 import org.shedlang.compiler.backends.paths.PartialTargetPath;
 import org.shedlang.compiler.patio.PatioExampleTests;
-import org.shedlang.compiler.patio.ast.PatioCompilationUnit;
+import org.shedlang.compiler.patio.PatioCompilationUnit;
 import org.shedlang.compiler.testing.ExecutionResult;
 import org.shedlang.compiler.testing.TestProcessRunner;
 
diff --git a/src/test/java/org/shedlang/compiler/backends/wasm/PatioToWasmTests.java b/src/test/java/org/shedlang/compiler/backends/wasm/PatioToWasmTests.java
index b5a10d11..34c8e0f7 100644
--- a/src/test/java/org/shedlang/compiler/backends/wasm/PatioToWasmTests.java
+++ b/src/test/java/org/shedlang/compiler/backends/wasm/PatioToWasmTests.java
@@ -11,7 +11,7 @@ import org.shedlang.compiler.backends.wasm.structure.ast.types.WasmFuncType;
 import org.shedlang.compiler.backends.wasm.structure.ast.types.WasmValueType;
 import org.shedlang.compiler.backends.wasm.structure.binary.WasmBinaryFormatTesting;
 import org.shedlang.compiler.patio.PatioExampleTests;
-import org.shedlang.compiler.patio.ast.PatioCompilationUnit;
+import org.shedlang.compiler.patio.PatioCompilationUnit;
 import org.shedlang.compiler.testing.ExecutionResult;
 import org.shedlang.compiler.testing.TestProcessRunner;
 import org.shedlang.compiler.util.Lists;
diff --git a/src/test/java/org/shedlang/compiler/patio/PatioExampleTests.java b/src/test/java/org/shedlang/compiler/patio/PatioExampleTests.java
index 95354c51..1a6813d4 100644
--- a/src/test/java/org/shedlang/compiler/patio/PatioExampleTests.java
+++ b/src/test/java/org/shedlang/compiler/patio/PatioExampleTests.java
@@ -1,10 +1,8 @@
 package org.shedlang.compiler.patio;
 
 import org.junit.jupiter.api.Test;
-import org.shedlang.compiler.patio.ast.PatioCompilationUnit;
-import org.shedlang.compiler.patio.ast.PatioFunctionDefinition;
-import org.shedlang.compiler.patio.ast.types.PatioDataLayouts;
-import org.shedlang.compiler.patio.ast.types.PatioTypes;
+import org.shedlang.compiler.patio.types.PatioDataLayouts;
+import org.shedlang.compiler.patio.types.PatioTypes;
 import org.shedlang.compiler.patio.instructions.Patio;
 import org.shedlang.compiler.testing.ExecutionResult;
 import org.zwobble.precisely.Matcher;
diff --git a/src/test/java/org/shedlang/compiler/patio/PatioSerializerTests.java b/src/test/java/org/shedlang/compiler/patio/PatioSerializerTests.java
index 00bf8c4f..2c77fef8 100644
--- a/src/test/java/org/shedlang/compiler/patio/PatioSerializerTests.java
+++ b/src/test/java/org/shedlang/compiler/patio/PatioSerializerTests.java
@@ -1,12 +1,9 @@
 package org.shedlang.compiler.patio;
 
 import org.junit.jupiter.api.Test;
-import org.shedlang.compiler.patio.ast.PatioFunctionDeclaration;
-import org.shedlang.compiler.patio.ast.PatioFunctionDefinition;
-import org.shedlang.compiler.patio.ast.PatioVisibility;
-import org.shedlang.compiler.patio.ast.types.PatioDataLayouts;
-import org.shedlang.compiler.patio.ast.types.PatioDataValues;
-import org.shedlang.compiler.patio.ast.types.PatioTypes;
+import org.shedlang.compiler.patio.types.PatioDataLayouts;
+import org.shedlang.compiler.patio.types.PatioDataValues;
+import org.shedlang.compiler.patio.types.PatioTypes;
 import org.shedlang.compiler.patio.instructions.Patio;
 
 import java.util.List;
diff --git a/src/test/java/org/shedlang/compiler/patio/PatioTesting.java b/src/test/java/org/shedlang/compiler/patio/PatioTesting.java
index ddebca23..d787ba06 100644
--- a/src/test/java/org/shedlang/compiler/patio/PatioTesting.java
+++ b/src/test/java/org/shedlang/compiler/patio/PatioTesting.java
@@ -1,13 +1,10 @@
 package org.shedlang.compiler.patio;
 
-import org.shedlang.compiler.patio.ast.PatioCompilationUnit;
-import org.shedlang.compiler.patio.ast.PatioCompilationUnitElement;
-import org.shedlang.compiler.patio.ast.PatioSerializer;
-import org.shedlang.compiler.patio.ast.instructions.PatioInstruction;
-import org.shedlang.compiler.patio.ast.operands.PatioOperand;
-import org.shedlang.compiler.patio.ast.types.PatioDataLayout;
-import org.shedlang.compiler.patio.ast.types.PatioDataValue;
-import org.shedlang.compiler.patio.ast.types.PatioType;
+import org.shedlang.compiler.patio.instructions.PatioInstruction;
+import org.shedlang.compiler.patio.operands.PatioOperand;
+import org.shedlang.compiler.patio.types.PatioDataLayout;
+import org.shedlang.compiler.patio.types.PatioDataValue;
+import org.shedlang.compiler.patio.types.PatioType;
 
 public class PatioTesting {
     private PatioTesting() {}
diff --git a/src/test/java/org/shedlang/compiler/patio/instructions/Patio.java b/src/test/java/org/shedlang/compiler/patio/instructions/Patio.java
index b7547435..e8897cbd 100644
--- a/src/test/java/org/shedlang/compiler/patio/instructions/Patio.java
+++ b/src/test/java/org/shedlang/compiler/patio/instructions/Patio.java
@@ -1,11 +1,10 @@
 package org.shedlang.compiler.patio.instructions;
 
-import org.shedlang.compiler.patio.ast.*;
-import org.shedlang.compiler.patio.ast.instructions.*;
-import org.shedlang.compiler.patio.ast.operands.*;
-import org.shedlang.compiler.patio.ast.types.PatioDataLayout;
-import org.shedlang.compiler.patio.ast.types.PatioDataValue;
-import org.shedlang.compiler.patio.ast.types.PatioType;
+import org.shedlang.compiler.patio.*;
+import org.shedlang.compiler.patio.operands.*;
+import org.shedlang.compiler.patio.types.PatioDataLayout;
+import org.shedlang.compiler.patio.types.PatioDataValue;
+import org.shedlang.compiler.patio.types.PatioType;
 import org.shedlang.compiler.sources.Sources;
 
 import java.util.List;
diff --git a/src/test/java/org/shedlang/compiler/shidtopatio/ShidToPatioCallTests.java b/src/test/java/org/shedlang/compiler/shidtopatio/ShidToPatioCallTests.java
index 3ce22459..24ea7bbf 100644
--- a/src/test/java/org/shedlang/compiler/shidtopatio/ShidToPatioCallTests.java
+++ b/src/test/java/org/shedlang/compiler/shidtopatio/ShidToPatioCallTests.java
@@ -2,7 +2,7 @@ package org.shedlang.compiler.shidtopatio;
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
-import org.shedlang.compiler.patio.ast.operands.PatioLocalRef;
+import org.shedlang.compiler.patio.operands.PatioLocalRef;
 import org.shedlang.compiler.shid.instructions.Shid;
 import org.shedlang.compiler.testing.snapshots.SnapshotResolver;
 import org.shedlang.compiler.testing.snapshots.Snapshotter;
diff --git a/src/test/java/org/shedlang/compiler/shidtopatio/ShidToPatioContextTests.java b/src/test/java/org/shedlang/compiler/shidtopatio/ShidToPatioContextTests.java
index b8bf1da5..23817a19 100644
--- a/src/test/java/org/shedlang/compiler/shidtopatio/ShidToPatioContextTests.java
+++ b/src/test/java/org/shedlang/compiler/shidtopatio/ShidToPatioContextTests.java
@@ -1,8 +1,8 @@
 package org.shedlang.compiler.shidtopatio;
 
 import org.junit.jupiter.api.Test;
-import org.shedlang.compiler.patio.ast.PatioDataElementImmutable;
-import org.shedlang.compiler.patio.ast.types.PatioDataValues;
+import org.shedlang.compiler.patio.PatioDataElementImmutable;
+import org.shedlang.compiler.patio.types.PatioDataValues;
 import org.shedlang.compiler.shidtopatio.errors.DuplicateCompilationUnitElementName;
 import org.shedlang.compiler.sources.Sources;
 
diff --git a/src/test/java/org/shedlang/compiler/shidtopatio/ShidToPatioDefineFunctionTests.java b/src/test/java/org/shedlang/compiler/shidtopatio/ShidToPatioDefineFunctionTests.java
index 12db80c6..797a8442 100644
--- a/src/test/java/org/shedlang/compiler/shidtopatio/ShidToPatioDefineFunctionTests.java
+++ b/src/test/java/org/shedlang/compiler/shidtopatio/ShidToPatioDefineFunctionTests.java
@@ -3,7 +3,7 @@ package org.shedlang.compiler.shidtopatio;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.shedlang.compiler.ast.typed.FreeVariables;
-import org.shedlang.compiler.patio.ast.types.PatioTypes;
+import org.shedlang.compiler.patio.types.PatioTypes;
 import org.shedlang.compiler.patio.instructions.Patio;
 import org.shedlang.compiler.sources.Sources;
 import org.shedlang.compiler.shid.instructions.ShidDefineFunction;
diff --git a/src/test/java/org/shedlang/compiler/shidtopatio/ShidToPatioDiscardTests.java b/src/test/java/org/shedlang/compiler/shidtopatio/ShidToPatioDiscardTests.java
index a8d1a7fe..5dfe451b 100644
--- a/src/test/java/org/shedlang/compiler/shidtopatio/ShidToPatioDiscardTests.java
+++ b/src/test/java/org/shedlang/compiler/shidtopatio/ShidToPatioDiscardTests.java
@@ -2,7 +2,7 @@ package org.shedlang.compiler.shidtopatio;
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
-import org.shedlang.compiler.patio.ast.operands.PatioLocalRef;
+import org.shedlang.compiler.patio.operands.PatioLocalRef;
 import org.shedlang.compiler.shid.instructions.Shid;
 import org.shedlang.compiler.testing.snapshots.SnapshotResolver;
 import org.shedlang.compiler.testing.snapshots.Snapshotter;
diff --git a/src/test/java/org/shedlang/compiler/shidtopatio/ShidToPatioEffectHandlerBreakTests.java b/src/test/java/org/shedlang/compiler/shidtopatio/ShidToPatioEffectHandlerBreakTests.java
index 5becfc12..5d28002b 100644
--- a/src/test/java/org/shedlang/compiler/shidtopatio/ShidToPatioEffectHandlerBreakTests.java
+++ b/src/test/java/org/shedlang/compiler/shidtopatio/ShidToPatioEffectHandlerBreakTests.java
@@ -2,7 +2,7 @@ package org.shedlang.compiler.shidtopatio;
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
-import org.shedlang.compiler.patio.ast.operands.PatioLocalRef;
+import org.shedlang.compiler.patio.operands.PatioLocalRef;
 import org.shedlang.compiler.shid.instructions.Shid;
 import org.shedlang.compiler.testing.snapshots.SnapshotResolver;
 import org.shedlang.compiler.testing.snapshots.Snapshotter;
diff --git a/src/test/java/org/shedlang/compiler/shidtopatio/ShidToPatioFieldLoadTests.java b/src/test/java/org/shedlang/compiler/shidtopatio/ShidToPatioFieldLoadTests.java
index 8b5db2b7..3f5fd284 100644
--- a/src/test/java/org/shedlang/compiler/shidtopatio/ShidToPatioFieldLoadTests.java
+++ b/src/test/java/org/shedlang/compiler/shidtopatio/ShidToPatioFieldLoadTests.java
@@ -2,7 +2,7 @@ package org.shedlang.compiler.shidtopatio;
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
-import org.shedlang.compiler.patio.ast.operands.PatioLocalRef;
+import org.shedlang.compiler.patio.operands.PatioLocalRef;
 import org.shedlang.compiler.shid.instructions.Shid;
 import org.shedlang.compiler.testing.snapshots.SnapshotResolver;
 import org.shedlang.compiler.testing.snapshots.Snapshotter;
diff --git a/src/test/java/org/shedlang/compiler/shidtopatio/ShidToPatioIfTests.java b/src/test/java/org/shedlang/compiler/shidtopatio/ShidToPatioIfTests.java
index 8c409f93..72127995 100644
--- a/src/test/java/org/shedlang/compiler/shidtopatio/ShidToPatioIfTests.java
+++ b/src/test/java/org/shedlang/compiler/shidtopatio/ShidToPatioIfTests.java
@@ -2,7 +2,7 @@ package org.shedlang.compiler.shidtopatio;
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
-import org.shedlang.compiler.patio.ast.operands.PatioLocalRef;
+import org.shedlang.compiler.patio.operands.PatioLocalRef;
 import org.shedlang.compiler.shid.instructions.Shid;
 import org.shedlang.compiler.testing.snapshots.SnapshotResolver;
 import org.shedlang.compiler.testing.snapshots.Snapshotter;
diff --git a/src/test/java/org/shedlang/compiler/shidtopatio/ShidToPatioIntAddTests.java b/src/test/java/org/shedlang/compiler/shidtopatio/ShidToPatioIntAddTests.java
index e8d2f255..cbc47464 100644
--- a/src/test/java/org/shedlang/compiler/shidtopatio/ShidToPatioIntAddTests.java
+++ b/src/test/java/org/shedlang/compiler/shidtopatio/ShidToPatioIntAddTests.java
@@ -2,7 +2,7 @@ package org.shedlang.compiler.shidtopatio;
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
-import org.shedlang.compiler.patio.ast.operands.PatioLocalRef;
+import org.shedlang.compiler.patio.operands.PatioLocalRef;
 import org.shedlang.compiler.shid.instructions.Shid;
 import org.shedlang.compiler.testing.snapshots.SnapshotResolver;
 import org.shedlang.compiler.testing.snapshots.Snapshotter;
diff --git a/src/test/java/org/shedlang/compiler/shidtopatio/ShidToPatioIntEqualsTests.java b/src/test/java/org/shedlang/compiler/shidtopatio/ShidToPatioIntEqualsTests.java
index 25c315a2..ccfb8480 100644
--- a/src/test/java/org/shedlang/compiler/shidtopatio/ShidToPatioIntEqualsTests.java
+++ b/src/test/java/org/shedlang/compiler/shidtopatio/ShidToPatioIntEqualsTests.java
@@ -2,7 +2,7 @@ package org.shedlang.compiler.shidtopatio;
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
-import org.shedlang.compiler.patio.ast.operands.PatioLocalRef;
+import org.shedlang.compiler.patio.operands.PatioLocalRef;
 import org.shedlang.compiler.shid.instructions.Shid;
 import org.shedlang.compiler.testing.snapshots.SnapshotResolver;
 import org.shedlang.compiler.testing.snapshots.Snapshotter;
diff --git a/src/test/java/org/shedlang/compiler/shidtopatio/ShidToPatioIntNotEqualTests.java b/src/test/java/org/shedlang/compiler/shidtopatio/ShidToPatioIntNotEqualTests.java
index 9a02fda1..a1701a52 100644
--- a/src/test/java/org/shedlang/compiler/shidtopatio/ShidToPatioIntNotEqualTests.java
+++ b/src/test/java/org/shedlang/compiler/shidtopatio/ShidToPatioIntNotEqualTests.java
@@ -2,7 +2,7 @@ package org.shedlang.compiler.shidtopatio;
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
-import org.shedlang.compiler.patio.ast.operands.PatioLocalRef;
+import org.shedlang.compiler.patio.operands.PatioLocalRef;
 import org.shedlang.compiler.shid.instructions.Shid;
 import org.shedlang.compiler.testing.snapshots.SnapshotResolver;
 import org.shedlang.compiler.testing.snapshots.Snapshotter;
diff --git a/src/test/java/org/shedlang/compiler/shidtopatio/ShidToPatioIntSubTests.java b/src/test/java/org/shedlang/compiler/shidtopatio/ShidToPatioIntSubTests.java
index 5d958883..473f015d 100644
--- a/src/test/java/org/shedlang/compiler/shidtopatio/ShidToPatioIntSubTests.java
+++ b/src/test/java/org/shedlang/compiler/shidtopatio/ShidToPatioIntSubTests.java
@@ -2,7 +2,7 @@ package org.shedlang.compiler.shidtopatio;
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
-import org.shedlang.compiler.patio.ast.operands.PatioLocalRef;
+import org.shedlang.compiler.patio.operands.PatioLocalRef;
 import org.shedlang.compiler.shid.instructions.Shid;
 import org.shedlang.compiler.testing.snapshots.SnapshotResolver;
 import org.shedlang.compiler.testing.snapshots.Snapshotter;
diff --git a/src/test/java/org/shedlang/compiler/shidtopatio/ShidToPatioLocalStoreTests.java b/src/test/java/org/shedlang/compiler/shidtopatio/ShidToPatioLocalStoreTests.java
index 5b070142..73b3d14f 100644
--- a/src/test/java/org/shedlang/compiler/shidtopatio/ShidToPatioLocalStoreTests.java
+++ b/src/test/java/org/shedlang/compiler/shidtopatio/ShidToPatioLocalStoreTests.java
@@ -2,7 +2,7 @@ package org.shedlang.compiler.shidtopatio;
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
-import org.shedlang.compiler.patio.ast.operands.PatioLocalRef;
+import org.shedlang.compiler.patio.operands.PatioLocalRef;
 import org.shedlang.compiler.shid.instructions.Shid;
 import org.shedlang.compiler.testing.snapshots.SnapshotResolver;
 import org.shedlang.compiler.testing.snapshots.Snapshotter;
diff --git a/src/test/java/org/shedlang/compiler/shidtopatio/ShidToPatioNamespaceFieldStoreTests.java b/src/test/java/org/shedlang/compiler/shidtopatio/ShidToPatioNamespaceFieldStoreTests.java
index 3d9d4691..c57f9572 100644
--- a/src/test/java/org/shedlang/compiler/shidtopatio/ShidToPatioNamespaceFieldStoreTests.java
+++ b/src/test/java/org/shedlang/compiler/shidtopatio/ShidToPatioNamespaceFieldStoreTests.java
@@ -2,7 +2,7 @@ package org.shedlang.compiler.shidtopatio;
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
-import org.shedlang.compiler.patio.ast.operands.PatioLocalRef;
+import org.shedlang.compiler.patio.operands.PatioLocalRef;
 import org.shedlang.compiler.shid.instructions.Shid;
 import org.shedlang.compiler.testing.snapshots.SnapshotResolver;
 import org.shedlang.compiler.testing.snapshots.Snapshotter;
diff --git a/src/test/java/org/shedlang/compiler/shidtopatio/ShidToPatioResumeTests.java b/src/test/java/org/shedlang/compiler/shidtopatio/ShidToPatioResumeTests.java
index 87a4ca86..e90670d1 100644
--- a/src/test/java/org/shedlang/compiler/shidtopatio/ShidToPatioResumeTests.java
+++ b/src/test/java/org/shedlang/compiler/shidtopatio/ShidToPatioResumeTests.java
@@ -2,7 +2,7 @@ package org.shedlang.compiler.shidtopatio;
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
-import org.shedlang.compiler.patio.ast.operands.PatioLocalRef;
+import org.shedlang.compiler.patio.operands.PatioLocalRef;
 import org.shedlang.compiler.shid.instructions.Shid;
 import org.shedlang.compiler.testing.snapshots.SnapshotResolver;
 import org.shedlang.compiler.testing.snapshots.Snapshotter;
diff --git a/src/test/java/org/shedlang/compiler/shidtopatio/ShidToPatioReturnTests.java b/src/test/java/org/shedlang/compiler/shidtopatio/ShidToPatioReturnTests.java
index ae8194ee..ce86605d 100644
--- a/src/test/java/org/shedlang/compiler/shidtopatio/ShidToPatioReturnTests.java
+++ b/src/test/java/org/shedlang/compiler/shidtopatio/ShidToPatioReturnTests.java
@@ -2,7 +2,7 @@ package org.shedlang.compiler.shidtopatio;
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
-import org.shedlang.compiler.patio.ast.operands.PatioLocalRef;
+import org.shedlang.compiler.patio.operands.PatioLocalRef;
 import org.shedlang.compiler.shid.instructions.Shid;
 import org.shedlang.compiler.testing.snapshots.SnapshotResolver;
 import org.shedlang.compiler.testing.snapshots.Snapshotter;
diff --git a/src/test/java/org/shedlang/compiler/shidtopatio/ShidToPatioStringAddTests.java b/src/test/java/org/shedlang/compiler/shidtopatio/ShidToPatioStringAddTests.java
index 0fe97285..d545ba1f 100644
--- a/src/test/java/org/shedlang/compiler/shidtopatio/ShidToPatioStringAddTests.java
+++ b/src/test/java/org/shedlang/compiler/shidtopatio/ShidToPatioStringAddTests.java
@@ -2,7 +2,7 @@ package org.shedlang.compiler.shidtopatio;
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
-import org.shedlang.compiler.patio.ast.operands.PatioLocalRef;
+import org.shedlang.compiler.patio.operands.PatioLocalRef;
 import org.shedlang.compiler.shid.instructions.Shid;
 import org.shedlang.compiler.testing.snapshots.SnapshotResolver;
 import org.shedlang.compiler.testing.snapshots.Snapshotter;
diff --git a/src/test/java/org/shedlang/compiler/shidtopatio/ShidToPatioSwitchTests.java b/src/test/java/org/shedlang/compiler/shidtopatio/ShidToPatioSwitchTests.java
index f98e7ef6..b22e7572 100644
--- a/src/test/java/org/shedlang/compiler/shidtopatio/ShidToPatioSwitchTests.java
+++ b/src/test/java/org/shedlang/compiler/shidtopatio/ShidToPatioSwitchTests.java
@@ -2,7 +2,7 @@ package org.shedlang.compiler.shidtopatio;
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
-import org.shedlang.compiler.patio.ast.operands.PatioLocalRef;
+import org.shedlang.compiler.patio.operands.PatioLocalRef;
 import org.shedlang.compiler.shid.instructions.Shid;
 import org.shedlang.compiler.testing.snapshots.SnapshotResolver;
 import org.shedlang.compiler.testing.snapshots.Snapshotter;
diff --git a/src/test/java/org/shedlang/compiler/shidtopatio/ShidToPatioTesting.java b/src/test/java/org/shedlang/compiler/shidtopatio/ShidToPatioTesting.java
index 3f3df6d2..644371eb 100644
--- a/src/test/java/org/shedlang/compiler/shidtopatio/ShidToPatioTesting.java
+++ b/src/test/java/org/shedlang/compiler/shidtopatio/ShidToPatioTesting.java
@@ -1,6 +1,6 @@
 package org.shedlang.compiler.shidtopatio;
 
-import org.shedlang.compiler.patio.ast.PatioSerializer;
+import org.shedlang.compiler.patio.PatioSerializer;
 
 class ShidToPatioTesting {
     private ShidToPatioTesting() {}
diff --git a/src/test/java/org/shedlang/compiler/shidtopatio/ShidToPatioTryTests.java b/src/test/java/org/shedlang/compiler/shidtopatio/ShidToPatioTryTests.java
index a89c5725..5166449d 100644
--- a/src/test/java/org/shedlang/compiler/shidtopatio/ShidToPatioTryTests.java
+++ b/src/test/java/org/shedlang/compiler/shidtopatio/ShidToPatioTryTests.java
@@ -2,7 +2,7 @@ package org.shedlang.compiler.shidtopatio;
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
-import org.shedlang.compiler.patio.ast.operands.PatioLocalRef;
+import org.shedlang.compiler.patio.operands.PatioLocalRef;
 import org.shedlang.compiler.shid.instructions.Shid;
 import org.shedlang.compiler.testing.snapshots.SnapshotResolver;
 import org.shedlang.compiler.testing.snapshots.Snapshotter;
diff --git a/src/test/java/org/shedlang/compiler/shidtopatio/ShidToPatioTupleCreateTests.java b/src/test/java/org/shedlang/compiler/shidtopatio/ShidToPatioTupleCreateTests.java
index 0187d719..7d04f0e2 100644
--- a/src/test/java/org/shedlang/compiler/shidtopatio/ShidToPatioTupleCreateTests.java
+++ b/src/test/java/org/shedlang/compiler/shidtopatio/ShidToPatioTupleCreateTests.java
@@ -2,7 +2,7 @@ package org.shedlang.compiler.shidtopatio;
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
-import org.shedlang.compiler.patio.ast.operands.PatioLocalRef;
+import org.shedlang.compiler.patio.operands.PatioLocalRef;
 import org.shedlang.compiler.shid.instructions.Shid;
 import org.shedlang.compiler.testing.snapshots.SnapshotResolver;
 import org.shedlang.compiler.testing.snapshots.Snapshotter;
diff --git a/src/test/java/org/shedlang/compiler/shidtopatio/ShidToPatioTupleGetTests.java b/src/test/java/org/shedlang/compiler/shidtopatio/ShidToPatioTupleGetTests.java
index a19ac6e9..4bc7f3ca 100644
--- a/src/test/java/org/shedlang/compiler/shidtopatio/ShidToPatioTupleGetTests.java
+++ b/src/test/java/org/shedlang/compiler/shidtopatio/ShidToPatioTupleGetTests.java
@@ -2,7 +2,7 @@ package org.shedlang.compiler.shidtopatio;
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
-import org.shedlang.compiler.patio.ast.operands.PatioLocalRef;
+import org.shedlang.compiler.patio.operands.PatioLocalRef;
 import org.shedlang.compiler.shid.instructions.Shid;
 import org.shedlang.compiler.testing.snapshots.SnapshotResolver;
 import org.shedlang.compiler.testing.snapshots.Snapshotter;
diff --git a/src/test/java/org/shedlang/compiler/shidtopatio/ShidToPatioVarLoadTests.java b/src/test/java/org/shedlang/compiler/shidtopatio/ShidToPatioVarLoadTests.java
index 6aa7526a..272daa4f 100644
--- a/src/test/java/org/shedlang/compiler/shidtopatio/ShidToPatioVarLoadTests.java
+++ b/src/test/java/org/shedlang/compiler/shidtopatio/ShidToPatioVarLoadTests.java
@@ -2,7 +2,7 @@ package org.shedlang.compiler.shidtopatio;
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
-import org.shedlang.compiler.patio.ast.types.PatioTypes;
+import org.shedlang.compiler.patio.types.PatioTypes;
 import org.shedlang.compiler.shid.instructions.Shid;
 import org.shedlang.compiler.testing.snapshots.SnapshotResolver;
 import org.shedlang.compiler.testing.snapshots.Snapshotter;
diff --git a/src/test/java/org/shedlang/compiler/shidtopatio/ShidToPatioVarStoreTests.java b/src/test/java/org/shedlang/compiler/shidtopatio/ShidToPatioVarStoreTests.java
index 03ab43ac..78e55a5f 100644
--- a/src/test/java/org/shedlang/compiler/shidtopatio/ShidToPatioVarStoreTests.java
+++ b/src/test/java/org/shedlang/compiler/shidtopatio/ShidToPatioVarStoreTests.java
@@ -2,8 +2,8 @@ package org.shedlang.compiler.shidtopatio;
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
-import org.shedlang.compiler.patio.ast.operands.PatioLocalRef;
-import org.shedlang.compiler.patio.ast.types.PatioTypes;
+import org.shedlang.compiler.patio.operands.PatioLocalRef;
+import org.shedlang.compiler.patio.types.PatioTypes;
 import org.shedlang.compiler.shid.instructions.Shid;
 import org.shedlang.compiler.testing.snapshots.SnapshotResolver;
 import org.shedlang.compiler.testing.snapshots.Snapshotter;