Remove redundant package

93 files changed, 246 insertions, 248 deletions

diff --git a/src/main/java/org/shedlang/compiler/backends/PatioTextBackend.java b/src/main/java/org/shedlang/compiler/backends/PatioTextBackend.java
index d5ebb923..0b4c5198 100644
--- a/src/main/java/org/shedlang/compiler/backends/PatioTextBackend.java
+++ b/src/main/java/org/shedlang/compiler/backends/PatioTextBackend.java
@@ -4,7 +4,7 @@ import org.shedlang.compiler.backends.paths.TargetDir;
 import org.shedlang.compiler.config.ProjectConfig;
 import org.shedlang.compiler.shidtopatio.ShidToPatio;
 import org.shedlang.compiler.shidtopatio.ShidToPatioContext;
-import org.shedlang.compiler.patio.ast.PatioSerializer;
+import org.shedlang.compiler.patio.PatioSerializer;
 import org.shedlang.compiler.shid.ShidNamespace;
 import org.shedlang.compiler.typechecker.TypeInfos;
 
diff --git a/src/main/java/org/shedlang/compiler/backends/llvm/codegen/PatioToLlvm.java b/src/main/java/org/shedlang/compiler/backends/llvm/codegen/PatioToLlvm.java
index 92ab8bb8..545a4e2f 100644
--- a/src/main/java/org/shedlang/compiler/backends/llvm/codegen/PatioToLlvm.java
+++ b/src/main/java/org/shedlang/compiler/backends/llvm/codegen/PatioToLlvm.java
@@ -10,10 +10,10 @@ import org.shedlang.compiler.backends.llvm.ir.ast.operands.*;
 import org.shedlang.compiler.backends.llvm.ir.ast.types.LlvmType;
 import org.shedlang.compiler.backends.llvm.ir.ast.types.LlvmTypes;
 import org.shedlang.compiler.filesystem.ShedCompilerFiles;
-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.*;
+import org.shedlang.compiler.patio.*;
+import org.shedlang.compiler.patio.instructions.*;
+import org.shedlang.compiler.patio.operands.*;
+import org.shedlang.compiler.patio.types.*;
 import org.shedlang.compiler.util.Lazy;
 import org.shedlang.compiler.util.Lists;
 import org.shedlang.compiler.util.P;
diff --git a/src/main/java/org/shedlang/compiler/backends/llvm/codegen/PatioToLlvmFunctionContext.java b/src/main/java/org/shedlang/compiler/backends/llvm/codegen/PatioToLlvmFunctionContext.java
index 584d3202..18e46e3c 100644
--- a/src/main/java/org/shedlang/compiler/backends/llvm/codegen/PatioToLlvmFunctionContext.java
+++ b/src/main/java/org/shedlang/compiler/backends/llvm/codegen/PatioToLlvmFunctionContext.java
@@ -12,7 +12,7 @@ import org.shedlang.compiler.backends.llvm.ir.ast.instructions.LlvmTerminatorIns
 import org.shedlang.compiler.backends.llvm.ir.ast.operands.LlvmOperand;
 import org.shedlang.compiler.backends.llvm.ir.ast.operands.LlvmVariableLocal;
 import org.shedlang.compiler.backends.llvm.ir.ast.types.LlvmType;
-import org.shedlang.compiler.patio.ast.operands.PatioLocalRef;
+import org.shedlang.compiler.patio.operands.PatioLocalRef;
 import org.shedlang.compiler.util.P;
 
 import java.util.Optional;
diff --git a/src/main/java/org/shedlang/compiler/backends/wasm/PatioToWasm.java b/src/main/java/org/shedlang/compiler/backends/wasm/PatioToWasm.java
index 44abd376..e1204eb6 100644
--- a/src/main/java/org/shedlang/compiler/backends/wasm/PatioToWasm.java
+++ b/src/main/java/org/shedlang/compiler/backends/wasm/PatioToWasm.java
@@ -8,10 +8,10 @@ import org.shedlang.compiler.backends.wasm.structure.ast.linking.WasmMemoryAddre
 import org.shedlang.compiler.backends.wasm.structure.ast.modules.*;
 import org.shedlang.compiler.backends.wasm.structure.ast.types.WasmFuncType;
 import org.shedlang.compiler.backends.wasm.structure.ast.types.WasmValueType;
-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.*;
+import org.shedlang.compiler.patio.*;
+import org.shedlang.compiler.patio.instructions.*;
+import org.shedlang.compiler.patio.operands.*;
+import org.shedlang.compiler.patio.types.*;
 import org.shedlang.compiler.util.Lists;
 import org.shedlang.compiler.util.P;
 
diff --git a/src/main/java/org/shedlang/compiler/patio/ast/PatioCompilationUnit.java b/src/main/java/org/shedlang/compiler/patio/PatioCompilationUnit.java
index 227c38d2..9ac30658 100644
--- a/src/main/java/org/shedlang/compiler/patio/ast/PatioCompilationUnit.java
+++ b/src/main/java/org/shedlang/compiler/patio/PatioCompilationUnit.java
@@ -1,4 +1,4 @@
-package org.shedlang.compiler.patio.ast;
+package org.shedlang.compiler.patio;
 
 import org.shedlang.compiler.sources.Source;
 
diff --git a/src/main/java/org/shedlang/compiler/patio/ast/PatioCompilationUnitElement.java b/src/main/java/org/shedlang/compiler/patio/PatioCompilationUnitElement.java
index 038b0fba..791b06d1 100644
--- a/src/main/java/org/shedlang/compiler/patio/ast/PatioCompilationUnitElement.java
+++ b/src/main/java/org/shedlang/compiler/patio/PatioCompilationUnitElement.java
@@ -1,4 +1,4 @@
-package org.shedlang.compiler.patio.ast;
+package org.shedlang.compiler.patio;
 
 import org.shedlang.compiler.sources.Source;
 
diff --git a/src/main/java/org/shedlang/compiler/patio/ast/PatioDataElementImmutable.java b/src/main/java/org/shedlang/compiler/patio/PatioDataElementImmutable.java
index 14c2bee2..fef9f1fd 100644
--- a/src/main/java/org/shedlang/compiler/patio/ast/PatioDataElementImmutable.java
+++ b/src/main/java/org/shedlang/compiler/patio/PatioDataElementImmutable.java
@@ -1,6 +1,6 @@
-package org.shedlang.compiler.patio.ast;
+package org.shedlang.compiler.patio;
 
