Move ShidToPatio code to separate package

36 files changed, 70 insertions, 70 deletions

diff --git a/src/test/java/org/shedlang/compiler/patio/PatioTesting.java b/src/test/java/org/shedlang/compiler/patio/PatioTesting.java
index 2bbc1f02..ddebca23 100644
--- a/src/test/java/org/shedlang/compiler/patio/PatioTesting.java
+++ b/src/test/java/org/shedlang/compiler/patio/PatioTesting.java
@@ -9,10 +9,10 @@ import org.shedlang.compiler.patio.ast.types.PatioDataLayout;
 import org.shedlang.compiler.patio.ast.types.PatioDataValue;
 import org.shedlang.compiler.patio.ast.types.PatioType;
 
-class PatioTesting {
+public class PatioTesting {
     private PatioTesting() {}
 
-    static String serializeCompilationUnit(PatioCompilationUnit compilationUnit) {
+    public static String serializeCompilationUnit(PatioCompilationUnit compilationUnit) {
         var builder = new StringBuilder();
         PatioSerializer.serializeCompilationUnit(compilationUnit, builder);
         return builder.toString();
diff --git a/src/test/java/org/shedlang/compiler/patio/ShidToPatioCallTests.java b/src/test/java/org/shedlang/compiler/shidtopatio/ShidToPatioCallTests.java
index 135cdc28..3ce22459 100644
--- a/src/test/java/org/shedlang/compiler/patio/ShidToPatioCallTests.java
+++ b/src/test/java/org/shedlang/compiler/shidtopatio/ShidToPatioCallTests.java
@@ -1,4 +1,4 @@
-package org.shedlang.compiler.patio;
+package org.shedlang.compiler.shidtopatio;
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -10,7 +10,7 @@ import org.shedlang.compiler.testing.snapshots.Snapshotter;
 import java.io.IOException;
 import java.util.List;
 
-import static org.shedlang.compiler.patio.ShidToPatioTesting.serialize;
+import static org.shedlang.compiler.shidtopatio.ShidToPatioTesting.serialize;
 
 @ExtendWith({SnapshotResolver.class})
 public class ShidToPatioCallTests {
diff --git a/src/test/java/org/shedlang/compiler/patio/ShidToPatioContextTests.java b/src/test/java/org/shedlang/compiler/shidtopatio/ShidToPatioContextTests.java
index 1b2c0a75..b8bf1da5 100644
--- a/src/test/java/org/shedlang/compiler/patio/ShidToPatioContextTests.java
+++ b/src/test/java/org/shedlang/compiler/shidtopatio/ShidToPatioContextTests.java
@@ -1,9 +1,9 @@
-package org.shedlang.compiler.patio;
+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.errors.DuplicateCompilationUnitElementName;
+import org.shedlang.compiler.shidtopatio.errors.DuplicateCompilationUnitElementName;
 import org.shedlang.compiler.sources.Sources;
 
 import static org.junit.jupiter.api.Assertions.assertThrows;
diff --git a/src/test/java/org/shedlang/compiler/patio/ShidToPatioDefineEffectTests.java b/src/test/java/org/shedlang/compiler/shidtopatio/ShidToPatioDefineEffectTests.java
index 8d29b212..686f708c 100644
--- a/src/test/java/org/shedlang/compiler/patio/ShidToPatioDefineEffectTests.java
+++ b/src/test/java/org/shedlang/compiler/shidtopatio/ShidToPatioDefineEffectTests.java
@@ -1,4 +1,4 @@
-package org.shedlang.compiler.patio;
+package org.shedlang.compiler.shidtopatio;
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -10,7 +10,7 @@ import org.shedlang.compiler.types.*;
 
 import java.io.IOException;
 
-import static org.shedlang.compiler.patio.ShidToPatioTesting.serialize;
+import static org.shedlang.compiler.shidtopatio.ShidToPatioTesting.serialize;
 
 @ExtendWith({SnapshotResolver.class})
 public class ShidToPatioDefineEffectTests {
diff --git a/src/test/java/org/shedlang/compiler/patio/ShidToPatioDefineFunctionTests.java b/src/test/java/org/shedlang/compiler/shidtopatio/ShidToPatioDefineFunctionTests.java
index 769069a4..12db80c6 100644
--- a/src/test/java/org/shedlang/compiler/patio/ShidToPatioDefineFunctionTests.java
+++ b/src/test/java/org/shedlang/compiler/shidtopatio/ShidToPatioDefineFunctionTests.java
@@ -1,4 +1,4 @@
-package org.shedlang.compiler.patio;
+package org.shedlang.compiler.shidtopatio;
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -14,7 +14,7 @@ import org.shedlang.compiler.testing.snapshots.Snapshotter;
 import java.io.IOException;
 import java.util.List;
 
-import static org.shedlang.compiler.patio.ShidToPatioTesting.serialize;
+import static org.shedlang.compiler.shidtopatio.ShidToPatioTesting.serialize;
 
 @ExtendWith({SnapshotResolver.class})
 public class ShidToPatioDefineFunctionTests {
diff --git a/src/test/java/org/shedlang/compiler/patio/ShidToPatioDefineStructTests.java b/src/test/java/org/shedlang/compiler/shidtopatio/ShidToPatioDefineStructTests.java
index 3db3c28b..c9dd3cf1 100644
--- a/src/test/java/org/shedlang/compiler/patio/ShidToPatioDefineStructTests.java
+++ b/src/test/java/org/shedlang/compiler/shidtopatio/ShidToPatioDefineStructTests.java
@@ -1,4 +1,4 @@
-package org.shedlang.compiler.patio;
+package org.shedlang.compiler.shidtopatio;
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -13,7 +13,7 @@ import org.shedlang.compiler.types.Types;
 import java.io.IOException;
 import java.util.List;
 
-import static org.shedlang.compiler.patio.ShidToPatioTesting.serialize;
+import static org.shedlang.compiler.shidtopatio.ShidToPatioTesting.serialize;
 import static org.zwobble.precisely.AssertThat.assertThat;
 import static org.zwobble.precisely.Matchers.equalTo;
 
diff --git a/src/test/java/org/shedlang/compiler/patio/ShidToPatioDiscardTests.java b/src/test/java/org/shedlang/compiler/shidtopatio/ShidToPatioDiscardTests.java
index 58cbbe6d..a8d1a7fe 100644
--- a/src/test/java/org/shedlang/compiler/patio/ShidToPatioDiscardTests.java
+++ b/src/test/java/org/shedlang/compiler/shidtopatio/ShidToPatioDiscardTests.java
@@ -1,4 +1,4 @@
-package org.shedlang.compiler.patio;
+package org.shedlang.compiler.shidtopatio;
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -9,7 +9,7 @@ import org.shedlang.compiler.testing.snapshots.Snapshotter;
 
 import java.io.IOException;
 
-import static org.shedlang.compiler.patio.ShidToPatioTesting.serialize;
+import static org.shedlang.compiler.shidtopatio.ShidToPatioTesting.serialize;
 
 @ExtendWith({SnapshotResolver.class})
 public class ShidToPatioDiscardTests {
diff --git a/src/test/java/org/shedlang/compiler/patio/ShidToPatioEffectHandlerBreakTests.java b/src/test/java/org/shedlang/compiler/shidtopatio/ShidToPatioEffectHandlerBreakTests.java
index 5a6a8bb1..5becfc12 100644
--- a/src/test/java/org/shedlang/compiler/patio/ShidToPatioEffectHandlerBreakTests.java
+++ b/src/test/java/org/shedlang/compiler/shidtopatio/ShidToPatioEffectHandlerBreakTests.java
@@ -1,4 +1,4 @@
-package org.shedlang.compiler.patio;
+package org.shedlang.compiler.shidtopatio;
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -11,7 +11,7 @@ import org.shedlang.compiler.types.NamespaceName;
 
 import java.io.IOException;
 
-import static org.shedlang.compiler.patio.ShidToPatioTesting.serialize;
+import static org.shedlang.compiler.shidtopatio.ShidToPatioTesting.serialize;
 
 @ExtendWith({SnapshotResolver.class})
 public class ShidToPatioEffectHandlerBreakTests {
diff --git a/src/test/java/org/shedlang/compiler/patio/ShidToPatioFieldLoadTests.java b/src/test/java/org/shedlang/compiler/shidtopatio/ShidToPatioFieldLoadTests.java
index be7c5ab6..8b5db2b7 100644
--- a/src/test/java/org/shedlang/compiler/patio/ShidToPatioFieldLoadTests.java
+++ b/src/test/java/org/shedlang/compiler/shidtopatio/ShidToPatioFieldLoadTests.java
@@ -1,4 +1,4 @@
-package org.shedlang.compiler.patio;
+package org.shedlang.compiler.shidtopatio;
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -13,7 +13,7 @@ import org.shedlang.compiler.types.*;
 import java.io.IOException;
 import java.util.List;
 
-import static org.shedlang.compiler.patio.ShidToPatioTesting.serialize;
+import static org.shedlang.compiler.shidtopatio.ShidToPatioTesting.serialize;
 
 @ExtendWith({SnapshotResolver.class})
 public class ShidToPatioFieldLoadTests {
diff --git a/src/test/java/org/shedlang/compiler/patio/ShidToPatioIfTests.java b/src/test/java/org/shedlang/compiler/shidtopatio/ShidToPatioIfTests.java
index c0ed1d9a..8c409f93 100644
--- a/src/test/java/org/shedlang/compiler/patio/ShidToPatioIfTests.java
+++ b/src/test/java/org/shedlang/compiler/shidtopatio/ShidToPatioIfTests.java
@@ -1,4 +1,4 @@
-package org.shedlang.compiler.patio;
+package org.shedlang.compiler.shidtopatio;
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -10,7 +10,7 @@ import org.shedlang.compiler.testing.snapshots.Snapshotter;
 import java.io.IOException;
 import java.util.List;
 
-import static org.shedlang.compiler.patio.ShidToPatioTesting.serialize;
+import static org.shedlang.compiler.shidtopatio.ShidToPatioTesting.serialize;
 
 @ExtendWith({SnapshotResolver.class})
 public class ShidToPatioIfTests {
diff --git a/src/test/java/org/shedlang/compiler/patio/ShidToPatioIntAddTests.java b/src/test/java/org/shedlang/compiler/shidtopatio/ShidToPatioIntAddTests.java
index 309b1860..e8d2f255 100644
--- a/src/test/java/org/shedlang/compiler/patio/ShidToPatioIntAddTests.java
+++ b/src/test/java/org/shedlang/compiler/shidtopatio/ShidToPatioIntAddTests.java
@@ -1,4 +1,4 @@
-package org.shedlang.compiler.patio;
+package org.shedlang.compiler.shidtopatio;
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -9,7 +9,7 @@ import org.shedlang.compiler.testing.snapshots.Snapshotter;
 
 import java.io.IOException;
 
-import static org.shedlang.compiler.patio.ShidToPatioTesting.serialize;
+import static org.shedlang.compiler.shidtopatio.ShidToPatioTesting.serialize;
 
 @ExtendWith({SnapshotResolver.class})
 public class ShidToPatioIntAddTests {
diff --git a/src/test/java/org/shedlang/compiler/patio/ShidToPatioIntEqualsTests.java b/src/test/java/org/shedlang/compiler/shidtopatio/ShidToPatioIntEqualsTests.java
index e17f4097..25c315a2 100644
--- a/src/test/java/org/shedlang/compiler/patio/ShidToPatioIntEqualsTests.java
+++ b/src/test/java/org/shedlang/compiler/shidtopatio/ShidToPatioIntEqualsTests.java
@@ -1,4 +1,4 @@
-package org.shedlang.compiler.patio;
+package org.shedlang.compiler.shidtopatio;
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -9,7 +9,7 @@ import org.shedlang.compiler.testing.snapshots.Snapshotter;
 
 import java.io.IOException;
 
-import static org.shedlang.compiler.patio.ShidToPatioTesting.serialize;
+import static org.shedlang.compiler.shidtopatio.ShidToPatioTesting.serialize;
 
 @ExtendWith({SnapshotResolver.class})
 public class ShidToPatioIntEqualsTests {
diff --git a/src/test/java/org/shedlang/compiler/patio/ShidToPatioIntNotEqualTests.java b/src/test/java/org/shedlang/compiler/shidtopatio/ShidToPatioIntNotEqualTests.java
index 7e6c69ad..9a02fda1 100644
--- a/src/test/java/org/shedlang/compiler/patio/ShidToPatioIntNotEqualTests.java
+++ b/src/test/java/org/shedlang/compiler/shidtopatio/ShidToPatioIntNotEqualTests.java
@@ -1,4 +1,4 @@
-package org.shedlang.compiler.patio;
+package org.shedlang.compiler.shidtopatio;
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -9,7 +9,7 @@ import org.shedlang.compiler.testing.snapshots.Snapshotter;
 
 import java.io.IOException;
 
-import static org.shedlang.compiler.patio.ShidToPatioTesting.serialize;
+import static org.shedlang.compiler.shidtopatio.ShidToPatioTesting.serialize;
 
 @ExtendWith({SnapshotResolver.class})
 public class ShidToPatioIntNotEqualTests {
diff --git a/src/test/java/org/shedlang/compiler/patio/ShidToPatioIntSubTests.java b/src/test/java/org/shedlang/compiler/shidtopatio/ShidToPatioIntSubTests.java
index 76da989f..5d958883 100644
--- a/src/test/java/org/shedlang/compiler/patio/ShidToPatioIntSubTests.java
+++ b/src/test/java/org/shedlang/compiler/shidtopatio/ShidToPatioIntSubTests.java
@@ -1,4 +1,4 @@
-package org.shedlang.compiler.patio;
+package org.shedlang.compiler.shidtopatio;
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -9,7 +9,7 @@ import org.shedlang.compiler.testing.snapshots.Snapshotter;
 
 import java.io.IOException;
 
-import static org.shedlang.compiler.patio.ShidToPatioTesting.serialize;
+import static org.shedlang.compiler.shidtopatio.ShidToPatioTesting.serialize;
 
 @ExtendWith({SnapshotResolver.class})
 public class ShidToPatioIntSubTests {
diff --git a/src/test/java/org/shedlang/compiler/patio/ShidToPatioLocalLoadTests.java b/src/test/java/org/shedlang/compiler/shidtopatio/ShidToPatioLocalLoadTests.java
index 99d4377e..56760ffa 100644
--- a/src/test/java/org/shedlang/compiler/patio/ShidToPatioLocalLoadTests.java
+++ b/src/test/java/org/shedlang/compiler/shidtopatio/ShidToPatioLocalLoadTests.java
@@ -1,4 +1,4 @@
-package org.shedlang.compiler.patio;
+package org.shedlang.compiler.shidtopatio;
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -8,7 +8,7 @@ import org.shedlang.compiler.testing.snapshots.Snapshotter;
 
 import java.io.IOException;
 
-import static org.shedlang.compiler.patio.ShidToPatioTesting.serialize;
+import static org.shedlang.compiler.shidtopatio.ShidToPatioTesting.serialize;
 
 @ExtendWith({SnapshotResolver.class})
 public class ShidToPatioLocalLoadTests {
diff --git a/src/test/java/org/shedlang/compiler/patio/ShidToPatioLocalStoreTests.java b/src/test/java/org/shedlang/compiler/shidtopatio/ShidToPatioLocalStoreTests.java
index 7ee3e31a..5b070142 100644
--- a/src/test/java/org/shedlang/compiler/patio/ShidToPatioLocalStoreTests.java
+++ b/src/test/java/org/shedlang/compiler/shidtopatio/ShidToPatioLocalStoreTests.java
@@ -1,4 +1,4 @@
-package org.shedlang.compiler.patio;
+package org.shedlang.compiler.shidtopatio;
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -9,7 +9,7 @@ import org.shedlang.compiler.testing.snapshots.Snapshotter;
 
 import java.io.IOException;
 
-import static org.shedlang.compiler.patio.ShidToPatioTesting.serialize;
+import static org.shedlang.compiler.shidtopatio.ShidToPatioTesting.serialize;
 
 @ExtendWith({SnapshotResolver.class})
 public class ShidToPatioLocalStoreTests {
diff --git a/src/test/java/org/shedlang/compiler/patio/ShidToPatioLoopBreakTests.java b/src/test/java/org/shedlang/compiler/shidtopatio/ShidToPatioLoopBreakTests.java
index 849778f5..839d24d9 100644
--- a/src/test/java/org/shedlang/compiler/patio/ShidToPatioLoopBreakTests.java
+++ b/src/test/java/org/shedlang/compiler/shidtopatio/ShidToPatioLoopBreakTests.java
@@ -1,4 +1,4 @@
-package org.shedlang.compiler.patio;
+package org.shedlang.compiler.shidtopatio;
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -8,7 +8,7 @@ import org.shedlang.compiler.testing.snapshots.Snapshotter;
 
 import java.io.IOException;
 
-import static org.shedlang.compiler.patio.ShidToPatioTesting.serialize;
+import static org.shedlang.compiler.shidtopatio.ShidToPatioTesting.serialize;
 
 @ExtendWith({SnapshotResolver.class})
 public class ShidToPatioLoopBreakTests {
diff --git a/src/test/java/org/shedlang/compiler/patio/ShidToPatioLoopContinueTests.java b/src/test/java/org/shedlang/compiler/shidtopatio/ShidToPatioLoopContinueTests.java
index 3c669c54..a12c1cc8 100644
--- a/src/test/java/org/shedlang/compiler/patio/ShidToPatioLoopContinueTests.java
+++ b/src/test/java/org/shedlang/compiler/shidtopatio/ShidToPatioLoopContinueTests.java
@@ -1,4 +1,4 @@
-package org.shedlang.compiler.patio;
+package org.shedlang.compiler.shidtopatio;
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -8,7 +8,7 @@ import org.shedlang.compiler.testing.snapshots.Snapshotter;
 
 import java.io.IOException;
 
-import static org.shedlang.compiler.patio.ShidToPatioTesting.serialize;
+import static org.shedlang.compiler.shidtopatio.ShidToPatioTesting.serialize;
 
 @ExtendWith({SnapshotResolver.class})
 public class ShidToPatioLoopContinueTests {
diff --git a/src/test/java/org/shedlang/compiler/patio/ShidToPatioLoopTests.java b/src/test/java/org/shedlang/compiler/shidtopatio/ShidToPatioLoopTests.java
index 41ffdc24..cd489cd3 100644
--- a/src/test/java/org/shedlang/compiler/patio/ShidToPatioLoopTests.java
+++ b/src/test/java/org/shedlang/compiler/shidtopatio/ShidToPatioLoopTests.java
@@ -1,4 +1,4 @@
-package org.shedlang.compiler.patio;
+package org.shedlang.compiler.shidtopatio;
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -9,7 +9,7 @@ import org.shedlang.compiler.testing.snapshots.Snapshotter;
 import java.io.IOException;
 import java.util.List;
 
-import static org.shedlang.compiler.patio.ShidToPatioTesting.serialize;
+import static org.shedlang.compiler.shidtopatio.ShidToPatioTesting.serialize;
 
 @ExtendWith({SnapshotResolver.class})
 public class ShidToPatioLoopTests {
diff --git a/src/test/java/org/shedlang/compiler/patio/ShidToPatioNamespaceFieldStoreTests.java b/src/test/java/org/shedlang/compiler/shidtopatio/ShidToPatioNamespaceFieldStoreTests.java
index 6265a472..3d9d4691 100644
--- a/src/test/java/org/shedlang/compiler/patio/ShidToPatioNamespaceFieldStoreTests.java
+++ b/src/test/java/org/shedlang/compiler/shidtopatio/ShidToPatioNamespaceFieldStoreTests.java
@@ -1,4 +1,4 @@
-package org.shedlang.compiler.patio;
+package org.shedlang.compiler.shidtopatio;
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -14,7 +14,7 @@ import org.shedlang.compiler.types.Types;
 import java.io.IOException;
 import java.util.List;
 
-import static org.shedlang.compiler.patio.ShidToPatioTesting.serialize;
+import static org.shedlang.compiler.shidtopatio.ShidToPatioTesting.serialize;
 
 @ExtendWith({SnapshotResolver.class})
 public class ShidToPatioNamespaceFieldStoreTests {
diff --git a/src/test/java/org/shedlang/compiler/patio/ShidToPatioNamespaceImportTests.java b/src/test/java/org/shedlang/compiler/shidtopatio/ShidToPatioNamespaceImportTests.java
index cea552e6..6ffc20c7 100644
--- a/src/test/java/org/shedlang/compiler/patio/ShidToPatioNamespaceImportTests.java
+++ b/src/test/java/org/shedlang/compiler/shidtopatio/ShidToPatioNamespaceImportTests.java
@@ -1,4 +1,4 @@
-package org.shedlang.compiler.patio;
+package org.shedlang.compiler.shidtopatio;
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -10,7 +10,7 @@ import org.shedlang.compiler.types.NamespaceName;
 import java.io.IOException;
 import java.util.List;
 
-import static org.shedlang.compiler.patio.ShidToPatioTesting.serialize;
+import static org.shedlang.compiler.shidtopatio.ShidToPatioTesting.serialize;
 
 @ExtendWith({SnapshotResolver.class})
 public class ShidToPatioNamespaceImportTests {
diff --git a/src/test/java/org/shedlang/compiler/patio/ShidToPatioNamespaceTests.java b/src/test/java/org/shedlang/compiler/shidtopatio/ShidToPatioNamespaceTests.java
index 6b45c22e..6ceea279 100644
--- a/src/test/java/org/shedlang/compiler/patio/ShidToPatioNamespaceTests.java
+++ b/src/test/java/org/shedlang/compiler/shidtopatio/ShidToPatioNamespaceTests.java
@@ -1,4 +1,4 @@
-package org.shedlang.compiler.patio;
+package org.shedlang.compiler.shidtopatio;
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
diff --git a/src/test/java/org/shedlang/compiler/patio/ShidToPatioPushBoolTests.java b/src/test/java/org/shedlang/compiler/shidtopatio/ShidToPatioPushBoolTests.java
index d0d6b0ed..c1310e31 100644
--- a/src/test/java/org/shedlang/compiler/patio/ShidToPatioPushBoolTests.java
+++ b/src/test/java/org/shedlang/compiler/shidtopatio/ShidToPatioPushBoolTests.java
@@ -1,4 +1,4 @@
-package org.shedlang.compiler.patio;
+package org.shedlang.compiler.shidtopatio;
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -8,7 +8,7 @@ import org.shedlang.compiler.testing.snapshots.Snapshotter;
 
 import java.io.IOException;
 
-import static org.shedlang.compiler.patio.ShidToPatioTesting.serialize;
+import static org.shedlang.compiler.shidtopatio.ShidToPatioTesting.serialize;
 
 @ExtendWith({SnapshotResolver.class})
 public class ShidToPatioPushBoolTests {
diff --git a/src/test/java/org/shedlang/compiler/patio/ShidToPatioPushIntTests.java b/src/test/java/org/shedlang/compiler/shidtopatio/ShidToPatioPushIntTests.java
index 91d1bd3d..17a6716c 100644
--- a/src/test/java/org/shedlang/compiler/patio/ShidToPatioPushIntTests.java
+++ b/src/test/java/org/shedlang/compiler/shidtopatio/ShidToPatioPushIntTests.java
@@ -1,4 +1,4 @@
-package org.shedlang.compiler.patio;
+package org.shedlang.compiler.shidtopatio;
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -8,7 +8,7 @@ import org.shedlang.compiler.testing.snapshots.Snapshotter;
 
 import java.io.IOException;
 
-import static org.shedlang.compiler.patio.ShidToPatioTesting.serialize;
+import static org.shedlang.compiler.shidtopatio.ShidToPatioTesting.serialize;
 
 @ExtendWith({SnapshotResolver.class})
 public class ShidToPatioPushIntTests {
diff --git a/src/test/java/org/shedlang/compiler/patio/ShidToPatioPushStringTests.java b/src/test/java/org/shedlang/compiler/shidtopatio/ShidToPatioPushStringTests.java
index e61c342a..65952ea0 100644
--- a/src/test/java/org/shedlang/compiler/patio/ShidToPatioPushStringTests.java
+++ b/src/test/java/org/shedlang/compiler/shidtopatio/ShidToPatioPushStringTests.java
@@ -1,4 +1,4 @@
-package org.shedlang.compiler.patio;
+package org.shedlang.compiler.shidtopatio;
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -8,7 +8,7 @@ import org.shedlang.compiler.testing.snapshots.Snapshotter;
 
 import java.io.IOException;
 
-import static org.shedlang.compiler.patio.ShidToPatioTesting.serialize;
+import static org.shedlang.compiler.shidtopatio.ShidToPatioTesting.serialize;
 
 @ExtendWith({SnapshotResolver.class})
 public class ShidToPatioPushStringTests {
diff --git a/src/test/java/org/shedlang/compiler/patio/ShidToPatioPushUnitTests.java b/src/test/java/org/shedlang/compiler/shidtopatio/ShidToPatioPushUnitTests.java
index 586417b6..27702e50 100644
--- a/src/test/java/org/shedlang/compiler/patio/ShidToPatioPushUnitTests.java
+++ b/src/test/java/org/shedlang/compiler/shidtopatio/ShidToPatioPushUnitTests.java
@@ -1,4 +1,4 @@
-package org.shedlang.compiler.patio;
+package org.shedlang.compiler.shidtopatio;
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -8,7 +8,7 @@ import org.shedlang.compiler.testing.snapshots.Snapshotter;
 
 import java.io.IOException;
 
-import static org.shedlang.compiler.patio.ShidToPatioTesting.serialize;
+import static org.shedlang.compiler.shidtopatio.ShidToPatioTesting.serialize;
 
 @ExtendWith({SnapshotResolver.class})
 public class ShidToPatioPushUnitTests {
diff --git a/src/test/java/org/shedlang/compiler/patio/ShidToPatioResumeTests.java b/src/test/java/org/shedlang/compiler/shidtopatio/ShidToPatioResumeTests.java
index 8c8abacf..87a4ca86 100644
--- a/src/test/java/org/shedlang/compiler/patio/ShidToPatioResumeTests.java
+++ b/src/test/java/org/shedlang/compiler/shidtopatio/ShidToPatioResumeTests.java
@@ -1,4 +1,4 @@
-package org.shedlang.compiler.patio;
+package org.shedlang.compiler.shidtopatio;
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -9,7 +9,7 @@ import org.shedlang.compiler.testing.snapshots.Snapshotter;
 
 import java.io.IOException;
 
-import static org.shedlang.compiler.patio.ShidToPatioTesting.serialize;
+import static org.shedlang.compiler.shidtopatio.ShidToPatioTesting.serialize;
 
 @ExtendWith({SnapshotResolver.class})
 public class ShidToPatioResumeTests {
diff --git a/src/test/java/org/shedlang/compiler/patio/ShidToPatioReturnTests.java b/src/test/java/org/shedlang/compiler/shidtopatio/ShidToPatioReturnTests.java
index de19cfbd..ae8194ee 100644
--- a/src/test/java/org/shedlang/compiler/patio/ShidToPatioReturnTests.java
+++ b/src/test/java/org/shedlang/compiler/shidtopatio/ShidToPatioReturnTests.java
@@ -1,4 +1,4 @@
-package org.shedlang.compiler.patio;
+package org.shedlang.compiler.shidtopatio;
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -9,7 +9,7 @@ import org.shedlang.compiler.testing.snapshots.Snapshotter;
 
 import java.io.IOException;
 
-import static org.shedlang.compiler.patio.ShidToPatioTesting.serialize;
+import static org.shedlang.compiler.shidtopatio.ShidToPatioTesting.serialize;
 
 @ExtendWith({SnapshotResolver.class})
 public class ShidToPatioReturnTests {
diff --git a/src/test/java/org/shedlang/compiler/patio/ShidToPatioStringAddTests.java b/src/test/java/org/shedlang/compiler/shidtopatio/ShidToPatioStringAddTests.java
index a0f80322..0fe97285 100644
--- a/src/test/java/org/shedlang/compiler/patio/ShidToPatioStringAddTests.java
+++ b/src/test/java/org/shedlang/compiler/shidtopatio/ShidToPatioStringAddTests.java
@@ -1,4 +1,4 @@
-package org.shedlang.compiler.patio;
+package org.shedlang.compiler.shidtopatio;
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -9,7 +9,7 @@ import org.shedlang.compiler.testing.snapshots.Snapshotter;
 
 import java.io.IOException;
 
-import static org.shedlang.compiler.patio.ShidToPatioTesting.serialize;
+import static org.shedlang.compiler.shidtopatio.ShidToPatioTesting.serialize;
 
 @ExtendWith({SnapshotResolver.class})
 public class ShidToPatioStringAddTests {
diff --git a/src/test/java/org/shedlang/compiler/patio/ShidToPatioSwitchTests.java b/src/test/java/org/shedlang/compiler/shidtopatio/ShidToPatioSwitchTests.java
index 487287e6..f98e7ef6 100644
--- a/src/test/java/org/shedlang/compiler/patio/ShidToPatioSwitchTests.java
+++ b/src/test/java/org/shedlang/compiler/shidtopatio/ShidToPatioSwitchTests.java
@@ -1,4 +1,4 @@
-package org.shedlang.compiler.patio;
+package org.shedlang.compiler.shidtopatio;
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -14,7 +14,7 @@ import org.shedlang.compiler.types.Types;
 import java.io.IOException;
 import java.util.List;
 
-import static org.shedlang.compiler.patio.ShidToPatioTesting.serialize;
+import static org.shedlang.compiler.shidtopatio.ShidToPatioTesting.serialize;
 
 @ExtendWith({SnapshotResolver.class})
 public class ShidToPatioSwitchTests {
diff --git a/src/test/java/org/shedlang/compiler/patio/ShidToPatioTesting.java b/src/test/java/org/shedlang/compiler/shidtopatio/ShidToPatioTesting.java
index c57084fe..3f3df6d2 100644
--- a/src/test/java/org/shedlang/compiler/patio/ShidToPatioTesting.java
+++ b/src/test/java/org/shedlang/compiler/shidtopatio/ShidToPatioTesting.java
@@ -1,4 +1,4 @@
-package org.shedlang.compiler.patio;
+package org.shedlang.compiler.shidtopatio;
 
 import org.shedlang.compiler.patio.ast.PatioSerializer;
 
diff --git a/src/test/java/org/shedlang/compiler/patio/ShidToPatioTryTests.java b/src/test/java/org/shedlang/compiler/shidtopatio/ShidToPatioTryTests.java
index d334afd5..a89c5725 100644
--- a/src/test/java/org/shedlang/compiler/patio/ShidToPatioTryTests.java
+++ b/src/test/java/org/shedlang/compiler/shidtopatio/ShidToPatioTryTests.java
@@ -1,4 +1,4 @@
-package org.shedlang.compiler.patio;
+package org.shedlang.compiler.shidtopatio;
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -12,7 +12,7 @@ import org.shedlang.compiler.types.*;
 import java.io.IOException;
 import java.util.List;
 
-import static org.shedlang.compiler.patio.ShidToPatioTesting.serialize;
+import static org.shedlang.compiler.shidtopatio.ShidToPatioTesting.serialize;
 
 @ExtendWith({SnapshotResolver.class})
 public class ShidToPatioTryTests {
diff --git a/src/test/java/org/shedlang/compiler/patio/ShidToPatioTupleCreateTests.java b/src/test/java/org/shedlang/compiler/shidtopatio/ShidToPatioTupleCreateTests.java
index 5fdd44a0..0187d719 100644
--- a/src/test/java/org/shedlang/compiler/patio/ShidToPatioTupleCreateTests.java
+++ b/src/test/java/org/shedlang/compiler/shidtopatio/ShidToPatioTupleCreateTests.java
@@ -1,4 +1,4 @@
-package org.shedlang.compiler.patio;
+package org.shedlang.compiler.shidtopatio;
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -9,7 +9,7 @@ import org.shedlang.compiler.testing.snapshots.Snapshotter;
 
 import java.io.IOException;
 
-import static org.shedlang.compiler.patio.ShidToPatioTesting.serialize;
+import static org.shedlang.compiler.shidtopatio.ShidToPatioTesting.serialize;
 
 @ExtendWith({SnapshotResolver.class})
 public class ShidToPatioTupleCreateTests {
diff --git a/src/test/java/org/shedlang/compiler/patio/ShidToPatioTupleGetTests.java b/src/test/java/org/shedlang/compiler/shidtopatio/ShidToPatioTupleGetTests.java
index 317f265c..a19ac6e9 100644
--- a/src/test/java/org/shedlang/compiler/patio/ShidToPatioTupleGetTests.java
+++ b/src/test/java/org/shedlang/compiler/shidtopatio/ShidToPatioTupleGetTests.java
@@ -1,4 +1,4 @@
-package org.shedlang.compiler.patio;
+package org.shedlang.compiler.shidtopatio;
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -9,7 +9,7 @@ import org.shedlang.compiler.testing.snapshots.Snapshotter;
 
 import java.io.IOException;
 
-import static org.shedlang.compiler.patio.ShidToPatioTesting.serialize;
+import static org.shedlang.compiler.shidtopatio.ShidToPatioTesting.serialize;
 
 @ExtendWith({SnapshotResolver.class})
 public class ShidToPatioTupleGetTests {
diff --git a/src/test/java/org/shedlang/compiler/patio/ShidToPatioVarLoadTests.java b/src/test/java/org/shedlang/compiler/shidtopatio/ShidToPatioVarLoadTests.java
index 009af9fa..6aa7526a 100644
--- a/src/test/java/org/shedlang/compiler/patio/ShidToPatioVarLoadTests.java
+++ b/src/test/java/org/shedlang/compiler/shidtopatio/ShidToPatioVarLoadTests.java
@@ -1,4 +1,4 @@
-package org.shedlang.compiler.patio;
+package org.shedlang.compiler.shidtopatio;
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -9,7 +9,7 @@ import org.shedlang.compiler.testing.snapshots.Snapshotter;
 
 import java.io.IOException;
 
-import static org.shedlang.compiler.patio.ShidToPatioTesting.serialize;
+import static org.shedlang.compiler.shidtopatio.ShidToPatioTesting.serialize;
 
 @ExtendWith({SnapshotResolver.class})
 public class ShidToPatioVarLoadTests {
diff --git a/src/test/java/org/shedlang/compiler/patio/ShidToPatioVarStoreTests.java b/src/test/java/org/shedlang/compiler/shidtopatio/ShidToPatioVarStoreTests.java
index 79ee8f75..03ab43ac 100644
--- a/src/test/java/org/shedlang/compiler/patio/ShidToPatioVarStoreTests.java
+++ b/src/test/java/org/shedlang/compiler/shidtopatio/ShidToPatioVarStoreTests.java
@@ -1,4 +1,4 @@
-package org.shedlang.compiler.patio;
+package org.shedlang.compiler.shidtopatio;
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -10,7 +10,7 @@ import org.shedlang.compiler.testing.snapshots.Snapshotter;
 
 import java.io.IOException;
 
-import static org.shedlang.compiler.patio.ShidToPatioTesting.serialize;
+import static org.shedlang.compiler.shidtopatio.ShidToPatioTesting.serialize;
 
 @ExtendWith({SnapshotResolver.class})
 public class ShidToPatioVarStoreTests {