[#72] More java packages to zscript

clients/java-client-lib/src/main/java/net/zscript/javaclient/builders/Command.java

@@ -0,0 +1,5 @@
+package net.zscript.javaclient.builders;
+
+public class Command {
+
+}

clients/java-client-lib/src/main/java/org/zcode/javaclient/builders/Response.java → clients/java-client-lib/src/main/java/net/zscript/javaclient/builders/Response.java

@@ -1,4 +1,4 @@
-package org.zcode.javaclient.builders;
+package net.zscript.javaclient.builders;
 
 import java.util.HashMap;
 import java.util.Map;

clients/java-client-lib/src/main/java/org/zcode/javaclient/builders/Zcode.java → clients/java-client-lib/src/main/java/net/zscript/javaclient/builders/Zcode.java

@@ -1,12 +1,12 @@
-package org.zcode.javaclient.builders;
+package net.zscript.javaclient.builders;
 
 import java.util.HashMap;
 import java.util.Map;
 
-import org.zcode.model.datamodel.ZcodeDataModel.CommandModel;
-import org.zcode.model.datamodel.ZcodeDataModel.ModuleModel;
-import org.zcode.model.loader.ModelLoader;
-import org.zcode.model.loader.ModuleBank;
+import net.zscript.model.datamodel.ZcodeDataModel.CommandModel;
+import net.zscript.model.datamodel.ZcodeDataModel.ModuleModel;
+import net.zscript.model.loader.ModelLoader;
+import net.zscript.model.loader.ModuleBank;
 
 public class Zcode {
 

clients/java-client-lib/src/main/java/org/zcode/javaclient/builders/ZcodeModelException.java → clients/java-client-lib/src/main/java/net/zscript/javaclient/builders/ZcodeModelException.java

@@ -1,4 +1,4 @@
-package org.zcode.javaclient.builders;
+package net.zscript.javaclient.builders;
 
 public class ZcodeModelException extends RuntimeException {
     private static final long serialVersionUID = 1L;

clients/java-client-lib/src/main/java/net/zscript/javaclient/builders/ZcodeModule.java

@@ -0,0 +1,4 @@
+package net.zscript.javaclient.builders;
+
+public interface ZcodeModule {
+}

clients/java-client-lib/src/main/java/org/zcode/javaclient/modules/base/Core.java → clients/java-client-lib/src/main/java/net/zscript/javaclient/modules/base/Core.java

@@ -1,7 +1,7 @@
-package org.zcode.javaclient.modules.base;
+package net.zscript.javaclient.modules.base;
 
-import org.zcode.javaclient.builders.Command;
-import org.zcode.javaclient.modules.base.Core.Activate.ActivateCommandBuilder;
+import net.zscript.javaclient.builders.Command;
+import net.zscript.javaclient.modules.base.Core.Activate.ActivateCommandBuilder;
 
 // WIP
 public interface Core {

clients/java-client-lib/src/main/java/org/zcode/javaclient/parsing/BigField.java → clients/java-client-lib/src/main/java/net/zscript/javaclient/parsing/BigField.java

@@ -1,4 +1,4 @@
-package org.zcode.javaclient.parsing;
+package net.zscript.javaclient.parsing;
 
 import java.io.ByteArrayOutputStream;
 

clients/java-client-lib/src/main/java/net/zscript/javaclient/parsing/CommandChannel.java

@@ -0,0 +1,5 @@
+package net.zscript.javaclient.parsing;
+
+public class CommandChannel {
+
+}

clients/java-client-lib/src/main/java/org/zcode/javaclient/parsing/CommandSlot.java → clients/java-client-lib/src/main/java/net/zscript/javaclient/parsing/CommandSlot.java

@@ -1,21 +1,21 @@
-package org.zcode.javaclient.parsing;
-
-import static org.zcode.javaclient.parsing.CommandSlot.ResponseStatus.PARSE_ERROR;
-import static org.zcode.javaclient.parsing.CommandSlot.ResponseStatus.TOO_BIG;
-import static org.zcode.javaclient.parsing.CommandSlot.ResponseStatus.UNKNOWN_ERROR;
-import static org.zcode.javaclient.parsing.Zchars.ADDRESS_PREFIX;
-import static org.zcode.javaclient.parsing.Zchars.ANDTHEN_SYMBOL;
-import static org.zcode.javaclient.parsing.Zchars.BIGFIELD_PREFIX_MARKER;
-import static org.zcode.javaclient.parsing.Zchars.BIGFIELD_QUOTE_MARKER;
-import static org.zcode.javaclient.parsing.Zchars.BROADCAST_PREFIX;
-import static org.zcode.javaclient.parsing.Zchars.CMD_PARAM;
-import static org.zcode.javaclient.parsing.Zchars.DEBUG_PREFIX;
-import static org.zcode.javaclient.parsing.Zchars.EOL_SYMBOL;
-import static org.zcode.javaclient.parsing.Zchars.ORELSE_SYMBOL;
-import static org.zcode.javaclient.parsing.Zchars.PARALLEL_PREFIX;
-import static org.zcode.javaclient.parsing.Zchars.STRING_ESCAPE_SYMBOL;
-import static org.zcode.javaclient.parsing.Zchars.getHex;
-import static org.zcode.javaclient.parsing.Zchars.isWhitespace;
+package net.zscript.javaclient.parsing;
+
+import static net.zscript.javaclient.parsing.CommandSlot.ResponseStatus.PARSE_ERROR;
+import static net.zscript.javaclient.parsing.CommandSlot.ResponseStatus.TOO_BIG;
+import static net.zscript.javaclient.parsing.CommandSlot.ResponseStatus.UNKNOWN_ERROR;
+import static net.zscript.javaclient.parsing.Zchars.ADDRESS_PREFIX;
+import static net.zscript.javaclient.parsing.Zchars.ANDTHEN_SYMBOL;
+import static net.zscript.javaclient.parsing.Zchars.BIGFIELD_PREFIX_MARKER;
+import static net.zscript.javaclient.parsing.Zchars.BIGFIELD_QUOTE_MARKER;
+import static net.zscript.javaclient.parsing.Zchars.BROADCAST_PREFIX;
+import static net.zscript.javaclient.parsing.Zchars.CMD_PARAM;
+import static net.zscript.javaclient.parsing.Zchars.DEBUG_PREFIX;
+import static net.zscript.javaclient.parsing.Zchars.EOL_SYMBOL;
+import static net.zscript.javaclient.parsing.Zchars.ORELSE_SYMBOL;
+import static net.zscript.javaclient.parsing.Zchars.PARALLEL_PREFIX;
+import static net.zscript.javaclient.parsing.Zchars.STRING_ESCAPE_SYMBOL;
+import static net.zscript.javaclient.parsing.Zchars.getHex;
+import static net.zscript.javaclient.parsing.Zchars.isWhitespace;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

clients/java-client-lib/src/main/java/org/zcode/javaclient/parsing/FieldMap.java → clients/java-client-lib/src/main/java/net/zscript/javaclient/parsing/FieldMap.java

@@ -1,4 +1,4 @@
-package org.zcode.javaclient.parsing;
+package net.zscript.javaclient.parsing;
 
 import java.util.HashMap;
 import java.util.Map;

clients/java-client-lib/src/main/java/org/zcode/javaclient/parsing/Strings.java → clients/java-client-lib/src/main/java/net/zscript/javaclient/parsing/Strings.java

@@ -1,4 +1,4 @@
-package org.zcode.javaclient.parsing;
+package net.zscript.javaclient.parsing;
 
 public class Strings {
 

clients/java-client-lib/src/main/java/org/zcode/javaclient/parsing/Zchars.java → clients/java-client-lib/src/main/java/net/zscript/javaclient/parsing/Zchars.java

@@ -1,4 +1,4 @@
-package org.zcode.javaclient.parsing;
+package net.zscript.javaclient.parsing;
 
 public enum Zchars {
     CMD_PARAM('Z'),

clients/java-client-lib/src/test/java/org/zcode/javaclient/builders/ZcodeTest.java → clients/java-client-lib/src/test/java/net/zscript/javaclient/builders/ZcodeTest.java

@@ -1,4 +1,4 @@
-package org.zcode.javaclient.builders;
+package net.zscript.javaclient.builders;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -7,7 +7,11 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
-import org.zcode.model.loader.ModelLoader;
+
+import net.zscript.javaclient.builders.Command;
+import net.zscript.javaclient.builders.Response;
+import net.zscript.javaclient.builders.Zcode;
+import net.zscript.model.loader.ModelLoader;
 
 class ZcodeTest {
 

model/src/main/java/org/zcode/model/datamodel/DefinitionResources.java → model/src/main/java/net/zscript/model/datamodel/DefinitionResources.java

@@ -1,4 +1,4 @@
-package org.zcode.model.datamodel;
+package net.zscript.model.datamodel;
 
 import java.util.List;
 

model/src/main/java/org/zcode/model/datamodel/IntrinsicsDataModel.java → model/src/main/java/net/zscript/model/datamodel/IntrinsicsDataModel.java

@@ -1,10 +1,10 @@
-package org.zcode.model.datamodel;
+package net.zscript.model.datamodel;
 
 import java.util.List;
 
-import org.zcode.model.datamodel.ZcodeDataModel.RequestParamModel;
-import org.zcode.model.datamodel.ZcodeDataModel.ResponseParamModel;
-import org.zcode.model.datamodel.ZcodeDataModel.StatusModel;
+import net.zscript.model.datamodel.ZcodeDataModel.RequestParamModel;
+import net.zscript.model.datamodel.ZcodeDataModel.ResponseParamModel;
+import net.zscript.model.datamodel.ZcodeDataModel.StatusModel;
 
 public interface IntrinsicsDataModel {
     Intrinsics getIntrinsics();

model/src/main/java/org/zcode/model/datamodel/ZcodeDataModel.java → model/src/main/java/net/zscript/model/datamodel/ZcodeDataModel.java

@@ -1,14 +1,15 @@
-package org.zcode.model.datamodel;
+package net.zscript.model.datamodel;
 
 import java.util.List;
 
-import org.zcode.model.loader.ModuleBank;
-
 import com.fasterxml.jackson.annotation.JsonBackReference;
 import com.fasterxml.jackson.annotation.JsonManagedReference;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonSubTypes;
 import com.fasterxml.jackson.annotation.JsonSubTypes.Type;
+
+import net.zscript.model.loader.ModuleBank;
+
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
 
 public interface ZcodeDataModel {

model/src/main/java/org/zcode/model/loader/ModelLoader.java → model/src/main/java/net/zscript/model/loader/ModelLoader.java

@@ -1,4 +1,4 @@
-package org.zcode.model.loader;
+package net.zscript.model.loader;
 
 import static java.util.Objects.requireNonNull;
 
@@ -10,19 +10,19 @@
 import java.util.List;
 import java.util.Map;
 
-import org.zcode.model.datamodel.DefinitionResources;
-import org.zcode.model.datamodel.DefinitionResources.ModuleBankDef;
-import org.zcode.model.datamodel.IntrinsicsDataModel;
-import org.zcode.model.datamodel.ZcodeDataModel;
-import org.zcode.model.datamodel.ZcodeDataModel.CommandModel;
-import org.zcode.model.datamodel.ZcodeDataModel.GenericParam;
-import org.zcode.model.datamodel.ZcodeDataModel.ModuleModel;
-
 import com.fasterxml.jackson.databind.MapperFeature;
 import com.fasterxml.jackson.databind.json.JsonMapper;
 import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
 import com.fasterxml.jackson.module.mrbean.MrBeanModule;
 
+import net.zscript.model.datamodel.DefinitionResources;
+import net.zscript.model.datamodel.IntrinsicsDataModel;
+import net.zscript.model.datamodel.ZcodeDataModel;
+import net.zscript.model.datamodel.DefinitionResources.ModuleBankDef;
+import net.zscript.model.datamodel.ZcodeDataModel.CommandModel;
+import net.zscript.model.datamodel.ZcodeDataModel.GenericParam;
+import net.zscript.model.datamodel.ZcodeDataModel.ModuleModel;
+
 public class ModelLoader {
     private JsonMapper          jsonMapper;
     private IntrinsicsDataModel intrinsicsDataModel;

model/src/main/java/org/zcode/model/loader/ModuleBank.java → model/src/main/java/net/zscript/model/loader/ModuleBank.java

@@ -1,10 +1,10 @@
-package org.zcode.model.loader;
+package net.zscript.model.loader;
 
 import java.util.HashMap;
 import java.util.Map;
 
-import org.zcode.model.datamodel.DefinitionResources.ModuleBankDef;
-import org.zcode.model.datamodel.ZcodeDataModel.ModuleModel;
+import net.zscript.model.datamodel.DefinitionResources.ModuleBankDef;
+import net.zscript.model.datamodel.ZcodeDataModel.ModuleModel;
 
 public class ModuleBank {
     final ModuleBankDef mbDef;

model/src/test/java/org/zcode/model/datamodel/DefinitionResourcesTest.java → model/src/test/java/net/zscript/model/datamodel/DefinitionResourcesTest.java

@@ -1,4 +1,4 @@
-package org.zcode.model.datamodel;
+package net.zscript.model.datamodel;
 
 import static java.util.Objects.requireNonNull;
 import static org.assertj.core.api.Assertions.assertThat;
@@ -9,13 +9,15 @@
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.zcode.model.datamodel.DefinitionResources.ModuleBankDef;
 
 import com.fasterxml.jackson.databind.MapperFeature;
 import com.fasterxml.jackson.databind.json.JsonMapper;
 import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
 import com.fasterxml.jackson.module.mrbean.MrBeanModule;
 
+import net.zscript.model.datamodel.DefinitionResources;
+import net.zscript.model.datamodel.DefinitionResources.ModuleBankDef;
+
 public class DefinitionResourcesTest {
     private JsonMapper jsonMapper;
 

model/src/test/java/org/zcode/model/datamodel/IntrinsicsTest.java → model/src/test/java/net/zscript/model/datamodel/IntrinsicsTest.java

@@ -1,4 +1,4 @@
-package org.zcode.model.datamodel;
+package net.zscript.model.datamodel;
 
 import static java.util.Objects.requireNonNull;
 import static org.assertj.core.api.Assertions.assertThat;
@@ -14,6 +14,8 @@
 import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
 import com.fasterxml.jackson.module.mrbean.MrBeanModule;
 
+import net.zscript.model.datamodel.IntrinsicsDataModel;
+
 public class IntrinsicsTest {
     private JsonMapper jsonMapper;
 

model/src/test/java/org/zcode/model/datamodel/ModuleTest.java → model/src/test/java/net/zscript/model/datamodel/ModuleTest.java

@@ -1,4 +1,4 @@
-package org.zcode.model.datamodel;
+package net.zscript.model.datamodel;
 
 import static java.util.Objects.requireNonNull;
 import static org.assertj.core.api.Assertions.assertThat;
@@ -15,6 +15,8 @@
 import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
 import com.fasterxml.jackson.module.mrbean.MrBeanModule;
 
+import net.zscript.model.datamodel.ZcodeDataModel;
+
 public class ModuleTest {
     private JsonMapper jsonMapper;
 

model/src/test/java/org/zcode/model/loader/ModelLoaderTest.java → model/src/test/java/net/zscript/model/loader/ModelLoaderTest.java

@@ -1,11 +1,13 @@
-package org.zcode.model.loader;
+package net.zscript.model.loader;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
 import java.io.IOException;
 
 import org.junit.jupiter.api.Test;
 
+import net.zscript.model.loader.ModelLoader;
+
 class ModelLoaderTest {
 
     @Test