-import org.shedlang.compiler.patio.ast.types.PatioDataValue;
+import org.shedlang.compiler.patio.types.PatioDataValue;
 import org.shedlang.compiler.sources.Source;
 
 public record PatioDataElementImmutable(
diff --git a/src/main/java/org/shedlang/compiler/patio/ast/PatioDataElementMutable.java b/src/main/java/org/shedlang/compiler/patio/PatioDataElementMutable.java
index 568a86e9..674a52a3 100644
--- a/src/main/java/org/shedlang/compiler/patio/ast/PatioDataElementMutable.java
+++ b/src/main/java/org/shedlang/compiler/patio/PatioDataElementMutable.java
@@ -1,6 +1,6 @@
-package org.shedlang.compiler.patio.ast;
+package org.shedlang.compiler.patio;
 
-import org.shedlang.compiler.patio.ast.types.PatioDataValue;
+import org.shedlang.compiler.patio.types.PatioDataValue;
 import org.shedlang.compiler.sources.Source;
 
 public record PatioDataElementMutable(
diff --git a/src/main/java/org/shedlang/compiler/patio/ast/PatioExceptionTypeDefinition.java b/src/main/java/org/shedlang/compiler/patio/PatioExceptionTypeDefinition.java
index 7dabc809..083aab4f 100644
--- a/src/main/java/org/shedlang/compiler/patio/ast/PatioExceptionTypeDefinition.java
+++ b/src/main/java/org/shedlang/compiler/patio/PatioExceptionTypeDefinition.java
@@ -1,6 +1,6 @@
-package org.shedlang.compiler.patio.ast;
+package org.shedlang.compiler.patio;
 
-import org.shedlang.compiler.patio.ast.types.PatioType;
+import org.shedlang.compiler.patio.types.PatioType;
 import org.shedlang.compiler.sources.Source;
 
 public record PatioExceptionTypeDefinition(
diff --git a/src/main/java/org/shedlang/compiler/patio/ast/PatioFunctionDeclaration.java b/src/main/java/org/shedlang/compiler/patio/PatioFunctionDeclaration.java
index 28810b5e..8b9b29ae 100644
--- a/src/main/java/org/shedlang/compiler/patio/ast/PatioFunctionDeclaration.java
+++ b/src/main/java/org/shedlang/compiler/patio/PatioFunctionDeclaration.java
@@ -1,8 +1,8 @@
-package org.shedlang.compiler.patio.ast;
+package org.shedlang.compiler.patio;
 
 import org.pcollections.PVector;
-import org.shedlang.compiler.patio.ast.types.PatioType;
-import org.shedlang.compiler.patio.ast.types.PatioTypes;
+import org.shedlang.compiler.patio.types.PatioType;
+import org.shedlang.compiler.patio.types.PatioTypes;
 import org.shedlang.compiler.sources.Source;
 import org.shedlang.compiler.sources.Sources;
 import org.shedlang.compiler.util.P;
diff --git a/src/main/java/org/shedlang/compiler/patio/ast/PatioFunctionDefinition.java b/src/main/java/org/shedlang/compiler/patio/PatioFunctionDefinition.java
index cc477244..2cf0f4aa 100644
--- a/src/main/java/org/shedlang/compiler/patio/ast/PatioFunctionDefinition.java
+++ b/src/main/java/org/shedlang/compiler/patio/PatioFunctionDefinition.java
@@ -1,9 +1,9 @@
-package org.shedlang.compiler.patio.ast;
+package org.shedlang.compiler.patio;
 
 import org.pcollections.PVector;
-import org.shedlang.compiler.patio.ast.instructions.PatioInstruction;
-import org.shedlang.compiler.patio.ast.types.PatioType;
-import org.shedlang.compiler.patio.ast.types.PatioTypes;
+import org.shedlang.compiler.patio.instructions.PatioInstruction;
+import org.shedlang.compiler.patio.types.PatioType;
+import org.shedlang.compiler.patio.types.PatioTypes;
 import org.shedlang.compiler.sources.Source;
 import org.shedlang.compiler.sources.Sources;
 import org.shedlang.compiler.util.P;
diff --git a/src/main/java/org/shedlang/compiler/patio/ast/PatioLocal.java b/src/main/java/org/shedlang/compiler/patio/PatioLocal.java
index 497a641d..fb600c54 100644
--- a/src/main/java/org/shedlang/compiler/patio/ast/PatioLocal.java
+++ b/src/main/java/org/shedlang/compiler/patio/PatioLocal.java
@@ -1,7 +1,7 @@
-package org.shedlang.compiler.patio.ast;
+package org.shedlang.compiler.patio;
 
-import org.shedlang.compiler.patio.ast.operands.PatioLocalRef;
-import org.shedlang.compiler.patio.ast.types.PatioType;
+import org.shedlang.compiler.patio.operands.PatioLocalRef;
+import org.shedlang.compiler.patio.types.PatioType;
 
 public record PatioLocal(String name, PatioType type, PatioLocalType localType) {
     public static PatioLocal param(String name, PatioType type) {
diff --git a/src/main/java/org/shedlang/compiler/patio/ast/PatioLocalType.java b/src/main/java/org/shedlang/compiler/patio/PatioLocalType.java
index 8c8dec39..00c31ec7 100644
--- a/src/main/java/org/shedlang/compiler/patio/ast/PatioLocalType.java
+++ b/src/main/java/org/shedlang/compiler/patio/PatioLocalType.java
@@ -1,4 +1,4 @@
-package org.shedlang.compiler.patio.ast;
+package org.shedlang.compiler.patio;
 
 public enum PatioLocalType {
     PARAM,
diff --git a/src/main/java/org/shedlang/compiler/patio/ast/PatioSerializer.java b/src/main/java/org/shedlang/compiler/patio/PatioSerializer.java
index 53508766..ff274bce 100644
--- a/src/main/java/org/shedlang/compiler/patio/ast/PatioSerializer.java
+++ b/src/main/java/org/shedlang/compiler/patio/PatioSerializer.java
@@ -1,8 +1,8 @@
-package org.shedlang.compiler.patio.ast;
+package org.shedlang.compiler.patio;
 
-import org.shedlang.compiler.patio.ast.instructions.*;
-import org.shedlang.compiler.patio.ast.operands.*;
-import org.shedlang.compiler.patio.ast.types.*;
+import org.shedlang.compiler.patio.instructions.*;
+import org.shedlang.compiler.patio.operands.*;
+import org.shedlang.compiler.patio.types.*;
 import org.shedlang.compiler.treetext.Tree;
 
 import java.util.List;
diff --git a/src/main/java/org/shedlang/compiler/patio/ast/PatioVisibility.java b/src/main/java/org/shedlang/compiler/patio/PatioVisibility.java
index ee5b555f..55ccc361 100644
--- a/src/main/java/org/shedlang/compiler/patio/ast/PatioVisibility.java
+++ b/src/main/java/org/shedlang/compiler/patio/PatioVisibility.java
@@ -1,4 +1,4 @@
-package org.shedlang.compiler.patio.ast;
+package org.shedlang.compiler.patio;
 
 public enum PatioVisibility {
     PRIVATE,
diff --git a/src/main/java/org/shedlang/compiler/patio/ast/instructions/PatioInstructionBinaryOperation.java b/src/main/java/org/shedlang/compiler/patio/ast/instructions/PatioInstructionBinaryOperation.java
deleted file mode 100644
index 1737ecf1..00000000
--- a/src/main/java/org/shedlang/compiler/patio/ast/instructions/PatioInstructionBinaryOperation.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package org.shedlang.compiler.patio.ast.instructions;
-
-import org.shedlang.compiler.patio.ast.operands.PatioLocalRef;
-import org.shedlang.compiler.patio.ast.operands.PatioOperand;
-
-public interface PatioInstructionBinaryOperation {
-    PatioLocalRef target();
-    PatioOperand left();
-    PatioOperand right();
-}
diff --git a/src/main/java/org/shedlang/compiler/patio/ast/operands/PatioLocalRef.java b/src/main/java/org/shedlang/compiler/patio/ast/operands/PatioLocalRef.java
deleted file mode 100644
index c0a37c9d..00000000
--- a/src/main/java/org/shedlang/compiler/patio/ast/operands/PatioLocalRef.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package org.shedlang.compiler.patio.ast.operands;
-
-import org.shedlang.compiler.patio.ast.operands.PatioOperand;
-
-public record PatioLocalRef(String name) implements PatioOperand {
-}
diff --git a/src/main/java/org/shedlang/compiler/patio/ast/instructions/PatioAllocHeap.java b/src/main/java/org/shedlang/compiler/patio/instructions/PatioAllocHeap.java
index 65f3b4c5..2737a52d 100644
--- a/src/main/java/org/shedlang/compiler/patio/ast/instructions/PatioAllocHeap.java
+++ b/src/main/java/org/shedlang/compiler/patio/instructions/PatioAllocHeap.java
@@ -1,7 +1,7 @@
-package org.shedlang.compiler.patio.ast.instructions;
+package org.shedlang.compiler.patio.instructions;
 
-import org.shedlang.compiler.patio.ast.operands.PatioLocalRef;
-import org.shedlang.compiler.patio.ast.types.PatioDataLayout;
+import org.shedlang.compiler.patio.operands.PatioLocalRef;
+import org.shedlang.compiler.patio.types.PatioDataLayout;
 import org.shedlang.compiler.sources.Source;
 
 import java.util.List;
diff --git a/src/main/java/org/shedlang/compiler/patio/ast/instructions/PatioAllocStack.java b/src/main/java/org/shedlang/compiler/patio/instructions/PatioAllocStack.java
index 2473b679..a028ed1d 100644
--- a/src/main/java/org/shedlang/compiler/patio/ast/instructions/PatioAllocStack.java
+++ b/src/main/java/org/shedlang/compiler/patio/instructions/PatioAllocStack.java
@@ -1,7 +1,7 @@
-package org.shedlang.compiler.patio.ast.instructions;
+package org.shedlang.compiler.patio.instructions;
 
-import org.shedlang.compiler.patio.ast.operands.PatioLocalRef;
-import org.shedlang.compiler.patio.ast.types.PatioDataLayout;
+import org.shedlang.compiler.patio.operands.PatioLocalRef;
+import org.shedlang.compiler.patio.types.PatioDataLayout;
 import org.shedlang.compiler.sources.Source;
 
 /**
diff --git a/src/main/java/org/shedlang/compiler/patio/ast/instructions/PatioBlock.java b/src/main/java/org/shedlang/compiler/patio/instructions/PatioBlock.java
index ce4a2407..5858159f 100644
--- a/src/main/java/org/shedlang/compiler/patio/ast/instructions/PatioBlock.java
+++ b/src/main/java/org/shedlang/compiler/patio/instructions/PatioBlock.java
@@ -1,6 +1,6 @@
-package org.shedlang.compiler.patio.ast.instructions;
+package org.shedlang.compiler.patio.instructions;
 
-import org.shedlang.compiler.patio.ast.operands.PatioOperand;
+import org.shedlang.compiler.patio.operands.PatioOperand;
 import org.shedlang.compiler.sources.Source;
 import org.shedlang.compiler.util.Lists;
 
diff --git a/src/main/java/org/shedlang/compiler/patio/ast/instructions/PatioBoolToInt.java b/src/main/java/org/shedlang/compiler/patio/instructions/PatioBoolToInt.java
index d3b6baf1..db01b703 100644
--- a/src/main/java/org/shedlang/compiler/patio/ast/instructions/PatioBoolToInt.java
+++ b/src/main/java/org/shedlang/compiler/patio/instructions/PatioBoolToInt.java
@@ -1,7 +1,7 @@
-package org.shedlang.compiler.patio.ast.instructions;
+package org.shedlang.compiler.patio.instructions;
 
-import org.shedlang.compiler.patio.ast.operands.PatioLocalRef;
-import org.shedlang.compiler.patio.ast.operands.PatioOperand;
+import org.shedlang.compiler.patio.operands.PatioLocalRef;
+import org.shedlang.compiler.patio.operands.PatioOperand;
 import org.shedlang.compiler.sources.Source;
 
 public record PatioBoolToInt(
diff --git a/src/main/java/org/shedlang/compiler/patio/ast/instructions/PatioCall.java b/src/main/java/org/shedlang/compiler/patio/instructions/PatioCall.java
index f920c319..3a97bc34 100644
--- a/src/main/java/org/shedlang/compiler/patio/ast/instructions/PatioCall.java
+++ b/src/main/java/org/shedlang/compiler/patio/instructions/PatioCall.java
@@ -1,7 +1,7 @@
-package org.shedlang.compiler.patio.ast.instructions;
+package org.shedlang.compiler.patio.instructions;
 
-import org.shedlang.compiler.patio.ast.operands.PatioLocalRef;
-import org.shedlang.compiler.patio.ast.operands.PatioOperand;
+import org.shedlang.compiler.patio.operands.PatioLocalRef;
+import org.shedlang.compiler.patio.operands.PatioOperand;
 import org.shedlang.compiler.sources.Source;
 
 import java.util.List;
diff --git a/src/main/java/org/shedlang/compiler/patio/ast/instructions/PatioCallPointer.java b/src/main/java/org/shedlang/compiler/patio/instructions/PatioCallPointer.java
index 5ff10331..64059ef4 100644
--- a/src/main/java/org/shedlang/compiler/patio/ast/instructions/PatioCallPointer.java
+++ b/src/main/java/org/shedlang/compiler/patio/instructions/PatioCallPointer.java
@@ -1,7 +1,7 @@
-package org.shedlang.compiler.patio.ast.instructions;
+package org.shedlang.compiler.patio.instructions;
 
-import org.shedlang.compiler.patio.ast.operands.PatioLocalRef;
-import org.shedlang.compiler.patio.ast.operands.PatioOperand;
+import org.shedlang.compiler.patio.operands.PatioLocalRef;
+import org.shedlang.compiler.patio.operands.PatioOperand;
 import org.shedlang.compiler.sources.Source;
 
 import java.util.List;
diff --git a/src/main/java/org/shedlang/compiler/patio/ast/instructions/PatioCatchClause.java b/src/main/java/org/shedlang/compiler/patio/instructions/PatioCatchClause.java
index 05af2450..aa92bd60 100644
--- a/src/main/java/org/shedlang/compiler/patio/ast/instructions/PatioCatchClause.java
+++ b/src/main/java/org/shedlang/compiler/patio/instructions/PatioCatchClause.java
@@ -1,6 +1,6 @@
-package org.shedlang.compiler.patio.ast.instructions;
+package org.shedlang.compiler.patio.instructions;
 
-import org.shedlang.compiler.patio.ast.operands.PatioLocalRef;
+import org.shedlang.compiler.patio.operands.PatioLocalRef;
 import org.shedlang.compiler.sources.Source;
 
 /**
diff --git a/src/main/java/org/shedlang/compiler/patio/ast/instructions/PatioDataPtrToInt.java b/src/main/java/org/shedlang/compiler/patio/instructions/PatioDataPtrToInt.java
index 3d21f005..55bfc374 100644
--- a/src/main/java/org/shedlang/compiler/patio/ast/instructions/PatioDataPtrToInt.java
+++ b/src/main/java/org/shedlang/compiler/patio/instructions/PatioDataPtrToInt.java
@@ -1,7 +1,7 @@
-package org.shedlang.compiler.patio.ast.instructions;
+package org.shedlang.compiler.patio.instructions;
 
-import org.shedlang.compiler.patio.ast.operands.PatioLocalRef;
-import org.shedlang.compiler.patio.ast.operands.PatioOperand;
+import org.shedlang.compiler.patio.operands.PatioLocalRef;
+import org.shedlang.compiler.patio.operands.PatioOperand;
 import org.shedlang.compiler.sources.Source;
 
 public record PatioDataPtrToInt(
diff --git a/src/main/java/org/shedlang/compiler/patio/ast/instructions/PatioIf.java b/src/main/java/org/shedlang/compiler/patio/instructions/PatioIf.java
index fc5a0dc7..f404291f 100644
--- a/src/main/java/org/shedlang/compiler/patio/ast/instructions/PatioIf.java
+++ b/src/main/java/org/shedlang/compiler/patio/instructions/PatioIf.java
@@ -1,7 +1,7 @@
-package org.shedlang.compiler.patio.ast.instructions;
+package org.shedlang.compiler.patio.instructions;
 
-import org.shedlang.compiler.patio.ast.operands.PatioLocalRef;
-import org.shedlang.compiler.patio.ast.operands.PatioOperand;
+import org.shedlang.compiler.patio.operands.PatioLocalRef;
+import org.shedlang.compiler.patio.operands.PatioOperand;
 import org.shedlang.compiler.sources.Source;
 
 import java.util.List;
diff --git a/src/main/java/org/shedlang/compiler/patio/ast/instructions/PatioInstruction.java b/src/main/java/org/shedlang/compiler/patio/instructions/PatioInstruction.java
index 088282d4..8c5860a7 100644
--- a/src/main/java/org/shedlang/compiler/patio/ast/instructions/PatioInstruction.java
+++ b/src/main/java/org/shedlang/compiler/patio/instructions/PatioInstruction.java
@@ -1,4 +1,4 @@
-package org.shedlang.compiler.patio.ast.instructions;
+package org.shedlang.compiler.patio.instructions;
 
 import org.shedlang.compiler.sources.Source;
 
diff --git a/src/main/java/org/shedlang/compiler/patio/instructions/PatioInstructionBinaryOperation.java b/src/main/java/org/shedlang/compiler/patio/instructions/PatioInstructionBinaryOperation.java
new file mode 100644
index 00000000..2098e4be
--- /dev/null
+++ b/src/main/java/org/shedlang/compiler/patio/instructions/PatioInstructionBinaryOperation.java
@@ -0,0 +1,10 @@
+package org.shedlang.compiler.patio.instructions;
+
+import org.shedlang.compiler.patio.operands.PatioLocalRef;
+import org.shedlang.compiler.patio.operands.PatioOperand;
+
+public interface PatioInstructionBinaryOperation {
+    PatioLocalRef target();
+    PatioOperand left();
+    PatioOperand right();
+}
diff --git a/src/main/java/org/shedlang/compiler/patio/ast/instructions/PatioIntAdd.java b/src/main/java/org/shedlang/compiler/patio/instructions/PatioIntAdd.java
index fda748c5..91e90425 100644
--- a/src/main/java/org/shedlang/compiler/patio/ast/instructions/PatioIntAdd.java
+++ b/src/main/java/org/shedlang/compiler/patio/instructions/PatioIntAdd.java
@@ -1,7 +1,7 @@
-package org.shedlang.compiler.patio.ast.instructions;
+package org.shedlang.compiler.patio.instructions;
 
-import org.shedlang.compiler.patio.ast.operands.PatioLocalRef;
-import org.shedlang.compiler.patio.ast.operands.PatioOperand;
+import org.shedlang.compiler.patio.operands.PatioLocalRef;
+import org.shedlang.compiler.patio.operands.PatioOperand;
 import org.shedlang.compiler.sources.Source;
 
 public record PatioIntAdd(
diff --git a/src/main/java/org/shedlang/compiler/patio/ast/instructions/PatioIntEquals.java b/src/main/java/org/shedlang/compiler/patio/instructions/PatioIntEquals.java
index a261d854..a996fddf 100644
--- a/src/main/java/org/shedlang/compiler/patio/ast/instructions/PatioIntEquals.java
+++ b/src/main/java/org/shedlang/compiler/patio/instructions/PatioIntEquals.java
@@ -1,7 +1,7 @@
-package org.shedlang.compiler.patio.ast.instructions;
+package org.shedlang.compiler.patio.instructions;
 
-import org.shedlang.compiler.patio.ast.operands.PatioLocalRef;
-import org.shedlang.compiler.patio.ast.operands.PatioOperand;
+import org.shedlang.compiler.patio.operands.PatioLocalRef;
+import org.shedlang.compiler.patio.operands.PatioOperand;
 import org.shedlang.compiler.sources.Source;
 
 public record PatioIntEquals(
diff --git a/src/main/java/org/shedlang/compiler/patio/ast/instructions/PatioIntNotEqual.java b/src/main/java/org/shedlang/compiler/patio/instructions/PatioIntNotEqual.java
index cc426c8e..c8c1fc81 100644
--- a/src/main/java/org/shedlang/compiler/patio/ast/instructions/PatioIntNotEqual.java
+++ b/src/main/java/org/shedlang/compiler/patio/instructions/PatioIntNotEqual.java
@@ -1,7 +1,7 @@
-package org.shedlang.compiler.patio.ast.instructions;
+package org.shedlang.compiler.patio.instructions;
 
-import org.shedlang.compiler.patio.ast.operands.PatioLocalRef;
-import org.shedlang.compiler.patio.ast.operands.PatioOperand;
+import org.shedlang.compiler.patio.operands.PatioLocalRef;
+import org.shedlang.compiler.patio.operands.PatioOperand;
 import org.shedlang.compiler.sources.Source;
 
 /**
diff --git a/src/main/java/org/shedlang/compiler/patio/ast/instructions/PatioIntSub.java b/src/main/java/org/shedlang/compiler/patio/instructions/PatioIntSub.java
index 35aa51a9..605705e7 100644
--- a/src/main/java/org/shedlang/compiler/patio/ast/instructions/PatioIntSub.java
+++ b/src/main/java/org/shedlang/compiler/patio/instructions/PatioIntSub.java
@@ -1,7 +1,7 @@
-package org.shedlang.compiler.patio.ast.instructions;
+package org.shedlang.compiler.patio.instructions;
 
-import org.shedlang.compiler.patio.ast.operands.PatioLocalRef;
-import org.shedlang.compiler.patio.ast.operands.PatioOperand;
+import org.shedlang.compiler.patio.operands.PatioLocalRef;
+import org.shedlang.compiler.patio.operands.PatioOperand;
 import org.shedlang.compiler.sources.Source;
 
 /**
diff --git a/src/main/java/org/shedlang/compiler/patio/ast/instructions/PatioIntToBool.java b/src/main/java/org/shedlang/compiler/patio/instructions/PatioIntToBool.java
index fe5205ed..b8b969a2 100644
--- a/src/main/java/org/shedlang/compiler/patio/ast/instructions/PatioIntToBool.java
+++ b/src/main/java/org/shedlang/compiler/patio/instructions/PatioIntToBool.java
@@ -1,7 +1,7 @@
-package org.shedlang.compiler.patio.ast.instructions;
+package org.shedlang.compiler.patio.instructions;
 
-import org.shedlang.compiler.patio.ast.operands.PatioLocalRef;
-import org.shedlang.compiler.patio.ast.operands.PatioOperand;
+import org.shedlang.compiler.patio.operands.PatioLocalRef;
+import org.shedlang.compiler.patio.operands.PatioOperand;
 import org.shedlang.compiler.sources.Source;
 
 public record PatioIntToBool(
diff --git a/src/main/java/org/shedlang/compiler/patio/ast/instructions/PatioIntToDataPtr.java b/src/main/java/org/shedlang/compiler/patio/instructions/PatioIntToDataPtr.java
index bf66c616..81b6bebc 100644
--- a/src/main/java/org/shedlang/compiler/patio/ast/instructions/PatioIntToDataPtr.java
+++ b/src/main/java/org/shedlang/compiler/patio/instructions/PatioIntToDataPtr.java
@@ -1,7 +1,7 @@
-package org.shedlang.compiler.patio.ast.instructions;
+package org.shedlang.compiler.patio.instructions;
 
-import org.shedlang.compiler.patio.ast.operands.PatioLocalRef;
-import org.shedlang.compiler.patio.ast.operands.PatioOperand;
+import org.shedlang.compiler.patio.operands.PatioLocalRef;
+import org.shedlang.compiler.patio.operands.PatioOperand;
 import org.shedlang.compiler.sources.Source;
 
 public record PatioIntToDataPtr(
diff --git a/src/main/java/org/shedlang/compiler/patio/ast/instructions/PatioLocalStore.java b/src/main/java/org/shedlang/compiler/patio/instructions/PatioLocalStore.java
index 6c4b4ba9..2b971642 100644
--- a/src/main/java/org/shedlang/compiler/patio/ast/instructions/PatioLocalStore.java
+++ b/src/main/java/org/shedlang/compiler/patio/instructions/PatioLocalStore.java
@@ -1,7 +1,7 @@
-package org.shedlang.compiler.patio.ast.instructions;
+package org.shedlang.compiler.patio.instructions;
 
-import org.shedlang.compiler.patio.ast.operands.PatioLocalRef;
-import org.shedlang.compiler.patio.ast.operands.PatioOperand;
+import org.shedlang.compiler.patio.operands.PatioLocalRef;
+import org.shedlang.compiler.patio.operands.PatioOperand;
 import org.shedlang.compiler.sources.Source;
 
 /**
diff --git a/src/main/java/org/shedlang/compiler/patio/ast/instructions/PatioLoop.java b/src/main/java/org/shedlang/compiler/patio/instructions/PatioLoop.java
index d849fa8c..650b1108 100644
--- a/src/main/java/org/shedlang/compiler/patio/ast/instructions/PatioLoop.java
+++ b/src/main/java/org/shedlang/compiler/patio/instructions/PatioLoop.java
@@ -1,4 +1,4 @@
-package org.shedlang.compiler.patio.ast.instructions;
+package org.shedlang.compiler.patio.instructions;
 
 import org.shedlang.compiler.sources.Source;
 
diff --git a/src/main/java/org/shedlang/compiler/patio/ast/instructions/PatioLoopBreak.java b/src/main/java/org/shedlang/compiler/patio/instructions/PatioLoopBreak.java
index 2f4ed046..bad43e15 100644
--- a/src/main/java/org/shedlang/compiler/patio/ast/instructions/PatioLoopBreak.java
+++ b/src/main/java/org/shedlang/compiler/patio/instructions/PatioLoopBreak.java
@@ -1,4 +1,4 @@
-package org.shedlang.compiler.patio.ast.instructions;
+package org.shedlang.compiler.patio.instructions;
 
 import org.shedlang.compiler.sources.Source;
 
diff --git a/src/main/java/org/shedlang/compiler/patio/ast/instructions/PatioLoopContinue.java b/src/main/java/org/shedlang/compiler/patio/instructions/PatioLoopContinue.java
index 7d6eeaaf..41dcc6fd 100644
--- a/src/main/java/org/shedlang/compiler/patio/ast/instructions/PatioLoopContinue.java
+++ b/src/main/java/org/shedlang/compiler/patio/instructions/PatioLoopContinue.java
@@ -1,4 +1,4 @@
-package org.shedlang.compiler.patio.ast.instructions;
+package org.shedlang.compiler.patio.instructions;
 
 import org.shedlang.compiler.sources.Source;
 
diff --git a/src/main/java/org/shedlang/compiler/patio/ast/instructions/PatioMemoryLoad.java b/src/main/java/org/shedlang/compiler/patio/instructions/PatioMemoryLoad.java
index 3339b7e2..9237ca81 100644
--- a/src/main/java/org/shedlang/compiler/patio/ast/instructions/PatioMemoryLoad.java
+++ b/src/main/java/org/shedlang/compiler/patio/instructions/PatioMemoryLoad.java
@@ -1,8 +1,8 @@
-package org.shedlang.compiler.patio.ast.instructions;
+package org.shedlang.compiler.patio.instructions;
 
-import org.shedlang.compiler.patio.ast.operands.PatioLocalRef;
-import org.shedlang.compiler.patio.ast.operands.PatioOperand;
-import org.shedlang.compiler.patio.ast.types.PatioDataLayout;
+import org.shedlang.compiler.patio.operands.PatioLocalRef;
+import org.shedlang.compiler.patio.operands.PatioOperand;
+import org.shedlang.compiler.patio.types.PatioDataLayout;
 import org.shedlang.compiler.sources.Source;
 
 import java.util.List;
diff --git a/src/main/java/org/shedlang/compiler/patio/ast/instructions/PatioMemoryStore.java b/src/main/java/org/shedlang/compiler/patio/instructions/PatioMemoryStore.java
index 3bff3fe6..ccc5c36a 100644
--- a/src/main/java/org/shedlang/compiler/patio/ast/instructions/PatioMemoryStore.java
+++ b/src/main/java/org/shedlang/compiler/patio/instructions/PatioMemoryStore.java
@@ -1,7 +1,7 @@
-package org.shedlang.compiler.patio.ast.instructions;
+package org.shedlang.compiler.patio.instructions;
 
-import org.shedlang.compiler.patio.ast.operands.PatioOperand;
-import org.shedlang.compiler.patio.ast.types.PatioDataLayout;
+import org.shedlang.compiler.patio.operands.PatioOperand;
+import org.shedlang.compiler.patio.types.PatioDataLayout;
 import org.shedlang.compiler.sources.Source;
 
 import java.util.List;
diff --git a/src/main/java/org/shedlang/compiler/patio/ast/instructions/PatioResume.java b/src/main/java/org/shedlang/compiler/patio/instructions/PatioResume.java
index fca36a7f..6b1838d2 100644
--- a/src/main/java/org/shedlang/compiler/patio/ast/instructions/PatioResume.java
+++ b/src/main/java/org/shedlang/compiler/patio/instructions/PatioResume.java
@@ -1,6 +1,6 @@
-package org.shedlang.compiler.patio.ast.instructions;
+package org.shedlang.compiler.patio.instructions;
 
-import org.shedlang.compiler.patio.ast.operands.PatioOperand;
+import org.shedlang.compiler.patio.operands.PatioOperand;
 import org.shedlang.compiler.sources.Source;
 
 /**
diff --git a/src/main/java/org/shedlang/compiler/patio/ast/instructions/PatioReturn.java b/src/main/java/org/shedlang/compiler/patio/instructions/PatioReturn.java
index 355715c2..fcf84f51 100644
--- a/src/main/java/org/shedlang/compiler/patio/ast/instructions/PatioReturn.java
+++ b/src/main/java/org/shedlang/compiler/patio/instructions/PatioReturn.java
@@ -1,6 +1,6 @@
-package org.shedlang.compiler.patio.ast.instructions;
+package org.shedlang.compiler.patio.instructions;
 
-import org.shedlang.compiler.patio.ast.operands.PatioOperand;
+import org.shedlang.compiler.patio.operands.PatioOperand;
 import org.shedlang.compiler.sources.Source;
 
 /**
diff --git a/src/main/java/org/shedlang/compiler/patio/ast/instructions/PatioReturnVoid.java b/src/main/java/org/shedlang/compiler/patio/instructions/PatioReturnVoid.java
index 2d3001af..b4a8ef3e 100644
--- a/src/main/java/org/shedlang/compiler/patio/ast/instructions/PatioReturnVoid.java
+++ b/src/main/java/org/shedlang/compiler/patio/instructions/PatioReturnVoid.java
@@ -1,4 +1,4 @@
-package org.shedlang.compiler.patio.ast.instructions;
+package org.shedlang.compiler.patio.instructions;
 
 import org.shedlang.compiler.sources.Source;
 
diff --git a/src/main/java/org/shedlang/compiler/patio/ast/instructions/PatioSwitch.java b/src/main/java/org/shedlang/compiler/patio/instructions/PatioSwitch.java
index 14220320..58e67ac8 100644
--- a/src/main/java/org/shedlang/compiler/patio/ast/instructions/PatioSwitch.java
+++ b/src/main/java/org/shedlang/compiler/patio/instructions/PatioSwitch.java
@@ -1,7 +1,7 @@
-package org.shedlang.compiler.patio.ast.instructions;
+package org.shedlang.compiler.patio.instructions;
 
-import org.shedlang.compiler.patio.ast.operands.PatioLocalRef;
-import org.shedlang.compiler.patio.ast.operands.PatioOperand;
+import org.shedlang.compiler.patio.operands.PatioLocalRef;
+import org.shedlang.compiler.patio.operands.PatioOperand;
 import org.shedlang.compiler.sources.Source;
 
 import java.util.List;
diff --git a/src/main/java/org/shedlang/compiler/patio/ast/instructions/PatioThrow.java b/src/main/java/org/shedlang/compiler/patio/instructions/PatioThrow.java
index 10c627a6..86a3afbb 100644
--- a/src/main/java/org/shedlang/compiler/patio/ast/instructions/PatioThrow.java
+++ b/src/main/java/org/shedlang/compiler/patio/instructions/PatioThrow.java
@@ -1,6 +1,6 @@
-package org.shedlang.compiler.patio.ast.instructions;
+package org.shedlang.compiler.patio.instructions;
 
-import org.shedlang.compiler.patio.ast.operands.PatioOperand;
+import org.shedlang.compiler.patio.operands.PatioOperand;
 import org.shedlang.compiler.sources.Source;
 
 /**
diff --git a/src/main/java/org/shedlang/compiler/patio/ast/instructions/PatioTry.java b/src/main/java/org/shedlang/compiler/patio/instructions/PatioTry.java
index 4eab249c..98798c60 100644
--- a/src/main/java/org/shedlang/compiler/patio/ast/instructions/PatioTry.java
+++ b/src/main/java/org/shedlang/compiler/patio/instructions/PatioTry.java
@@ -1,6 +1,6 @@
-package org.shedlang.compiler.patio.ast.instructions;
+package org.shedlang.compiler.patio.instructions;
 
-import org.shedlang.compiler.patio.ast.operands.PatioLocalRef;
+import org.shedlang.compiler.patio.operands.PatioLocalRef;
 import org.shedlang.compiler.sources.Source;
 
 import java.util.List;
diff --git a/src/main/java/org/shedlang/compiler/patio/ast/instructions/PatioUnreachable.java b/src/main/java/org/shedlang/compiler/patio/instructions/PatioUnreachable.java
index 20f990cb..1550105c 100644
--- a/src/main/java/org/shedlang/compiler/patio/ast/instructions/PatioUnreachable.java
+++ b/src/main/java/org/shedlang/compiler/patio/instructions/PatioUnreachable.java
@@ -1,4 +1,4 @@
-package org.shedlang.compiler.patio.ast.instructions;
+package org.shedlang.compiler.patio.instructions;
 
 import org.shedlang.compiler.sources.Source;
 
diff --git a/src/main/java/org/shedlang/compiler/patio/ast/instructions/PatioVarLoad.java b/src/main/java/org/shedlang/compiler/patio/instructions/PatioVarLoad.java
index 6169ff18..a03b6766 100644
--- a/src/main/java/org/shedlang/compiler/patio/ast/instructions/PatioVarLoad.java
+++ b/src/main/java/org/shedlang/compiler/patio/instructions/PatioVarLoad.java
@@ -1,6 +1,6 @@
-package org.shedlang.compiler.patio.ast.instructions;
+package org.shedlang.compiler.patio.instructions;
 
-import org.shedlang.compiler.patio.ast.operands.PatioLocalRef;
+import org.shedlang.compiler.patio.operands.PatioLocalRef;
 import org.shedlang.compiler.sources.Source;
 
 /**
diff --git a/src/main/java/org/shedlang/compiler/patio/ast/instructions/PatioVarStore.java b/src/main/java/org/shedlang/compiler/patio/instructions/PatioVarStore.java
index 51e4993f..f6aad952 100644
--- a/src/main/java/org/shedlang/compiler/patio/ast/instructions/PatioVarStore.java
+++ b/src/main/java/org/shedlang/compiler/patio/instructions/PatioVarStore.java
@@ -1,7 +1,7 @@
-package org.shedlang.compiler.patio.ast.instructions;
+package org.shedlang.compiler.patio.instructions;
 
-import org.shedlang.compiler.patio.ast.operands.PatioLocalRef;
-import org.shedlang.compiler.patio.ast.operands.PatioOperand;
+import org.shedlang.compiler.patio.operands.PatioLocalRef;
+import org.shedlang.compiler.patio.operands.PatioOperand;
 import org.shedlang.compiler.sources.Source;
 
 /**
diff --git a/src/main/java/org/shedlang/compiler/patio/ast/operands/PatioBool.java b/src/main/java/org/shedlang/compiler/patio/operands/PatioBool.java
index c39c17d3..769667c1 100644
--- a/src/main/java/org/shedlang/compiler/patio/ast/operands/PatioBool.java
+++ b/src/main/java/org/shedlang/compiler/patio/operands/PatioBool.java
@@ -1,4 +1,4 @@
-package org.shedlang.compiler.patio.ast.operands;
+package org.shedlang.compiler.patio.operands;
 
 public record PatioBool(boolean value) implements PatioOperand {
 }
diff --git a/src/main/java/org/shedlang/compiler/patio/ast/operands/PatioDataPtr.java b/src/main/java/org/shedlang/compiler/patio/operands/PatioDataPtr.java
index 27d9333b..9907733b 100644
--- a/src/main/java/org/shedlang/compiler/patio/ast/operands/PatioDataPtr.java
+++ b/src/main/java/org/shedlang/compiler/patio/operands/PatioDataPtr.java
@@ -1,4 +1,4 @@
-package org.shedlang.compiler.patio.ast.operands;
+package org.shedlang.compiler.patio.operands;
 
 public record PatioDataPtr(String name) implements PatioOperand {
 }
diff --git a/src/main/java/org/shedlang/compiler/patio/ast/operands/PatioFunctionPtr.java b/src/main/java/org/shedlang/compiler/patio/operands/PatioFunctionPtr.java
index 87b4dd19..b025089e 100644
--- a/src/main/java/org/shedlang/compiler/patio/ast/operands/PatioFunctionPtr.java
+++ b/src/main/java/org/shedlang/compiler/patio/operands/PatioFunctionPtr.java
@@ -1,4 +1,4 @@
-package org.shedlang.compiler.patio.ast.operands;
+package org.shedlang.compiler.patio.operands;
 
 public record PatioFunctionPtr(String name) implements PatioOperand {
 }
diff --git a/src/main/java/org/shedlang/compiler/patio/ast/operands/PatioInt.java b/src/main/java/org/shedlang/compiler/patio/operands/PatioInt.java
index 0a19de4e..4191def2 100644
--- a/src/main/java/org/shedlang/compiler/patio/ast/operands/PatioInt.java
+++ b/src/main/java/org/shedlang/compiler/patio/operands/PatioInt.java
@@ -1,4 +1,4 @@
-package org.shedlang.compiler.patio.ast.operands;
+package org.shedlang.compiler.patio.operands;
 
 public record PatioInt(int value) implements PatioOperand {
 }
diff --git a/src/main/java/org/shedlang/compiler/patio/operands/PatioLocalRef.java b/src/main/java/org/shedlang/compiler/patio/operands/PatioLocalRef.java
new file mode 100644
index 00000000..a3c93021
--- /dev/null
+++ b/src/main/java/org/shedlang/compiler/patio/operands/PatioLocalRef.java
@@ -0,0 +1,4 @@
+package org.shedlang.compiler.patio.operands;
+
+public record PatioLocalRef(String name) implements PatioOperand {
+}
diff --git a/src/main/java/org/shedlang/compiler/patio/ast/operands/PatioOperand.java b/src/main/java/org/shedlang/compiler/patio/operands/PatioOperand.java
index ccad9a11..3bd1849c 100644
--- a/src/main/java/org/shedlang/compiler/patio/ast/operands/PatioOperand.java
+++ b/src/main/java/org/shedlang/compiler/patio/operands/PatioOperand.java
@@ -1,4 +1,4 @@
-package org.shedlang.compiler.patio.ast.operands;
+package org.shedlang.compiler.patio.operands;
 
 public sealed interface PatioOperand permits PatioBool, PatioDataPtr, PatioFunctionPtr, PatioInt, PatioLocalRef {
 
diff --git a/src/main/java/org/shedlang/compiler/patio/ast/types/PatioBoolType.java b/src/main/java/org/shedlang/compiler/patio/types/PatioBoolType.java
index 3415335d..17bf8d7f 100644
--- a/src/main/java/org/shedlang/compiler/patio/ast/types/PatioBoolType.java
+++ b/src/main/java/org/shedlang/compiler/patio/types/PatioBoolType.java
@@ -1,4 +1,4 @@
-package org.shedlang.compiler.patio.ast.types;
+package org.shedlang.compiler.patio.types;
 
 public record PatioBoolType() implements PatioType {
     static final PatioBoolType INSTANCE = new PatioBoolType();
diff --git a/src/main/java/org/shedlang/compiler/patio/ast/types/PatioByteType.java b/src/main/java/org/shedlang/compiler/patio/types/PatioByteType.java
index 5159512d..a9cdd28a 100644
--- a/src/main/java/org/shedlang/compiler/patio/ast/types/PatioByteType.java
+++ b/src/main/java/org/shedlang/compiler/patio/types/PatioByteType.java
@@ -1,4 +1,4 @@
-package org.shedlang.compiler.patio.ast.types;
+package org.shedlang.compiler.patio.types;
 
 public record PatioByteType() implements PatioType {
     static final PatioByteType INSTANCE = new PatioByteType();
diff --git a/src/main/java/org/shedlang/compiler/patio/ast/types/PatioDataLayout.java b/src/main/java/org/shedlang/compiler/patio/types/PatioDataLayout.java
index 72654af1..9649cecf 100644
--- a/src/main/java/org/shedlang/compiler/patio/ast/types/PatioDataLayout.java
+++ b/src/main/java/org/shedlang/compiler/patio/types/PatioDataLayout.java
@@ -1,4 +1,4 @@
-package org.shedlang.compiler.patio.ast.types;
+package org.shedlang.compiler.patio.types;
 
 public sealed interface PatioDataLayout permits PatioDataLayoutArray, PatioDataLayoutBool, PatioDataLayoutByte, PatioDataLayoutDataPointer, PatioDataLayoutFunctionPointer, PatioDataLayoutInt, PatioDataLayoutStruct {
 }
diff --git a/src/main/java/org/shedlang/compiler/patio/ast/types/PatioDataLayoutArray.java b/src/main/java/org/shedlang/compiler/patio/types/PatioDataLayoutArray.java
index eec92389..4c8ff200 100644
--- a/src/main/java/org/shedlang/compiler/patio/ast/types/PatioDataLayoutArray.java
+++ b/src/main/java/org/shedlang/compiler/patio/types/PatioDataLayoutArray.java
@@ -1,4 +1,4 @@
-package org.shedlang.compiler.patio.ast.types;
+package org.shedlang.compiler.patio.types;
 
 public record PatioDataLayoutArray(PatioDataLayout element, int size) implements PatioDataLayout {
 }
diff --git a/src/main/java/org/shedlang/compiler/patio/ast/types/PatioDataLayoutBool.java b/src/main/java/org/shedlang/compiler/patio/types/PatioDataLayoutBool.java
index bd878387..fab33c47 100644
--- a/src/main/java/org/shedlang/compiler/patio/ast/types/PatioDataLayoutBool.java
+++ b/src/main/java/org/shedlang/compiler/patio/types/PatioDataLayoutBool.java
@@ -1,4 +1,4 @@
-package org.shedlang.compiler.patio.ast.types;
+package org.shedlang.compiler.patio.types;
 
 public record PatioDataLayoutBool() implements PatioDataLayout {
     public static final PatioDataLayoutBool INSTANCE = new PatioDataLayoutBool();
diff --git a/src/main/java/org/shedlang/compiler/patio/ast/types/PatioDataLayoutByte.java b/src/main/java/org/shedlang/compiler/patio/types/PatioDataLayoutByte.java
index 682fa24c..b8745ddd 100644
--- a/src/main/java/org/shedlang/compiler/patio/ast/types/PatioDataLayoutByte.java
+++ b/src/main/java/org/shedlang/compiler/patio/types/PatioDataLayoutByte.java
@@ -1,4 +1,4 @@
-package org.shedlang.compiler.patio.ast.types;
+package org.shedlang.compiler.patio.types;
 
 public record PatioDataLayoutByte() implements PatioDataLayout {
     public static final PatioDataLayoutByte INSTANCE = new PatioDataLayoutByte();
diff --git a/src/main/java/org/shedlang/compiler/patio/ast/types/PatioDataLayoutDataPointer.java b/src/main/java/org/shedlang/compiler/patio/types/PatioDataLayoutDataPointer.java
index 4e208641..76982d45 100644
--- a/src/main/java/org/shedlang/compiler/patio/ast/types/PatioDataLayoutDataPointer.java
+++ b/src/main/java/org/shedlang/compiler/patio/types/PatioDataLayoutDataPointer.java
@@ -1,4 +1,4 @@
-package org.shedlang.compiler.patio.ast.types;
+package org.shedlang.compiler.patio.types;
 
 public record PatioDataLayoutDataPointer() implements PatioDataLayout {
     public static final PatioDataLayoutDataPointer INSTANCE = new PatioDataLayoutDataPointer();
diff --git a/src/main/java/org/shedlang/compiler/patio/ast/types/PatioDataLayoutFunctionPointer.java b/src/main/java/org/shedlang/compiler/patio/types/PatioDataLayoutFunctionPointer.java
index bdcc2f25..8dd8ca75 100644
--- a/src/main/java/org/shedlang/compiler/patio/ast/types/PatioDataLayoutFunctionPointer.java
+++ b/src/main/java/org/shedlang/compiler/patio/types/PatioDataLayoutFunctionPointer.java
@@ -1,4 +1,4 @@
-package org.shedlang.compiler.patio.ast.types;
+package org.shedlang.compiler.patio.types;
 
 public record PatioDataLayoutFunctionPointer() implements PatioDataLayout {
     public static final PatioDataLayoutFunctionPointer INSTANCE = new PatioDataLayoutFunctionPointer();
diff --git a/src/main/java/org/shedlang/compiler/patio/ast/types/PatioDataLayoutInt.java b/src/main/java/org/shedlang/compiler/patio/types/PatioDataLayoutInt.java
index 33716fc9..5b738606 100644
--- a/src/main/java/org/shedlang/compiler/patio/ast/types/PatioDataLayoutInt.java
+++ b/src/main/java/org/shedlang/compiler/patio/types/PatioDataLayoutInt.java
@@ -1,4 +1,4 @@
-package org.shedlang.compiler.patio.ast.types;
+package org.shedlang.compiler.patio.types;
 
 public record PatioDataLayoutInt() implements PatioDataLayout {
     public static final PatioDataLayoutInt INSTANCE = new PatioDataLayoutInt();
diff --git a/src/main/java/org/shedlang/compiler/patio/ast/types/PatioDataLayoutStruct.java b/src/main/java/org/shedlang/compiler/patio/types/PatioDataLayoutStruct.java
index 6834f660..037a16d0 100644
--- a/src/main/java/org/shedlang/compiler/patio/ast/types/PatioDataLayoutStruct.java
+++ b/src/main/java/org/shedlang/compiler/patio/types/PatioDataLayoutStruct.java
@@ -1,4 +1,4 @@
-package org.shedlang.compiler.patio.ast.types;
+package org.shedlang.compiler.patio.types;
 
 import java.util.List;
 
diff --git a/src/main/java/org/shedlang/compiler/patio/ast/types/PatioDataLayouts.java b/src/main/java/org/shedlang/compiler/patio/types/PatioDataLayouts.java
index ba1dd9d1..c28124aa 100644
--- a/src/main/java/org/shedlang/compiler/patio/ast/types/PatioDataLayouts.java
+++ b/src/main/java/org/shedlang/compiler/patio/types/PatioDataLayouts.java
@@ -1,4 +1,4 @@
-package org.shedlang.compiler.patio.ast.types;
+package org.shedlang.compiler.patio.types;
 
 import java.util.List;
 
diff --git a/src/main/java/org/shedlang/compiler/patio/ast/types/PatioDataPointerType.java b/src/main/java/org/shedlang/compiler/patio/types/PatioDataPointerType.java
index d16d0f3a..d52eb1cf 100644
--- a/src/main/java/org/shedlang/compiler/patio/ast/types/PatioDataPointerType.java
+++ b/src/main/java/org/shedlang/compiler/patio/types/PatioDataPointerType.java
@@ -1,4 +1,4 @@
-package org.shedlang.compiler.patio.ast.types;
+package org.shedlang.compiler.patio.types;
 
 public record PatioDataPointerType() implements PatioType {
     public static final PatioDataPointerType INSTANCE = new PatioDataPointerType();
diff --git a/src/main/java/org/shedlang/compiler/patio/ast/types/PatioDataValue.java b/src/main/java/org/shedlang/compiler/patio/types/PatioDataValue.java
index 0726ba3d..8f3056a6 100644
--- a/src/main/java/org/shedlang/compiler/patio/ast/types/PatioDataValue.java
+++ b/src/main/java/org/shedlang/compiler/patio/types/PatioDataValue.java
@@ -1,4 +1,4 @@
-package org.shedlang.compiler.patio.ast.types;
+package org.shedlang.compiler.patio.types;
 
 public sealed interface PatioDataValue permits PatioDataValueArray, PatioDataValueBool, PatioDataValueByte, PatioDataValueDataPointerNull, PatioDataValueInt, PatioDataValueStruct {
     PatioDataLayout layout();
diff --git a/src/main/java/org/shedlang/compiler/patio/ast/types/PatioDataValueArray.java b/src/main/java/org/shedlang/compiler/patio/types/PatioDataValueArray.java
index e2681c72..6a911432 100644
--- a/src/main/java/org/shedlang/compiler/patio/ast/types/PatioDataValueArray.java
+++ b/src/main/java/org/shedlang/compiler/patio/types/PatioDataValueArray.java
@@ -1,4 +1,4 @@
-package org.shedlang.compiler.patio.ast.types;
+package org.shedlang.compiler.patio.types;
 
 import java.util.List;
 
diff --git a/src/main/java/org/shedlang/compiler/patio/ast/types/PatioDataValueBool.java b/src/main/java/org/shedlang/compiler/patio/types/PatioDataValueBool.java
index 57ca6851..9ca7b405 100644
--- a/src/main/java/org/shedlang/compiler/patio/ast/types/PatioDataValueBool.java
+++ b/src/main/java/org/shedlang/compiler/patio/types/PatioDataValueBool.java
@@ -1,4 +1,4 @@
-package org.shedlang.compiler.patio.ast.types;
+package org.shedlang.compiler.patio.types;
 
 public record PatioDataValueBool(boolean value) implements PatioDataValue {
     @Override
diff --git a/src/main/java/org/shedlang/compiler/patio/ast/types/PatioDataValueByte.java b/src/main/java/org/shedlang/compiler/patio/types/PatioDataValueByte.java
index 4f300f02..69888433 100644
--- a/src/main/java/org/shedlang/compiler/patio/ast/types/PatioDataValueByte.java
+++ b/src/main/java/org/shedlang/compiler/patio/types/PatioDataValueByte.java
@@ -1,4 +1,4 @@
-package org.shedlang.compiler.patio.ast.types;
+package org.shedlang.compiler.patio.types;
 
 public record PatioDataValueByte(byte value) implements PatioDataValue {
     @Override
diff --git a/src/main/java/org/shedlang/compiler/patio/ast/types/PatioDataValueDataPointerNull.java b/src/main/java/org/shedlang/compiler/patio/types/PatioDataValueDataPointerNull.java
index a305d00c..214ee35d 100644
--- a/src/main/java/org/shedlang/compiler/patio/ast/types/PatioDataValueDataPointerNull.java
+++ b/src/main/java/org/shedlang/compiler/patio/types/PatioDataValueDataPointerNull.java
@@ -1,4 +1,4 @@
-package org.shedlang.compiler.patio.ast.types;
+package org.shedlang.compiler.patio.types;
 
 public record PatioDataValueDataPointerNull() implements PatioDataValue {
     @Override
diff --git a/src/main/java/org/shedlang/compiler/patio/ast/types/PatioDataValueInt.java b/src/main/java/org/shedlang/compiler/patio/types/PatioDataValueInt.java
index 96542f68..54053200 100644
--- a/src/main/java/org/shedlang/compiler/patio/ast/types/PatioDataValueInt.java
+++ b/src/main/java/org/shedlang/compiler/patio/types/PatioDataValueInt.java
@@ -1,4 +1,4 @@
-package org.shedlang.compiler.patio.ast.types;
+package org.shedlang.compiler.patio.types;
 
 public record PatioDataValueInt(int value) implements PatioDataValue {
     @Override
diff --git a/src/main/java/org/shedlang/compiler/patio/ast/types/PatioDataValueStruct.java b/src/main/java/org/shedlang/compiler/patio/types/PatioDataValueStruct.java
index 279d2a79..be73e30f 100644
--- a/src/main/java/org/shedlang/compiler/patio/ast/types/PatioDataValueStruct.java
+++ b/src/main/java/org/shedlang/compiler/patio/types/PatioDataValueStruct.java
@@ -1,4 +1,4 @@
-package org.shedlang.compiler.patio.ast.types;
+package org.shedlang.compiler.patio.types;
 
 import java.util.List;
 
diff --git a/src/main/java/org/shedlang/compiler/patio/ast/types/PatioDataValues.java b/src/main/java/org/shedlang/compiler/patio/types/PatioDataValues.java
index 10c09e74..fe1f6844 100644
--- a/src/main/java/org/shedlang/compiler/patio/ast/types/PatioDataValues.java
+++ b/src/main/java/org/shedlang/compiler/patio/types/PatioDataValues.java
@@ -1,4 +1,4 @@
-package org.shedlang.compiler.patio.ast.types;
+package org.shedlang.compiler.patio.types;
 
 import java.util.List;
 
diff --git a/src/main/java/org/shedlang/compiler/patio/ast/types/PatioFunctionPointerType.java b/src/main/java/org/shedlang/compiler/patio/types/PatioFunctionPointerType.java
index 86f0ac51..e98940aa 100644
--- a/src/main/java/org/shedlang/compiler/patio/ast/types/PatioFunctionPointerType.java
+++ b/src/main/java/org/shedlang/compiler/patio/types/PatioFunctionPointerType.java
@@ -1,4 +1,4 @@
-package org.shedlang.compiler.patio.ast.types;
+package org.shedlang.compiler.patio.types;
 
 public record PatioFunctionPointerType() implements PatioType {
     public static final PatioFunctionPointerType INSTANCE = new PatioFunctionPointerType();
diff --git a/src/main/java/org/shedlang/compiler/patio/ast/types/PatioIntType.java b/src/main/java/org/shedlang/compiler/patio/types/PatioIntType.java
index b5312754..7a7171ef 100644
--- a/src/main/java/org/shedlang/compiler/patio/ast/types/PatioIntType.java
+++ b/src/main/java/org/shedlang/compiler/patio/types/PatioIntType.java
@@ -1,4 +1,4 @@
-package org.shedlang.compiler.patio.ast.types;
+package org.shedlang.compiler.patio.types;
 
 public record PatioIntType() implements PatioType {
     static final PatioIntType INSTANCE = new PatioIntType();
diff --git a/src/main/java/org/shedlang/compiler/patio/ast/types/PatioType.java b/src/main/java/org/shedlang/compiler/patio/types/PatioType.java
index b3a1bfa5..13caa01d 100644
--- a/src/main/java/org/shedlang/compiler/patio/ast/types/PatioType.java
+++ b/src/main/java/org/shedlang/compiler/patio/types/PatioType.java
@@ -1,4 +1,4 @@
-package org.shedlang.compiler.patio.ast.types;
+package org.shedlang.compiler.patio.types;
 
 public sealed interface PatioType permits PatioBoolType, PatioByteType, PatioDataPointerType, PatioFunctionPointerType, PatioIntType, PatioVoidType {
 }
diff --git a/src/main/java/org/shedlang/compiler/patio/ast/types/PatioTypes.java b/src/main/java/org/shedlang/compiler/patio/types/PatioTypes.java
index edf24ef0..dcfbd08e 100644
--- a/src/main/java/org/shedlang/compiler/patio/ast/types/PatioTypes.java
+++ b/src/main/java/org/shedlang/compiler/patio/types/PatioTypes.java
@@ -1,4 +1,4 @@
-package org.shedlang.compiler.patio.ast.types;
+package org.shedlang.compiler.patio.types;
 
 public class PatioTypes {
     private PatioTypes() {
diff --git a/src/main/java/org/shedlang/compiler/patio/ast/types/PatioVoidType.java b/src/main/java/org/shedlang/compiler/patio/types/PatioVoidType.java
index 359f17e3..2075a03c 100644
--- a/src/main/java/org/shedlang/compiler/patio/ast/types/PatioVoidType.java
+++ b/src/main/java/org/shedlang/compiler/patio/types/PatioVoidType.java
@@ -1,4 +1,4 @@
-package org.shedlang.compiler.patio.ast.types;
+package org.shedlang.compiler.patio.types;
 
 public record PatioVoidType() implements PatioType {
     public static final PatioVoidType INSTANCE = new PatioVoidType();
diff --git a/src/main/java/org/shedlang/compiler/shidtopatio/ShidToPatio.java b/src/main/java/org/shedlang/compiler/shidtopatio/ShidToPatio.java
index 62d374a3..1d35207c 100644
--- a/src/main/java/org/shedlang/compiler/shidtopatio/ShidToPatio.java
+++ b/src/main/java/org/shedlang/compiler/shidtopatio/ShidToPatio.java
@@ -1,12 +1,12 @@
 package org.shedlang.compiler.shidtopatio;
 
-import org.shedlang.compiler.patio.ast.PatioCompilationUnit;
-import org.shedlang.compiler.patio.ast.PatioVisibility;
-import org.shedlang.compiler.patio.ast.instructions.*;
-import org.shedlang.compiler.patio.ast.operands.PatioInt;
-import org.shedlang.compiler.patio.ast.operands.PatioLocalRef;
-import org.shedlang.compiler.patio.ast.operands.PatioOperand;
-import org.shedlang.compiler.patio.ast.types.PatioTypes;
+import org.shedlang.compiler.patio.PatioCompilationUnit;
+import org.shedlang.compiler.patio.PatioVisibility;
+import org.shedlang.compiler.patio.instructions.*;
+import org.shedlang.compiler.patio.operands.PatioInt;
+import org.shedlang.compiler.patio.operands.PatioLocalRef;
+import org.shedlang.compiler.patio.operands.PatioOperand;
+import org.shedlang.compiler.patio.types.PatioTypes;
 import org.shedlang.compiler.shid.ShidNamespace;
 import org.shedlang.compiler.shid.instructions.*;
 import org.shedlang.compiler.sources.Source;
diff --git a/src/main/java/org/shedlang/compiler/shidtopatio/ShidToPatioClosures.java b/src/main/java/org/shedlang/compiler/shidtopatio/ShidToPatioClosures.java
index 5bc55bc3..f1e00e50 100644
--- a/src/main/java/org/shedlang/compiler/shidtopatio/ShidToPatioClosures.java
+++ b/src/main/java/org/shedlang/compiler/shidtopatio/ShidToPatioClosures.java
@@ -2,15 +2,15 @@ package org.shedlang.compiler.shidtopatio;
 
 import org.shedlang.compiler.ast.typed.FreeVariable;
 import org.shedlang.compiler.ast.typed.FreeVariables;
-import org.shedlang.compiler.patio.ast.PatioVisibility;
-import org.shedlang.compiler.patio.ast.instructions.*;
-import org.shedlang.compiler.patio.ast.operands.PatioFunctionPtr;
-import org.shedlang.compiler.patio.ast.operands.PatioLocalRef;
-import org.shedlang.compiler.patio.ast.operands.PatioOperand;
-import org.shedlang.compiler.patio.ast.types.PatioDataLayout;
-import org.shedlang.compiler.patio.ast.types.PatioDataLayouts;
-import org.shedlang.compiler.patio.ast.types.PatioType;
-import org.shedlang.compiler.patio.ast.types.PatioTypes;
+import org.shedlang.compiler.patio.PatioVisibility;
+import org.shedlang.compiler.patio.instructions.*;
+import org.shedlang.compiler.patio.operands.PatioFunctionPtr;
+import org.shedlang.compiler.patio.operands.PatioLocalRef;
+import org.shedlang.compiler.patio.operands.PatioOperand;
+import org.shedlang.compiler.patio.types.PatioDataLayout;
+import org.shedlang.compiler.patio.types.PatioDataLayouts;
+import org.shedlang.compiler.patio.types.PatioType;
+import org.shedlang.compiler.patio.types.PatioTypes;
 import org.shedlang.compiler.shid.instructions.ShidDefineFunction;
 import org.shedlang.compiler.sources.Source;
 import org.shedlang.compiler.util.P;
diff --git a/src/main/java/org/shedlang/compiler/shidtopatio/ShidToPatioContext.java b/src/main/java/org/shedlang/compiler/shidtopatio/ShidToPatioContext.java
index 8870bc17..dc338c83 100644
--- a/src/main/java/org/shedlang/compiler/shidtopatio/ShidToPatioContext.java
+++ b/src/main/java/org/shedlang/compiler/shidtopatio/ShidToPatioContext.java
@@ -5,13 +5,13 @@ import org.pcollections.PMap;
 import org.pcollections.PStack;
 import org.pcollections.PVector;
 import org.shedlang.compiler.backends.NameAllocator;
-import org.shedlang.compiler.patio.ast.*;
-import org.shedlang.compiler.patio.ast.instructions.PatioInstruction;
-import org.shedlang.compiler.patio.ast.instructions.PatioLocalStore;
-import org.shedlang.compiler.patio.ast.operands.PatioLocalRef;
-import org.shedlang.compiler.patio.ast.operands.PatioOperand;
-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.instructions.PatioInstruction;
+import org.shedlang.compiler.patio.instructions.PatioLocalStore;
+import org.shedlang.compiler.patio.operands.PatioLocalRef;
+import org.shedlang.compiler.patio.operands.PatioOperand;
+import org.shedlang.compiler.patio.types.PatioDataValue;
+import org.shedlang.compiler.patio.types.PatioType;
 import org.shedlang.compiler.shidtopatio.errors.DuplicateCompilationUnitElementName;
 import org.shedlang.compiler.sources.Source;
 import org.shedlang.compiler.typechecker.TypeInfos;
diff --git a/src/main/java/org/shedlang/compiler/shidtopatio/ShidToPatioEffects.java b/src/main/java/org/shedlang/compiler/shidtopatio/ShidToPatioEffects.java
index cbb321d6..0b78429a 100644
--- a/src/main/java/org/shedlang/compiler/shidtopatio/ShidToPatioEffects.java
+++ b/src/main/java/org/shedlang/compiler/shidtopatio/ShidToPatioEffects.java
@@ -1,17 +1,17 @@
 package org.shedlang.compiler.shidtopatio;
 
 import org.shedlang.compiler.ast.typed.FreeVariables;
-import org.shedlang.compiler.patio.ast.PatioExceptionTypeDefinition;
-import org.shedlang.compiler.patio.ast.PatioFunctionDeclaration;
-import org.shedlang.compiler.patio.ast.PatioLocal;
-import org.shedlang.compiler.patio.ast.instructions.*;
-import org.shedlang.compiler.patio.ast.operands.PatioInt;
-import org.shedlang.compiler.patio.ast.operands.PatioLocalRef;
-import org.shedlang.compiler.patio.ast.operands.PatioOperand;
-import org.shedlang.compiler.patio.ast.types.PatioDataLayout;
-import org.shedlang.compiler.patio.ast.types.PatioDataLayouts;
-import org.shedlang.compiler.patio.ast.types.PatioType;
-import org.shedlang.compiler.patio.ast.types.PatioTypes;
+import org.shedlang.compiler.patio.PatioExceptionTypeDefinition;
+import org.shedlang.compiler.patio.PatioFunctionDeclaration;
+import org.shedlang.compiler.patio.PatioLocal;
+import org.shedlang.compiler.patio.instructions.*;
+import org.shedlang.compiler.patio.operands.PatioInt;
+import org.shedlang.compiler.patio.operands.PatioLocalRef;
+import org.shedlang.compiler.patio.operands.PatioOperand;
+import org.shedlang.compiler.patio.types.PatioDataLayout;
+import org.shedlang.compiler.patio.types.PatioDataLayouts;
+import org.shedlang.compiler.patio.types.PatioType;
+import org.shedlang.compiler.patio.types.PatioTypes;
 import org.shedlang.compiler.shid.instructions.ShidDefineFunction;
 import org.shedlang.compiler.sources.Source;
 import org.shedlang.compiler.sources.Sources;
diff --git a/src/main/java/org/shedlang/compiler/shidtopatio/ShidToPatioFunctions.java b/src/main/java/org/shedlang/compiler/shidtopatio/ShidToPatioFunctions.java
index e6e7259a..c0a6ad74 100644
--- a/src/main/java/org/shedlang/compiler/shidtopatio/ShidToPatioFunctions.java
+++ b/src/main/java/org/shedlang/compiler/shidtopatio/ShidToPatioFunctions.java
@@ -1,9 +1,9 @@
 package org.shedlang.compiler.shidtopatio;
 
 import org.shedlang.compiler.ast.typed.FreeVariables;
-import org.shedlang.compiler.patio.ast.operands.PatioLocalRef;
-import org.shedlang.compiler.patio.ast.types.PatioDataLayout;
-import org.shedlang.compiler.patio.ast.types.PatioDataLayouts;
+import org.shedlang.compiler.patio.operands.PatioLocalRef;
+import org.shedlang.compiler.patio.types.PatioDataLayout;
+import org.shedlang.compiler.patio.types.PatioDataLayouts;
 import org.shedlang.compiler.shid.instructions.ShidDefineFunction;
 import org.shedlang.compiler.sources.Source;
 
diff --git a/src/main/java/org/shedlang/compiler/shidtopatio/ShidToPatioGc.java b/src/main/java/org/shedlang/compiler/shidtopatio/ShidToPatioGc.java
index 7a55f67e..90466728 100644
--- a/src/main/java/org/shedlang/compiler/shidtopatio/ShidToPatioGc.java
+++ b/src/main/java/org/shedlang/compiler/shidtopatio/ShidToPatioGc.java
@@ -1,12 +1,12 @@
 package org.shedlang.compiler.shidtopatio;
 
-import org.shedlang.compiler.patio.ast.PatioFunctionDeclaration;
-import org.shedlang.compiler.patio.ast.PatioLocal;
-import org.shedlang.compiler.patio.ast.instructions.PatioAllocHeap;
-import org.shedlang.compiler.patio.ast.instructions.PatioCall;
-import org.shedlang.compiler.patio.ast.operands.PatioLocalRef;
-import org.shedlang.compiler.patio.ast.operands.PatioOperand;
-import org.shedlang.compiler.patio.ast.types.*;
+import org.shedlang.compiler.patio.PatioFunctionDeclaration;
+import org.shedlang.compiler.patio.PatioLocal;
+import org.shedlang.compiler.patio.instructions.PatioAllocHeap;
+import org.shedlang.compiler.patio.instructions.PatioCall;
+import org.shedlang.compiler.patio.operands.PatioLocalRef;
+import org.shedlang.compiler.patio.operands.PatioOperand;
+import org.shedlang.compiler.patio.types.*;
 import org.shedlang.compiler.sources.Source;
 import org.shedlang.compiler.sources.Sources;
 import org.shedlang.compiler.util.Lists;
diff --git a/src/main/java/org/shedlang/compiler/shidtopatio/ShidToPatioInts.java b/src/main/java/org/shedlang/compiler/shidtopatio/ShidToPatioInts.java
index 98dfea10..e26a6f27 100644
--- a/src/main/java/org/shedlang/compiler/shidtopatio/ShidToPatioInts.java
+++ b/src/main/java/org/shedlang/compiler/shidtopatio/ShidToPatioInts.java
@@ -1,13 +1,13 @@
 package org.shedlang.compiler.shidtopatio;
 
-import org.shedlang.compiler.patio.ast.PatioFunctionDeclaration;
-import org.shedlang.compiler.patio.ast.PatioLocal;
-import org.shedlang.compiler.patio.ast.instructions.PatioCall;
-import org.shedlang.compiler.patio.ast.operands.PatioInt;
-import org.shedlang.compiler.patio.ast.operands.PatioLocalRef;
-import org.shedlang.compiler.patio.ast.operands.PatioOperand;
-import org.shedlang.compiler.patio.ast.types.PatioType;
-import org.shedlang.compiler.patio.ast.types.PatioTypes;
+import org.shedlang.compiler.patio.PatioFunctionDeclaration;
+import org.shedlang.compiler.patio.PatioLocal;
+import org.shedlang.compiler.patio.instructions.PatioCall;
+import org.shedlang.compiler.patio.operands.PatioInt;
+import org.shedlang.compiler.patio.operands.PatioLocalRef;
+import org.shedlang.compiler.patio.operands.PatioOperand;
+import org.shedlang.compiler.patio.types.PatioType;
+import org.shedlang.compiler.patio.types.PatioTypes;
 import org.shedlang.compiler.sources.Source;
 import org.shedlang.compiler.sources.Sources;
 
diff --git a/src/main/java/org/shedlang/compiler/shidtopatio/ShidToPatioNamespaces.java b/src/main/java/org/shedlang/compiler/shidtopatio/ShidToPatioNamespaces.java
index 68d55634..7a9cc011 100644
--- a/src/main/java/org/shedlang/compiler/shidtopatio/ShidToPatioNamespaces.java
+++ b/src/main/java/org/shedlang/compiler/shidtopatio/ShidToPatioNamespaces.java
@@ -1,13 +1,13 @@
 package org.shedlang.compiler.shidtopatio;
 
-import org.shedlang.compiler.patio.ast.PatioFunctionDeclaration;
-import org.shedlang.compiler.patio.ast.PatioVisibility;
-import org.shedlang.compiler.patio.ast.instructions.*;
-import org.shedlang.compiler.patio.ast.operands.PatioBool;
-import org.shedlang.compiler.patio.ast.operands.PatioDataPtr;
-import org.shedlang.compiler.patio.ast.operands.PatioLocalRef;
-import org.shedlang.compiler.patio.ast.operands.PatioOperand;
-import org.shedlang.compiler.patio.ast.types.*;
+import org.shedlang.compiler.patio.PatioFunctionDeclaration;
+import org.shedlang.compiler.patio.PatioVisibility;
+import org.shedlang.compiler.patio.instructions.*;
+import org.shedlang.compiler.patio.operands.PatioBool;
+import org.shedlang.compiler.patio.operands.PatioDataPtr;
+import org.shedlang.compiler.patio.operands.PatioLocalRef;
+import org.shedlang.compiler.patio.operands.PatioOperand;
+import org.shedlang.compiler.patio.types.*;
 import org.shedlang.compiler.sources.Source;
 import org.shedlang.compiler.sources.Sources;
 import org.shedlang.compiler.types.NamespaceName;
diff --git a/src/main/java/org/shedlang/compiler/shidtopatio/ShidToPatioStrings.java b/src/main/java/org/shedlang/compiler/shidtopatio/ShidToPatioStrings.java
index 06cb5855..fee60d76 100644
--- a/src/main/java/org/shedlang/compiler/shidtopatio/ShidToPatioStrings.java
+++ b/src/main/java/org/shedlang/compiler/shidtopatio/ShidToPatioStrings.java
@@ -1,15 +1,15 @@
 package org.shedlang.compiler.shidtopatio;
 
-import org.shedlang.compiler.patio.ast.PatioDataElementImmutable;
-import org.shedlang.compiler.patio.ast.PatioFunctionDeclaration;
-import org.shedlang.compiler.patio.ast.PatioLocal;
-import org.shedlang.compiler.patio.ast.instructions.PatioCall;
-import org.shedlang.compiler.patio.ast.operands.PatioDataPtr;
-import org.shedlang.compiler.patio.ast.operands.PatioLocalRef;
-import org.shedlang.compiler.patio.ast.operands.PatioOperand;
-import org.shedlang.compiler.patio.ast.types.PatioDataLayouts;
-import org.shedlang.compiler.patio.ast.types.PatioDataValue;
-import org.shedlang.compiler.patio.ast.types.PatioDataValues;
+import org.shedlang.compiler.patio.PatioDataElementImmutable;
+import org.shedlang.compiler.patio.PatioFunctionDeclaration;
+import org.shedlang.compiler.patio.PatioLocal;
+import org.shedlang.compiler.patio.instructions.PatioCall;
+import org.shedlang.compiler.patio.operands.PatioDataPtr;
+import org.shedlang.compiler.patio.operands.PatioLocalRef;
+import org.shedlang.compiler.patio.operands.PatioOperand;
+import org.shedlang.compiler.patio.types.PatioDataLayouts;
+import org.shedlang.compiler.patio.types.PatioDataValue;
+import org.shedlang.compiler.patio.types.PatioDataValues;
 import org.shedlang.compiler.sources.Source;
 import org.shedlang.compiler.sources.Sources;
 
diff --git a/src/main/java/org/shedlang/compiler/shidtopatio/ShidToPatioStructs.java b/src/main/java/org/shedlang/compiler/shidtopatio/ShidToPatioStructs.java
index 7e8159d2..0f18b9e9 100644
--- a/src/main/java/org/shedlang/compiler/shidtopatio/ShidToPatioStructs.java
+++ b/src/main/java/org/shedlang/compiler/shidtopatio/ShidToPatioStructs.java
@@ -1,13 +1,13 @@
 package org.shedlang.compiler.shidtopatio;
 
 import org.shedlang.compiler.ast.typed.FreeVariables;
-import org.shedlang.compiler.patio.ast.instructions.*;
-import org.shedlang.compiler.patio.ast.operands.PatioInt;
-import org.shedlang.compiler.patio.ast.operands.PatioLocalRef;
-import org.shedlang.compiler.patio.ast.operands.PatioOperand;
-import org.shedlang.compiler.patio.ast.types.PatioDataLayout;
-import org.shedlang.compiler.patio.ast.types.PatioDataLayouts;
-import org.shedlang.compiler.patio.ast.types.PatioTypes;
+import org.shedlang.compiler.patio.instructions.*;
+import org.shedlang.compiler.patio.operands.PatioInt;
+import org.shedlang.compiler.patio.operands.PatioLocalRef;
+import org.shedlang.compiler.patio.operands.PatioOperand;
+import org.shedlang.compiler.patio.types.PatioDataLayout;
+import org.shedlang.compiler.patio.types.PatioDataLayouts;
+import org.shedlang.compiler.patio.types.PatioTypes;
 import org.shedlang.compiler.sources.Source;
 import org.shedlang.compiler.shid.instructions.ShidDefineFunction;
 import org.shedlang.compiler.shid.instructions.ShidDefineStruct;
diff --git a/src/main/java/org/shedlang/compiler/shidtopatio/ShidToPatioTuples.java b/src/main/java/org/shedlang/compiler/shidtopatio/ShidToPatioTuples.java
index 75815fcb..501badc5 100644
--- a/src/main/java/org/shedlang/compiler/shidtopatio/ShidToPatioTuples.java
+++ b/src/main/java/org/shedlang/compiler/shidtopatio/ShidToPatioTuples.java
@@ -1,12 +1,12 @@
 package org.shedlang.compiler.shidtopatio;
 
-import org.shedlang.compiler.patio.ast.instructions.*;
-import org.shedlang.compiler.patio.ast.operands.PatioInt;
-import org.shedlang.compiler.patio.ast.operands.PatioLocalRef;
-import org.shedlang.compiler.patio.ast.operands.PatioOperand;
-import org.shedlang.compiler.patio.ast.types.PatioDataLayout;
-import org.shedlang.compiler.patio.ast.types.PatioDataLayouts;
-import org.shedlang.compiler.patio.ast.types.PatioTypes;
+import org.shedlang.compiler.patio.instructions.*;
+import org.shedlang.compiler.patio.operands.PatioInt;
+import org.shedlang.compiler.patio.operands.PatioLocalRef;
+import org.shedlang.compiler.patio.operands.PatioOperand;
+import org.shedlang.compiler.patio.types.PatioDataLayout;
+import org.shedlang.compiler.patio.types.PatioDataLayouts;
+import org.shedlang.compiler.patio.types.PatioTypes;
 import org.shedlang.compiler.sources.Source;
 import org.shedlang.compiler.util.Lists;
 
diff --git a/src/main/java/org/shedlang/compiler/shidtopatio/ShidToPatioTypes.java b/src/main/java/org/shedlang/compiler/shidtopatio/ShidToPatioTypes.java
index 1d6a6567..1288d430 100644
--- a/src/main/java/org/shedlang/compiler/shidtopatio/ShidToPatioTypes.java
+++ b/src/main/java/org/shedlang/compiler/shidtopatio/ShidToPatioTypes.java
@@ -1,7 +1,7 @@
 package org.shedlang.compiler.shidtopatio;
 
-import org.shedlang.compiler.patio.ast.types.PatioType;
-import org.shedlang.compiler.patio.ast.types.PatioTypes;
+import org.shedlang.compiler.patio.types.PatioType;
+import org.shedlang.compiler.patio.types.PatioTypes;
 
 public class ShidToPatioTypes {
     private ShidToPatioTypes() {}
diff --git a/src/main/java/org/shedlang/compiler/shidtopatio/ShidToPatioVars.java b/src/main/java/org/shedlang/compiler/shidtopatio/ShidToPatioVars.java
index 1aca893f..b38012f0 100644
--- a/src/main/java/org/shedlang/compiler/shidtopatio/ShidToPatioVars.java
+++ b/src/main/java/org/shedlang/compiler/shidtopatio/ShidToPatioVars.java
@@ -1,12 +1,12 @@
 package org.shedlang.compiler.shidtopatio;
 
-import org.shedlang.compiler.patio.ast.instructions.PatioMemoryLoad;
-import org.shedlang.compiler.patio.ast.instructions.PatioMemoryStore;
-import org.shedlang.compiler.patio.ast.operands.PatioLocalRef;
-import org.shedlang.compiler.patio.ast.operands.PatioOperand;
-import org.shedlang.compiler.patio.ast.types.PatioDataLayout;
-import org.shedlang.compiler.patio.ast.types.PatioDataLayouts;
-import org.shedlang.compiler.patio.ast.types.PatioTypes;
+import org.shedlang.compiler.patio.instructions.PatioMemoryLoad;
+import org.shedlang.compiler.patio.instructions.PatioMemoryStore;
+import org.shedlang.compiler.patio.operands.PatioLocalRef;
+import org.shedlang.compiler.patio.operands.PatioOperand;
+import org.shedlang.compiler.patio.types.PatioDataLayout;
+import org.shedlang.compiler.patio.types.PatioDataLayouts;
+import org.shedlang.compiler.patio.types.PatioTypes;
 import org.shedlang.compiler.sources.Source;
 
 import java.util.List;