[#72] Java packages to zscript

susanw1 · Aug 1, 2023 · 410fe7e · 410fe7e
1 parent cf93c82
commit 410fe7e
Show file tree

Hide file tree

Showing 161 changed files with 779 additions and 704 deletions.
diff --git a/...sts/src/test/java/org/zcode/javareceiver_acceptancetests/JavaReceiverCucumberStartup.java b/...sts/src/test/java/org/zcode/javareceiver_acceptancetests/JavaReceiverCucumberStartup.java
@@ -3,16 +3,16 @@
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
-import org.zcode.javareceiver.Zcode;
-import org.zcode.javareceiver.ZcodeBusInterruptSource;
-import org.zcode.javareceiver.ZcodeParameters;
-import org.zcode.javareceiver.commands.ZcodeActivateCommand;
-import org.zcode.javareceiver.commands.ZcodeCapabilitiesCommand;
-import org.zcode.javareceiver.commands.ZcodeEchoCommand;
-import org.zcode.javareceiver.parsing.ZcodeCommandChannel;
 import org.zcode.zcode_acceptance_tests.ZcodeAcceptanceTestConnectionManager;
 
 import io.cucumber.java.en.Given;
+import net.zscript.javareceiver.Zcode;
+import net.zscript.javareceiver.ZcodeBusInterruptSource;
+import net.zscript.javareceiver.ZcodeParameters;
+import net.zscript.javareceiver.commands.ZcodeActivateCommand;
+import net.zscript.javareceiver.commands.ZcodeCapabilitiesCommand;
+import net.zscript.javareceiver.commands.ZcodeEchoCommand;
+import net.zscript.javareceiver.parsing.ZcodeCommandChannel;
 
 public class JavaReceiverCucumberStartup {
     private static boolean         hasStarted = false;

diff --git a/...tance-tests/src/test/java/org/zcode/javareceiver_acceptancetests/LocalTestConnection.java b/...tance-tests/src/test/java/org/zcode/javareceiver_acceptancetests/LocalTestConnection.java
@@ -6,15 +6,16 @@
 import java.util.List;
 import java.util.function.Consumer;
 
-import org.zcode.javareceiver.AbstractZcodeOutStream;
-import org.zcode.javareceiver.Zcode;
-import org.zcode.javareceiver.ZcodeOutStream;
-import org.zcode.javareceiver.ZcodeParameters;
-import org.zcode.javareceiver.instreams.ZcodeChannelInStream;
-import org.zcode.javareceiver.parsing.ZcodeCommandChannel;
-import org.zcode.javareceiver.parsing.ZcodeCommandSequence;
 import org.zcode.zcode_acceptance_tests.acceptancetest_asserts.ZcodeAcceptanceTestConnection;
 
+import net.zscript.javareceiver.AbstractZcodeOutStream;
+import net.zscript.javareceiver.Zcode;
+import net.zscript.javareceiver.ZcodeOutStream;
+import net.zscript.javareceiver.ZcodeParameters;
+import net.zscript.javareceiver.instreams.ZcodeChannelInStream;
+import net.zscript.javareceiver.parsing.ZcodeCommandChannel;
+import net.zscript.javareceiver.parsing.ZcodeCommandSequence;
+
 public class LocalTestConnection implements ZcodeAcceptanceTestConnection, ZcodeCommandChannel {
     private final List<Consumer<byte[]>> handlers = new ArrayList<>();
     private final ZcodeQueueSequenceInStream queueIn = new ZcodeQueueSequenceInStream();

diff --git a/...ance-tests/src/test/java/org/zcode/javareceiver_acceptancetests/ZcodeIdentifyCommand.java b/...ance-tests/src/test/java/org/zcode/javareceiver_acceptancetests/ZcodeIdentifyCommand.java
@@ -1,11 +1,11 @@
 package org.zcode.javareceiver_acceptancetests;
 
-import org.zcode.javareceiver.ZcodeLockSet;
-import org.zcode.javareceiver.ZcodeOutStream;
-import org.zcode.javareceiver.ZcodeResponseStatus;
-import org.zcode.javareceiver.commands.ZcodeCommand;
-import org.zcode.javareceiver.parsing.ZcodeCommandSequence;
-import org.zcode.javareceiver.parsing.ZcodeCommandSlot;
+import net.zscript.javareceiver.ZcodeLockSet;
+import net.zscript.javareceiver.ZcodeOutStream;
+import net.zscript.javareceiver.ZcodeResponseStatus;
+import net.zscript.javareceiver.commands.ZcodeCommand;
+import net.zscript.javareceiver.parsing.ZcodeCommandSequence;
+import net.zscript.javareceiver.parsing.ZcodeCommandSlot;
 
 public class ZcodeIdentifyCommand implements ZcodeCommand {
 

diff --git a/...ests/src/test/java/org/zcode/javareceiver_acceptancetests/ZcodeQueueSequenceInStream.java b/...ests/src/test/java/org/zcode/javareceiver_acceptancetests/ZcodeQueueSequenceInStream.java
@@ -3,9 +3,9 @@
 import java.util.LinkedList;
 import java.util.Queue;
 
-import org.zcode.javareceiver.instreams.ZcodeChannelInStream;
-import org.zcode.javareceiver.instreams.ZcodeLookaheadStream;
-import org.zcode.javareceiver.instreams.ZcodeSequenceInStream;
+import net.zscript.javareceiver.instreams.ZcodeChannelInStream;
+import net.zscript.javareceiver.instreams.ZcodeLookaheadStream;
+import net.zscript.javareceiver.instreams.ZcodeSequenceInStream;
 
 public class ZcodeQueueSequenceInStream implements ZcodeChannelInStream {
     private final Queue<byte[]> messages = new LinkedList<>();

diff --git a/...vaclient/responseParser/ZcodeAddress.java → ...vaclient/responseParser/ZcodeAddress.java b/...vaclient/responseParser/ZcodeAddress.java → ...vaclient/responseParser/ZcodeAddress.java
@@ -1,4 +1,4 @@
-package org.zcode.javaclient.responseParser;
+package net.zscript.javaclient.responseParser;
 
 import java.util.Arrays;
 

diff --git a/...onseParser/ZcodeCommandResponseQueue.java → ...onseParser/ZcodeCommandResponseQueue.java b/...onseParser/ZcodeCommandResponseQueue.java → ...onseParser/ZcodeCommandResponseQueue.java
@@ -1,4 +1,4 @@
-package org.zcode.javaclient.responseParser;
+package net.zscript.javaclient.responseParser;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -8,9 +8,9 @@
 import java.util.Queue;
 import java.util.function.Consumer;
 
-import org.zcode.javaclient.responseParser.ZcodeResponseParser.ResponseHeader;
-import org.zcode.javaclient.zcodeApi.CommandSeqElement;
-import org.zcode.javaclient.zcodeApi.ZcodeCommandBuilder;
+import net.zscript.javaclient.responseParser.ZcodeResponseParser.ResponseHeader;
+import net.zscript.javaclient.zcodeApi.CommandSeqElement;
+import net.zscript.javaclient.zcodeApi.ZcodeCommandBuilder;
 
 public class ZcodeCommandResponseQueue implements ZcodeCommandResponseSystem {
     private static final int MAX_SENT = 10;

diff --git a/...nseParser/ZcodeCommandResponseSystem.java → ...nseParser/ZcodeCommandResponseSystem.java b/...nseParser/ZcodeCommandResponseSystem.java → ...nseParser/ZcodeCommandResponseSystem.java
@@ -1,8 +1,8 @@
-package org.zcode.javaclient.responseParser;
+package net.zscript.javaclient.responseParser;
 
 import java.util.function.Consumer;
 
-import org.zcode.javaclient.zcodeApi.CommandSeqElement;
+import net.zscript.javaclient.zcodeApi.CommandSeqElement;
 
 public interface ZcodeCommandResponseSystem {
     void send(CommandSeqElement seq);

diff --git a/...lient/responseParser/ZcodeConnection.java → ...lient/responseParser/ZcodeConnection.java b/...lient/responseParser/ZcodeConnection.java → ...lient/responseParser/ZcodeConnection.java
@@ -1,4 +1,4 @@
-package org.zcode.javaclient.responseParser;
+package net.zscript.javaclient.responseParser;
 
 import java.util.function.Consumer;
 

diff --git a/...Parser/ZcodeResponseAddressingSystem.java → ...Parser/ZcodeResponseAddressingSystem.java b/...Parser/ZcodeResponseAddressingSystem.java → ...Parser/ZcodeResponseAddressingSystem.java
@@ -1,4 +1,4 @@
-package org.zcode.javaclient.responseParser;
+package net.zscript.javaclient.responseParser;
 
 import java.util.HashMap;
 import java.util.Map;

diff --git a/...t/responseParser/ZcodeResponseParser.java → ...t/responseParser/ZcodeResponseParser.java b/...t/responseParser/ZcodeResponseParser.java → ...t/responseParser/ZcodeResponseParser.java
@@ -1,21 +1,21 @@
-package org.zcode.javaclient.responseParser;
+package net.zscript.javaclient.responseParser;
 
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Optional;
 import java.util.Set;
 
-import org.zcode.javaclient.zcodeApi.CommandSeqElement;
-import org.zcode.javaclient.zcodeApi.ZcodeCommand;
-import org.zcode.javaclient.zcodeApi.ZcodeCommand.ZcodeSequencePath;
-import org.zcode.javaclient.zcodeApi.ZcodeUnparsedCommandResponse;
-import org.zcode.javareceiver.tokenizer.OptIterator;
-import org.zcode.javareceiver.tokenizer.ZcodeTokenBuffer;
-import org.zcode.javareceiver.tokenizer.ZcodeTokenBuffer.TokenReader;
-import org.zcode.javareceiver.tokenizer.ZcodeTokenBuffer.TokenReader.ReadToken;
-import org.zcode.javareceiver.tokenizer.ZcodeTokenExtendingBuffer;
-import org.zcode.javareceiver.tokenizer.ZcodeTokenizer;
+import net.zscript.javaclient.zcodeApi.CommandSeqElement;
+import net.zscript.javaclient.zcodeApi.ZcodeCommand;
+import net.zscript.javaclient.zcodeApi.ZcodeUnparsedCommandResponse;
+import net.zscript.javaclient.zcodeApi.ZcodeCommand.ZcodeSequencePath;
+import net.zscript.javareceiver.tokenizer.OptIterator;
+import net.zscript.javareceiver.tokenizer.ZcodeTokenBuffer;
+import net.zscript.javareceiver.tokenizer.ZcodeTokenExtendingBuffer;
+import net.zscript.javareceiver.tokenizer.ZcodeTokenizer;
+import net.zscript.javareceiver.tokenizer.ZcodeTokenBuffer.TokenReader;
+import net.zscript.javareceiver.tokenizer.ZcodeTokenBuffer.TokenReader.ReadToken;
 
 public class ZcodeResponseParser {
     static class ResponseHeader {

diff --git a/...avaclient/zcodeApi/CommandSeqElement.java → ...avaclient/zcodeApi/CommandSeqElement.java b/...avaclient/zcodeApi/CommandSeqElement.java → ...avaclient/zcodeApi/CommandSeqElement.java
@@ -1,4 +1,4 @@
-package org.zcode.javaclient.zcodeApi;
+package net.zscript.javaclient.zcodeApi;
 
 public abstract class CommandSeqElement {
     protected CommandSeqElement parent = null;

diff --git a/...avaclient/zcodeApi/ZcodeAbortCommand.java → ...avaclient/zcodeApi/ZcodeAbortCommand.java b/...avaclient/zcodeApi/ZcodeAbortCommand.java → ...avaclient/zcodeApi/ZcodeAbortCommand.java
@@ -1,4 +1,4 @@
-package org.zcode.javaclient.zcodeApi;
+package net.zscript.javaclient.zcodeApi;
 
 import java.nio.charset.StandardCharsets;
 

diff --git a/...vaclient/zcodeApi/ZcodeAndSeqElement.java → ...vaclient/zcodeApi/ZcodeAndSeqElement.java b/...vaclient/zcodeApi/ZcodeAndSeqElement.java → ...vaclient/zcodeApi/ZcodeAndSeqElement.java
@@ -1,4 +1,4 @@
-package org.zcode.javaclient.zcodeApi;
+package net.zscript.javaclient.zcodeApi;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;

diff --git a/...avaclient/zcodeApi/ZcodeBlankCommand.java → ...avaclient/zcodeApi/ZcodeBlankCommand.java b/...avaclient/zcodeApi/ZcodeBlankCommand.java → ...avaclient/zcodeApi/ZcodeBlankCommand.java
@@ -1,4 +1,4 @@
-package org.zcode.javaclient.zcodeApi;
+package net.zscript.javaclient.zcodeApi;
 
 public class ZcodeBlankCommand extends ZcodeCommand {
 

diff --git a/...ode/javaclient/zcodeApi/ZcodeCommand.java → ...ipt/javaclient/zcodeApi/ZcodeCommand.java b/...ode/javaclient/zcodeApi/ZcodeCommand.java → ...ipt/javaclient/zcodeApi/ZcodeCommand.java
@@ -1,4 +1,4 @@
-package org.zcode.javaclient.zcodeApi;
+package net.zscript.javaclient.zcodeApi;
 
 import java.util.ArrayList;
 import java.util.List;

diff --git a/...aclient/zcodeApi/ZcodeCommandBuilder.java → ...aclient/zcodeApi/ZcodeCommandBuilder.java b/...aclient/zcodeApi/ZcodeCommandBuilder.java → ...aclient/zcodeApi/ZcodeCommandBuilder.java
@@ -1,4 +1,4 @@
-package org.zcode.javaclient.zcodeApi;
+package net.zscript.javaclient.zcodeApi;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;

diff --git a/...aclient/zcodeApi/ZcodeFailureCommand.java → ...aclient/zcodeApi/ZcodeFailureCommand.java b/...aclient/zcodeApi/ZcodeFailureCommand.java → ...aclient/zcodeApi/ZcodeFailureCommand.java
@@ -1,4 +1,4 @@
-package org.zcode.javaclient.zcodeApi;
+package net.zscript.javaclient.zcodeApi;
 
 import java.nio.charset.StandardCharsets;
 

diff --git a/...avaclient/zcodeApi/ZcodeOrSeqElement.java → ...avaclient/zcodeApi/ZcodeOrSeqElement.java b/...avaclient/zcodeApi/ZcodeOrSeqElement.java → ...avaclient/zcodeApi/ZcodeOrSeqElement.java
@@ -1,4 +1,4 @@
-package org.zcode.javaclient.zcodeApi;
+package net.zscript.javaclient.zcodeApi;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;

diff --git a/.../jvm/java-receiver-token/src/main/java/net/zscript/javaclient/zcodeApi/ZcodeResponse.java b/.../jvm/java-receiver-token/src/main/java/net/zscript/javaclient/zcodeApi/ZcodeResponse.java
@@ -0,0 +1,5 @@
+package net.zscript.javaclient.zcodeApi;
+
+public interface ZcodeResponse {
+
+}
diff --git a/...lient/zcodeApi/ZcodeResponseListener.java → ...lient/zcodeApi/ZcodeResponseListener.java b/...lient/zcodeApi/ZcodeResponseListener.java → ...lient/zcodeApi/ZcodeResponseListener.java
@@ -1,4 +1,4 @@
-package org.zcode.javaclient.zcodeApi;
+package net.zscript.javaclient.zcodeApi;
 
 public interface ZcodeResponseListener<T extends ZcodeResponse> {
     void accept(T resp);

diff --git a/...codeApi/ZcodeUnparsedCommandResponse.java → ...codeApi/ZcodeUnparsedCommandResponse.java b/...codeApi/ZcodeUnparsedCommandResponse.java → ...codeApi/ZcodeUnparsedCommandResponse.java
@@ -1,13 +1,13 @@
-package org.zcode.javaclient.zcodeApi;
+package net.zscript.javaclient.zcodeApi;
 
 import java.util.Iterator;
 import java.util.NoSuchElementException;
 import java.util.Optional;
 
-import org.zcode.javareceiver.tokenizer.BlockIterator;
-import org.zcode.javareceiver.tokenizer.OptIterator;
-import org.zcode.javareceiver.tokenizer.Zchars;
-import org.zcode.javareceiver.tokenizer.ZcodeTokenBuffer.TokenReader.ReadToken;
+import net.zscript.javareceiver.tokenizer.BlockIterator;
+import net.zscript.javareceiver.tokenizer.OptIterator;
+import net.zscript.javareceiver.tokenizer.Zchars;
+import net.zscript.javareceiver.tokenizer.ZcodeTokenBuffer.TokenReader.ReadToken;
 
 public class ZcodeUnparsedCommandResponse {
     private final ReadToken first;

diff --git a/...va/org/zcode/javareceiver/core/Zcode.java → .../net/zscript/javareceiver/core/Zcode.java b/...va/org/zcode/javareceiver/core/Zcode.java → .../net/zscript/javareceiver/core/Zcode.java
@@ -1,13 +1,13 @@
-package org.zcode.javareceiver.core;
+package net.zscript.javareceiver.core;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import org.zcode.javareceiver.execution.ActionSource;
-import org.zcode.javareceiver.execution.ZcodeExecutor;
-import org.zcode.javareceiver.modules.ZcodeModule;
-import org.zcode.javareceiver.modules.ZcodeModuleRegistry;
-import org.zcode.javareceiver.notifications.ZcodeNotificationSource;
+import net.zscript.javareceiver.execution.ActionSource;
+import net.zscript.javareceiver.execution.ZcodeExecutor;
+import net.zscript.javareceiver.modules.ZcodeModule;
+import net.zscript.javareceiver.modules.ZcodeModuleRegistry;
+import net.zscript.javareceiver.notifications.ZcodeNotificationSource;
 
 public class Zcode {
     private final ZcodeModuleRegistry moduleRegistry = new ZcodeModuleRegistry();

diff --git a/...receiver/core/ZcodeAbstractOutStream.java → ...receiver/core/ZcodeAbstractOutStream.java b/...receiver/core/ZcodeAbstractOutStream.java → ...receiver/core/ZcodeAbstractOutStream.java
@@ -1,10 +1,10 @@
-package org.zcode.javareceiver.core;
+package net.zscript.javareceiver.core;
 
 import java.nio.charset.StandardCharsets;
 
-import org.zcode.javareceiver.execution.ZcodeField;
-import org.zcode.javareceiver.tokenizer.BlockIterator;
-import org.zcode.javareceiver.tokenizer.Zchars;
+import net.zscript.javareceiver.execution.ZcodeField;
+import net.zscript.javareceiver.tokenizer.BlockIterator;
+import net.zscript.javareceiver.tokenizer.Zchars;
 
 public abstract class ZcodeAbstractOutStream implements ZcodeOutStream, ZcodeCommandOutStream {
     /**

diff --git a/...zcode/javareceiver/core/ZcodeChannel.java → ...cript/javareceiver/core/ZcodeChannel.java b/...zcode/javareceiver/core/ZcodeChannel.java → ...cript/javareceiver/core/ZcodeChannel.java
@@ -1,11 +1,11 @@
-package org.zcode.javareceiver.core;
-
-import org.zcode.javareceiver.execution.ActionSource;
-import org.zcode.javareceiver.execution.ZcodeCommandContext;
-import org.zcode.javareceiver.semanticParser.ExecutionActionFactory;
-import org.zcode.javareceiver.semanticParser.SemanticParser;
-import org.zcode.javareceiver.semanticParser.ZcodeSemanticAction;
-import org.zcode.javareceiver.tokenizer.ZcodeTokenBuffer;
+package net.zscript.javareceiver.core;
+
+import net.zscript.javareceiver.execution.ActionSource;
+import net.zscript.javareceiver.execution.ZcodeCommandContext;
+import net.zscript.javareceiver.semanticParser.ExecutionActionFactory;
+import net.zscript.javareceiver.semanticParser.SemanticParser;
+import net.zscript.javareceiver.semanticParser.ZcodeSemanticAction;
+import net.zscript.javareceiver.tokenizer.ZcodeTokenBuffer;
 
 public abstract class ZcodeChannel implements ActionSource {
     protected final SemanticParser p;

diff --git a/...areceiver/core/ZcodeCommandOutStream.java → ...areceiver/core/ZcodeCommandOutStream.java b/...areceiver/core/ZcodeCommandOutStream.java → ...areceiver/core/ZcodeCommandOutStream.java
@@ -1,6 +1,6 @@
-package org.zcode.javareceiver.core;
+package net.zscript.javareceiver.core;
 
-import org.zcode.javareceiver.execution.ZcodeField;
+import net.zscript.javareceiver.execution.ZcodeField;
 
 /**
  * Defines the operations on the response OutStream available to a command via the ZcodeCommandContext.

diff --git a/...zcode/javareceiver/core/ZcodeLockSet.java → ...cript/javareceiver/core/ZcodeLockSet.java b/...zcode/javareceiver/core/ZcodeLockSet.java → ...cript/javareceiver/core/ZcodeLockSet.java
@@ -1,4 +1,4 @@
-package org.zcode.javareceiver.core;
+package net.zscript.javareceiver.core;
 
 import java.util.Iterator;
 

diff --git a/...g/zcode/javareceiver/core/ZcodeLocks.java → ...zscript/javareceiver/core/ZcodeLocks.java b/...g/zcode/javareceiver/core/ZcodeLocks.java → ...zscript/javareceiver/core/ZcodeLocks.java
@@ -1,4 +1,4 @@
-package org.zcode.javareceiver.core;
+package net.zscript.javareceiver.core;
 
 public class ZcodeLocks {
     public static final int LOCK_BYTENUM = 32;

diff --git a/...ode/javareceiver/core/ZcodeOutStream.java → ...ipt/javareceiver/core/ZcodeOutStream.java b/...ode/javareceiver/core/ZcodeOutStream.java → ...ipt/javareceiver/core/ZcodeOutStream.java
@@ -1,4 +1,4 @@
-package org.zcode.javareceiver.core;
+package net.zscript.javareceiver.core;
 
 /**
  * Defines the sequence-level life-cycle operations that allow responses to be sent back up to a channel.

diff --git a/.../zcode/javareceiver/core/ZcodeStatus.java → ...script/javareceiver/core/ZcodeStatus.java b/.../zcode/javareceiver/core/ZcodeStatus.java → ...script/javareceiver/core/ZcodeStatus.java
@@ -1,4 +1,4 @@
-package org.zcode.javareceiver.core;
+package net.zscript.javareceiver.core;
 
 public class ZcodeStatus {
     /** command success */

diff --git a/...vareceiver/execution/AbstractContext.java → ...vareceiver/execution/AbstractContext.java b/...vareceiver/execution/AbstractContext.java → ...vareceiver/execution/AbstractContext.java
@@ -1,7 +1,7 @@
-package org.zcode.javareceiver.execution;
+package net.zscript.javareceiver.execution;
 
-import org.zcode.javareceiver.semanticParser.ContextView;
-import org.zcode.javareceiver.semanticParser.ContextView.AsyncActionNotifier;
+import net.zscript.javareceiver.semanticParser.ContextView;
+import net.zscript.javareceiver.semanticParser.ContextView.AsyncActionNotifier;
 
 abstract class AbstractContext {
     protected final ContextView contextView;

diff --git a/...vm/java-receiver-token/src/main/java/net/zscript/javareceiver/execution/ActionSource.java b/...vm/java-receiver-token/src/main/java/net/zscript/javareceiver/execution/ActionSource.java
@@ -0,0 +1,10 @@
+package net.zscript.javareceiver.execution;
+
+import net.zscript.javareceiver.core.Zcode;
+import net.zscript.javareceiver.core.ZcodeOutStream;
+
+public interface ActionSource {
+    ZcodeAction getAction();
+
+    ZcodeOutStream getOutStream(Zcode zcode);
+}
diff --git a/...e/javareceiver/execution/ZcodeAction.java → ...t/javareceiver/execution/ZcodeAction.java b/...e/javareceiver/execution/ZcodeAction.java → ...t/javareceiver/execution/ZcodeAction.java
@@ -1,7 +1,7 @@
-package org.zcode.javareceiver.execution;
+package net.zscript.javareceiver.execution;
 
-import org.zcode.javareceiver.core.Zcode;
-import org.zcode.javareceiver.core.ZcodeOutStream;
+import net.zscript.javareceiver.core.Zcode;
+import net.zscript.javareceiver.core.ZcodeOutStream;
 
 public interface ZcodeAction {
     boolean isEmptyAction();

diff --git a/...ver/execution/ZcodeAddressingContext.java → ...ver/execution/ZcodeAddressingContext.java b/...ver/execution/ZcodeAddressingContext.java → ...ver/execution/ZcodeAddressingContext.java
@@ -1,14 +1,14 @@
-package org.zcode.javareceiver.execution;
+package net.zscript.javareceiver.execution;
 
 import java.util.Optional;
 
-import org.zcode.javareceiver.core.ZcodeStatus;
-import org.zcode.javareceiver.semanticParser.ContextView;
-import org.zcode.javareceiver.tokenizer.BlockIterator;
-import org.zcode.javareceiver.tokenizer.OptIterator;
-import org.zcode.javareceiver.tokenizer.Zchars;
-import org.zcode.javareceiver.tokenizer.ZcodeTokenBuffer.TokenReader.ReadToken;
-import org.zcode.javareceiver.tokenizer.ZcodeTokenizer;
+import net.zscript.javareceiver.core.ZcodeStatus;
+import net.zscript.javareceiver.semanticParser.ContextView;
+import net.zscript.javareceiver.tokenizer.BlockIterator;
+import net.zscript.javareceiver.tokenizer.OptIterator;
+import net.zscript.javareceiver.tokenizer.Zchars;
+import net.zscript.javareceiver.tokenizer.ZcodeTokenizer;
+import net.zscript.javareceiver.tokenizer.ZcodeTokenBuffer.TokenReader.ReadToken;
 
 public class ZcodeAddressingContext extends AbstractContext {
     public ZcodeAddressingContext(final ContextView contextView) {