eviltester · eviltester · Jul 13, 2026 · Jul 13, 2026
diff --git a/challenger/src/main/java/uk/co/compendiumdev/challenge/ChallengeMain.java b/challenger/src/main/java/uk/co/compendiumdev/challenge/ChallengeMain.java
@@ -5,8 +5,8 @@
 import uk.co.compendiumdev.challenge.apimodel.ChallengeApiModel;
 import uk.co.compendiumdev.challenge.challengers.Challengers;
 import uk.co.compendiumdev.thingifier.Thingifier;
-import uk.co.compendiumdev.thingifier.application.MainImplementation;
-import uk.co.compendiumdev.thingifier.application.httprouting.ThingifierHttpApiRoutings;
+import uk.co.compendiumdev.thingifier.adapter.http.ThingifierHttpApiRoutings;
+import uk.co.compendiumdev.thingifier.adapter.spark.MainImplementation;
 import uk.co.compendiumdev.thingifier.core.repository.ThingStoreProviderConfig;
 
 public class ChallengeMain {

diff --git a/challenger/src/main/java/uk/co/compendiumdev/challenge/ChallengeRouteHandler.java b/challenger/src/main/java/uk/co/compendiumdev/challenge/ChallengeRouteHandler.java
@@ -10,8 +10,8 @@
 import uk.co.compendiumdev.challenge.practicemodes.simpleapi.SimpleApiRoutes;
 import uk.co.compendiumdev.challenge.practicemodes.simulation.SimulationRoutes;
 import uk.co.compendiumdev.thingifier.Thingifier;
+import uk.co.compendiumdev.thingifier.adapter.http.ThingifierHttpApiRoutings;
 import uk.co.compendiumdev.thingifier.api.docgen.ThingifierApiDocumentationDefn;
-import uk.co.compendiumdev.thingifier.application.httprouting.ThingifierHttpApiRoutings;
 import uk.co.compendiumdev.thingifier.htmlgui.htmlgen.DefaultGUIHTML;
 
 public class ChallengeRouteHandler {

diff --git a/.../src/main/java/uk/co/compendiumdev/challenge/challengehooks/ChallengerApiRequestHook.java b/.../src/main/java/uk/co/compendiumdev/challenge/challengehooks/ChallengerApiRequestHook.java
@@ -6,12 +6,12 @@
 import uk.co.compendiumdev.challenge.CHALLENGE;
 import uk.co.compendiumdev.challenge.ChallengerAuthData;
 import uk.co.compendiumdev.challenge.challengers.Challengers;
+import uk.co.compendiumdev.thingifier.adapter.http.messagehooks.HttpApiRequestHook;
 import uk.co.compendiumdev.thingifier.api.ermodelconversion.JsonThing;
 import uk.co.compendiumdev.thingifier.api.http.HttpApiRequest;
 import uk.co.compendiumdev.thingifier.api.http.HttpApiResponse;
 import uk.co.compendiumdev.thingifier.api.response.ApiResponse;
 import uk.co.compendiumdev.thingifier.apiconfig.ThingifierApiConfig;
-import uk.co.compendiumdev.thingifier.application.httpapimessagehooks.HttpApiRequestHook;
 
 public class ChallengerApiRequestHook implements HttpApiRequestHook {
 

diff --git a/...src/main/java/uk/co/compendiumdev/challenge/challengehooks/ChallengerApiResponseHook.java b/...src/main/java/uk/co/compendiumdev/challenge/challengehooks/ChallengerApiResponseHook.java
@@ -7,12 +7,12 @@
 import uk.co.compendiumdev.challenge.ChallengerAuthData;
 import uk.co.compendiumdev.challenge.challengers.Challengers;
 import uk.co.compendiumdev.thingifier.Thingifier;
+import uk.co.compendiumdev.thingifier.adapter.http.messagehooks.HttpApiResponseHook;
 import uk.co.compendiumdev.thingifier.api.http.HttpApiRequest;
 import uk.co.compendiumdev.thingifier.api.http.HttpApiResponse;
 import uk.co.compendiumdev.thingifier.api.http.headers.headerparser.AcceptHeaderParser;
 import uk.co.compendiumdev.thingifier.api.http.headers.headerparser.ContentTypeHeaderParser;
 import uk.co.compendiumdev.thingifier.apiconfig.ThingifierApiConfig;
-import uk.co.compendiumdev.thingifier.application.httpapimessagehooks.HttpApiResponseHook;
 import uk.co.compendiumdev.thingifier.core.domain.definitions.EntityDefinition;
 import uk.co.compendiumdev.thingifier.core.domain.instances.EntityInstance;
 import uk.co.compendiumdev.thingifier.core.repository.EntityInstanceQuery;

diff --git a/.../java/uk/co/compendiumdev/challenge/challengehooks/ChallengerInternalHTTPRequestHook.java b/.../java/uk/co/compendiumdev/challenge/challengehooks/ChallengerInternalHTTPRequestHook.java
@@ -6,10 +6,10 @@
 import uk.co.compendiumdev.challenge.CHALLENGE;
 import uk.co.compendiumdev.challenge.ChallengerAuthData;
 import uk.co.compendiumdev.challenge.challengers.Challengers;
-import uk.co.compendiumdev.thingifier.application.internalhttp.InternalHttpMethod;
-import uk.co.compendiumdev.thingifier.application.internalhttp.InternalHttpRequest;
-import uk.co.compendiumdev.thingifier.application.internalhttp.InternalHttpResponse;
-import uk.co.compendiumdev.thingifier.application.sparkhttpmessageHooks.InternalHttpRequestHook;
+import uk.co.compendiumdev.thingifier.adapter.internalhttp.InternalHttpMethod;
+import uk.co.compendiumdev.thingifier.adapter.internalhttp.InternalHttpRequest;
+import uk.co.compendiumdev.thingifier.adapter.internalhttp.InternalHttpResponse;
+import uk.co.compendiumdev.thingifier.adapter.spark.messagehooks.InternalHttpRequestHook;
 
 /*
    This is an Internal HTTP Request because it covers functionality for endpoints that do not

diff --git a/...java/uk/co/compendiumdev/challenge/challengehooks/ChallengerInternalHTTPResponseHook.java b/...java/uk/co/compendiumdev/challenge/challengehooks/ChallengerInternalHTTPResponseHook.java
@@ -1,17 +1,17 @@
 package uk.co.compendiumdev.challenge.challengehooks;
 
-import static uk.co.compendiumdev.thingifier.application.internalhttp.InternalHttpMethod.*;
+import static uk.co.compendiumdev.thingifier.adapter.internalhttp.InternalHttpMethod.*;
 
 import java.util.List;
 import uk.co.compendiumdev.challenge.CHALLENGE;
 import uk.co.compendiumdev.challenge.ChallengerAuthData;
 import uk.co.compendiumdev.challenge.ChallengerState;
 import uk.co.compendiumdev.challenge.challengers.Challengers;
 import uk.co.compendiumdev.challenge.challengesrouting.XChallengerHeader;
+import uk.co.compendiumdev.thingifier.adapter.internalhttp.InternalHttpRequest;
+import uk.co.compendiumdev.thingifier.adapter.internalhttp.InternalHttpResponse;
+import uk.co.compendiumdev.thingifier.adapter.spark.messagehooks.InternalHttpResponseHook;
 import uk.co.compendiumdev.thingifier.api.http.headers.headerparser.BearerAuthHeaderParser;
-import uk.co.compendiumdev.thingifier.application.internalhttp.InternalHttpRequest;
-import uk.co.compendiumdev.thingifier.application.internalhttp.InternalHttpResponse;
-import uk.co.compendiumdev.thingifier.application.sparkhttpmessageHooks.InternalHttpResponseHook;
 
 public class ChallengerInternalHTTPResponseHook implements InternalHttpResponseHook {
 

diff --git a/challenger/src/main/java/uk/co/compendiumdev/challenge/challengesrouting/AuthRoutes.java b/challenger/src/main/java/uk/co/compendiumdev/challenge/challengesrouting/AuthRoutes.java
@@ -7,6 +7,11 @@
 import uk.co.compendiumdev.challenge.ChallengerAuthData;
 import uk.co.compendiumdev.challenge.challengers.Challengers;
 import uk.co.compendiumdev.thingifier.Thingifier;
+import uk.co.compendiumdev.thingifier.adapter.internalhttp.InternalHttpRequest;
+import uk.co.compendiumdev.thingifier.adapter.internalhttp.conversion.HttpApiResponseToInternalHttpResponse;
+import uk.co.compendiumdev.thingifier.adapter.internalhttp.conversion.InternalHttpRequestToHttpApiRequest;
+import uk.co.compendiumdev.thingifier.adapter.internalhttp.conversion.InternalHttpResponseToSpark;
+import uk.co.compendiumdev.thingifier.adapter.internalhttp.conversion.SparkToInternalHttpRequest;
 import uk.co.compendiumdev.thingifier.api.docgen.RoutingDefinition;
 import uk.co.compendiumdev.thingifier.api.docgen.RoutingStatus;
 import uk.co.compendiumdev.thingifier.api.docgen.RoutingVerb;
@@ -19,11 +24,6 @@
 import uk.co.compendiumdev.thingifier.api.http.headers.headerparser.BearerAuthHeaderParser;
 import uk.co.compendiumdev.thingifier.api.http.headers.headerparser.ContentTypeHeaderParser;
 import uk.co.compendiumdev.thingifier.api.response.ApiResponse;
-import uk.co.compendiumdev.thingifier.application.internalhttp.InternalHttpRequest;
-import uk.co.compendiumdev.thingifier.application.internalhttpconversion.HttpApiResponseToInternalHttpResponse;
-import uk.co.compendiumdev.thingifier.application.internalhttpconversion.InternalHttpRequestToHttpApiRequest;
-import uk.co.compendiumdev.thingifier.application.internalhttpconversion.InternalHttpResponseToSpark;
-import uk.co.compendiumdev.thingifier.application.internalhttpconversion.SparkToInternalHttpRequest;
 import uk.co.compendiumdev.thingifier.core.EntityRelModel;
 import uk.co.compendiumdev.thingifier.core.domain.definitions.EntityDefinition;
 import uk.co.compendiumdev.thingifier.core.domain.definitions.field.definition.Field;

diff --git a/...enger/src/main/java/uk/co/compendiumdev/challenge/challengesrouting/ChallengesRoutes.java b/...enger/src/main/java/uk/co/compendiumdev/challenge/challengesrouting/ChallengesRoutes.java
@@ -7,13 +7,13 @@
 import uk.co.compendiumdev.challenge.apimodel.ChallengeThingifier;
 import uk.co.compendiumdev.challenge.challengers.Challengers;
 import uk.co.compendiumdev.challenge.challenges.ChallengeDefinitions;
+import uk.co.compendiumdev.thingifier.adapter.http.routehandlers.SparkApiRequestResponseHandler;
+import uk.co.compendiumdev.thingifier.adapter.spark.AdhocDocumentedSparkRouteConfigurer;
 import uk.co.compendiumdev.thingifier.api.docgen.RoutingDefinition;
 import uk.co.compendiumdev.thingifier.api.docgen.RoutingStatus;
 import uk.co.compendiumdev.thingifier.api.docgen.RoutingVerb;
 import uk.co.compendiumdev.thingifier.api.docgen.ThingifierApiDocumentationDefn;
 import uk.co.compendiumdev.thingifier.api.restapihandlers.RestApiGetHandler;
-import uk.co.compendiumdev.thingifier.application.AdhocDocumentedSparkRouteConfigurer;
-import uk.co.compendiumdev.thingifier.application.routehandlers.SparkApiRequestResponseHandler;
 import uk.co.compendiumdev.thingifier.core.domain.definitions.EntityDefinition;
 import uk.co.compendiumdev.thingifier.core.query.FilterBy;
 import uk.co.compendiumdev.thingifier.core.query.QueryFilterParams;

diff --git a/...lenger/src/main/java/uk/co/compendiumdev/challenge/challengesrouting/HeartBeatRoutes.java b/...lenger/src/main/java/uk/co/compendiumdev/challenge/challengesrouting/HeartBeatRoutes.java
@@ -1,9 +1,9 @@
 package uk.co.compendiumdev.challenge.challengesrouting;
 
 import java.util.List;
+import uk.co.compendiumdev.thingifier.adapter.spark.AdhocDocumentedSparkRouteConfigurer;
 import uk.co.compendiumdev.thingifier.api.docgen.RoutingVerb;
 import uk.co.compendiumdev.thingifier.api.docgen.ThingifierApiDocumentationDefn;
-import uk.co.compendiumdev.thingifier.application.AdhocDocumentedSparkRouteConfigurer;
 import uk.co.compendiumdev.thingifier.spark.SimpleSparkRouteCreator;
 
 public class HeartBeatRoutes {

diff --git a/...nger/src/main/java/uk/co/compendiumdev/challenge/challengesrouting/XChallengerHeader.java b/...nger/src/main/java/uk/co/compendiumdev/challenge/challengesrouting/XChallengerHeader.java
@@ -2,7 +2,7 @@
 
 import spark.Response;
 import uk.co.compendiumdev.challenge.ChallengerAuthData;
-import uk.co.compendiumdev.thingifier.application.internalhttp.InternalHttpResponse;
+import uk.co.compendiumdev.thingifier.adapter.internalhttp.InternalHttpResponse;
 
 public class XChallengerHeader {
 

diff --git a/.../java/uk/co/compendiumdev/challenge/practicemodes/mirror/MirrorHttpApiRequestHandler.java b/.../java/uk/co/compendiumdev/challenge/practicemodes/mirror/MirrorHttpApiRequestHandler.java
@@ -1,9 +1,9 @@
 package uk.co.compendiumdev.challenge.practicemodes.mirror;
 
+import uk.co.compendiumdev.thingifier.adapter.http.routehandlers.HttpApiRequestHandler;
 import uk.co.compendiumdev.thingifier.api.http.HttpApiRequest;
 import uk.co.compendiumdev.thingifier.api.http.headers.headerparser.AcceptHeaderParser;
 import uk.co.compendiumdev.thingifier.api.response.ApiResponse;
-import uk.co.compendiumdev.thingifier.application.routehandlers.HttpApiRequestHandler;
 import uk.co.compendiumdev.thingifier.core.domain.definitions.EntityDefinition;
 import uk.co.compendiumdev.thingifier.core.domain.instances.EntityInstanceDraft;
 

diff --git a/...a/uk/co/compendiumdev/challenge/practicemodes/mirror/MirrorHttpApiTextRequestHandler.java b/...a/uk/co/compendiumdev/challenge/practicemodes/mirror/MirrorHttpApiTextRequestHandler.java
@@ -1,9 +1,9 @@
 package uk.co.compendiumdev.challenge.practicemodes.mirror;
 
+import uk.co.compendiumdev.thingifier.adapter.http.routehandlers.HttpApiRequestHandler;
 import uk.co.compendiumdev.thingifier.api.http.HttpApiRequest;
 import uk.co.compendiumdev.thingifier.api.http.headers.HttpHeaderPair;
 import uk.co.compendiumdev.thingifier.api.response.ApiResponse;
-import uk.co.compendiumdev.thingifier.application.routehandlers.HttpApiRequestHandler;
 import uk.co.compendiumdev.thingifier.core.query.FilterBy;
 
 public class MirrorHttpApiTextRequestHandler implements HttpApiRequestHandler {

diff --git a/...lenger/src/main/java/uk/co/compendiumdev/challenge/practicemodes/mirror/MirrorRoutes.java b/...lenger/src/main/java/uk/co/compendiumdev/challenge/practicemodes/mirror/MirrorRoutes.java
@@ -6,10 +6,10 @@
 import java.util.List;
 import spark.Route;
 import uk.co.compendiumdev.thingifier.Thingifier;
+import uk.co.compendiumdev.thingifier.adapter.http.ThingifierAutoDocGenRouting;
+import uk.co.compendiumdev.thingifier.adapter.spark.AdhocDocumentedSparkRouteConfigurer;
 import uk.co.compendiumdev.thingifier.api.docgen.RoutingVerb;
 import uk.co.compendiumdev.thingifier.api.docgen.ThingifierApiDocumentationDefn;
-import uk.co.compendiumdev.thingifier.application.AdhocDocumentedSparkRouteConfigurer;
-import uk.co.compendiumdev.thingifier.application.httprouting.ThingifierAutoDocGenRouting;
 import uk.co.compendiumdev.thingifier.htmlgui.htmlgen.DefaultGUIHTML;
 import uk.co.compendiumdev.thingifier.spark.SimpleSparkRouteCreator;
 

diff --git a/...enger/src/main/java/uk/co/compendiumdev/challenge/practicemodes/mirror/RequestMirror.java b/...enger/src/main/java/uk/co/compendiumdev/challenge/practicemodes/mirror/RequestMirror.java
@@ -4,8 +4,8 @@
 import spark.Response;
 import uk.co.compendiumdev.challenge.spark.SparkMessageLengthValidator;
 import uk.co.compendiumdev.thingifier.Thingifier;
+import uk.co.compendiumdev.thingifier.adapter.http.routehandlers.SparkApiRequestResponseHandler;
 import uk.co.compendiumdev.thingifier.api.http.headers.headerparser.AcceptHeaderParser;
-import uk.co.compendiumdev.thingifier.application.routehandlers.SparkApiRequestResponseHandler;
 import uk.co.compendiumdev.thingifier.core.domain.definitions.EntityDefinition;
 import uk.co.compendiumdev.thingifier.core.domain.definitions.field.definition.Field;
 import uk.co.compendiumdev.thingifier.core.domain.definitions.field.definition.FieldType;

diff --git a/...n/java/uk/co/compendiumdev/challenge/practicemodes/simpleapi/AddMoreItemsIfNecessary.java b/...n/java/uk/co/compendiumdev/challenge/practicemodes/simpleapi/AddMoreItemsIfNecessary.java
@@ -1,9 +1,9 @@
 package uk.co.compendiumdev.challenge.practicemodes.simpleapi;
 
+import uk.co.compendiumdev.thingifier.adapter.http.messagehooks.HttpApiRequestHook;
 import uk.co.compendiumdev.thingifier.api.http.HttpApiRequest;
 import uk.co.compendiumdev.thingifier.api.http.HttpApiResponse;
 import uk.co.compendiumdev.thingifier.apiconfig.ThingifierApiConfig;
-import uk.co.compendiumdev.thingifier.application.httpapimessagehooks.HttpApiRequestHook;
 import uk.co.compendiumdev.thingifier.core.EntityRelModel;
 import uk.co.compendiumdev.thingifier.core.domain.definitions.EntityDefinition;
 import uk.co.compendiumdev.thingifier.core.repository.ThingStore;

diff --git a/.../uk/co/compendiumdev/challenge/practicemodes/simpleapi/ResetAutoIncrementWhenTooHigh.java b/.../uk/co/compendiumdev/challenge/practicemodes/simpleapi/ResetAutoIncrementWhenTooHigh.java
@@ -1,9 +1,9 @@
 package uk.co.compendiumdev.challenge.practicemodes.simpleapi;
 
+import uk.co.compendiumdev.thingifier.adapter.http.messagehooks.HttpApiRequestHook;
 import uk.co.compendiumdev.thingifier.api.http.HttpApiRequest;
 import uk.co.compendiumdev.thingifier.api.http.HttpApiResponse;
 import uk.co.compendiumdev.thingifier.apiconfig.ThingifierApiConfig;
-import uk.co.compendiumdev.thingifier.application.httpapimessagehooks.HttpApiRequestHook;
 import uk.co.compendiumdev.thingifier.core.EntityRelModel;
 import uk.co.compendiumdev.thingifier.core.domain.definitions.EntityDefinition;
 import uk.co.compendiumdev.thingifier.core.repository.ThingStore;

diff --git a/.../co/compendiumdev/challenge/practicemodes/simpleapi/SimpleApiCorsHeadersResponseHook.java b/.../co/compendiumdev/challenge/practicemodes/simpleapi/SimpleApiCorsHeadersResponseHook.java
@@ -1,11 +1,11 @@
 package uk.co.compendiumdev.challenge.practicemodes.simpleapi;
 
-import static uk.co.compendiumdev.thingifier.application.internalhttp.InternalHttpMethod.OPTIONS;
+import static uk.co.compendiumdev.thingifier.adapter.internalhttp.InternalHttpMethod.OPTIONS;
 
 import java.util.List;
-import uk.co.compendiumdev.thingifier.application.internalhttp.InternalHttpRequest;
-import uk.co.compendiumdev.thingifier.application.internalhttp.InternalHttpResponse;
-import uk.co.compendiumdev.thingifier.application.sparkhttpmessageHooks.InternalHttpResponseHook;
+import uk.co.compendiumdev.thingifier.adapter.internalhttp.InternalHttpRequest;
+import uk.co.compendiumdev.thingifier.adapter.internalhttp.InternalHttpResponse;
+import uk.co.compendiumdev.thingifier.adapter.spark.messagehooks.InternalHttpResponseHook;
 
 public class SimpleApiCorsHeadersResponseHook implements InternalHttpResponseHook {
 

diff --git a/.../src/main/java/uk/co/compendiumdev/challenge/practicemodes/simpleapi/SimpleApiRoutes.java b/.../src/main/java/uk/co/compendiumdev/challenge/practicemodes/simpleapi/SimpleApiRoutes.java
@@ -4,13 +4,13 @@
 
 import java.util.List;
 import uk.co.compendiumdev.thingifier.Thingifier;
+import uk.co.compendiumdev.thingifier.adapter.http.ThingifierAutoDocGenRouting;
+import uk.co.compendiumdev.thingifier.adapter.http.ThingifierHttpApiRoutings;
 import uk.co.compendiumdev.thingifier.api.docgen.RoutingDefinition;
 import uk.co.compendiumdev.thingifier.api.docgen.RoutingStatus;
 import uk.co.compendiumdev.thingifier.api.docgen.RoutingVerb;
 import uk.co.compendiumdev.thingifier.api.docgen.ThingifierApiDocumentationDefn;
 import uk.co.compendiumdev.thingifier.apiconfig.ThingifierApiConfig;
-import uk.co.compendiumdev.thingifier.application.httprouting.ThingifierAutoDocGenRouting;
-import uk.co.compendiumdev.thingifier.application.httprouting.ThingifierHttpApiRoutings;
 import uk.co.compendiumdev.thingifier.core.EntityRelModel;
 import uk.co.compendiumdev.thingifier.core.domain.definitions.EntityDefinition;
 import uk.co.compendiumdev.thingifier.core.domain.definitions.field.definition.Field;

diff --git a/...rc/main/java/uk/co/compendiumdev/challenge/practicemodes/simulation/SimulationRoutes.java b/...rc/main/java/uk/co/compendiumdev/challenge/practicemodes/simulation/SimulationRoutes.java
@@ -5,13 +5,13 @@
 import java.util.List;
 import uk.co.compendiumdev.challenge.ChallengerConfig;
 import uk.co.compendiumdev.thingifier.Thingifier;
+import uk.co.compendiumdev.thingifier.adapter.http.ThingifierAutoDocGenRouting;
+import uk.co.compendiumdev.thingifier.adapter.http.routehandlers.HttpApiRequestHandler;
+import uk.co.compendiumdev.thingifier.adapter.http.routehandlers.SparkApiRequestResponseHandler;
 import uk.co.compendiumdev.thingifier.api.docgen.ThingifierApiDocumentationDefn;
 import uk.co.compendiumdev.thingifier.api.http.HttpApiRequest;
 import uk.co.compendiumdev.thingifier.api.response.ApiResponse;
 import uk.co.compendiumdev.thingifier.apiconfig.ThingifierApiConfig;
-import uk.co.compendiumdev.thingifier.application.httprouting.ThingifierAutoDocGenRouting;
-import uk.co.compendiumdev.thingifier.application.routehandlers.HttpApiRequestHandler;
-import uk.co.compendiumdev.thingifier.application.routehandlers.SparkApiRequestResponseHandler;
 import uk.co.compendiumdev.thingifier.core.EntityRelModel;
 import uk.co.compendiumdev.thingifier.core.domain.definitions.EntityDefinition;
 import uk.co.compendiumdev.thingifier.core.domain.definitions.field.definition.Field;

diff --git a/...lenger/src/main/java/uk/co/compendiumdev/challenge/spark/SparkMessageLengthValidator.java b/...lenger/src/main/java/uk/co/compendiumdev/challenge/spark/SparkMessageLengthValidator.java
@@ -2,16 +2,16 @@
 
 import spark.Request;
 import spark.Response;
+import uk.co.compendiumdev.thingifier.adapter.internalhttp.InternalHttpRequest;
+import uk.co.compendiumdev.thingifier.adapter.internalhttp.conversion.HttpApiResponseToInternalHttpResponse;
+import uk.co.compendiumdev.thingifier.adapter.internalhttp.conversion.InternalHttpRequestToHttpApiRequest;
+import uk.co.compendiumdev.thingifier.adapter.internalhttp.conversion.InternalHttpResponseToSpark;
+import uk.co.compendiumdev.thingifier.adapter.internalhttp.conversion.SparkToInternalHttpRequest;
 import uk.co.compendiumdev.thingifier.api.ermodelconversion.JsonThing;
 import uk.co.compendiumdev.thingifier.api.http.HttpApiRequest;
 import uk.co.compendiumdev.thingifier.api.http.HttpApiResponse;
 import uk.co.compendiumdev.thingifier.api.response.ApiResponse;
 import uk.co.compendiumdev.thingifier.apiconfig.ThingifierApiConfig;
-import uk.co.compendiumdev.thingifier.application.internalhttp.InternalHttpRequest;
-import uk.co.compendiumdev.thingifier.application.internalhttpconversion.HttpApiResponseToInternalHttpResponse;
-import uk.co.compendiumdev.thingifier.application.internalhttpconversion.InternalHttpRequestToHttpApiRequest;
-import uk.co.compendiumdev.thingifier.application.internalhttpconversion.InternalHttpResponseToSpark;
-import uk.co.compendiumdev.thingifier.application.internalhttpconversion.SparkToInternalHttpRequest;
 
 public class SparkMessageLengthValidator {
 

diff --git a/...a/uk/co/compendiumdev/challenge/challengehooks/ChallengerInternalHttpRequestHookTest.java b/...a/uk/co/compendiumdev/challenge/challengehooks/ChallengerInternalHttpRequestHookTest.java
@@ -7,8 +7,8 @@
 import uk.co.compendiumdev.challenge.CHALLENGE;
 import uk.co.compendiumdev.challenge.ChallengerAuthData;
 import uk.co.compendiumdev.challenge.challengers.Challengers;
-import uk.co.compendiumdev.thingifier.application.internalhttp.InternalHttpMethod;
-import uk.co.compendiumdev.thingifier.application.internalhttp.InternalHttpRequest;
+import uk.co.compendiumdev.thingifier.adapter.internalhttp.InternalHttpMethod;
+import uk.co.compendiumdev.thingifier.adapter.internalhttp.InternalHttpRequest;
 
 public class ChallengerInternalHttpRequestHookTest {
 

diff --git a/.../uk/co/compendiumdev/challenge/challengehooks/ChallengerInternalHttpResponseHookTest.java b/.../uk/co/compendiumdev/challenge/challengehooks/ChallengerInternalHttpResponseHookTest.java
@@ -6,9 +6,9 @@
 import uk.co.compendiumdev.challenge.CHALLENGE;
 import uk.co.compendiumdev.challenge.ChallengerAuthData;
 import uk.co.compendiumdev.challenge.challengers.Challengers;
-import uk.co.compendiumdev.thingifier.application.internalhttp.InternalHttpMethod;
-import uk.co.compendiumdev.thingifier.application.internalhttp.InternalHttpRequest;
-import uk.co.compendiumdev.thingifier.application.internalhttp.InternalHttpResponse;
+import uk.co.compendiumdev.thingifier.adapter.internalhttp.InternalHttpMethod;
+import uk.co.compendiumdev.thingifier.adapter.internalhttp.InternalHttpRequest;
+import uk.co.compendiumdev.thingifier.adapter.internalhttp.InternalHttpResponse;
 
 public class ChallengerInternalHttpResponseHookTest {
 

diff --git a/...istManagerRestApi/src/main/java/uk/co/compendiumdev/todolist/sqlite/application/Main.java b/...istManagerRestApi/src/main/java/uk/co/compendiumdev/todolist/sqlite/application/Main.java
@@ -2,7 +2,7 @@
 
 import static spark.Spark.get;
 
-import uk.co.compendiumdev.thingifier.application.MainImplementation;
+import uk.co.compendiumdev.thingifier.adapter.spark.MainImplementation;
 import uk.co.compendiumdev.thingifier.application.examples.TodoManagerThingifier;
 import uk.co.compendiumdev.thingifier.core.repository.sqlite.SqliteThingStoreProvider;
 

diff --git a/...neTodoListManagerRestApi/src/main/java/uk/co/compendiumdev/todolist/application/Main.java b/...neTodoListManagerRestApi/src/main/java/uk/co/compendiumdev/todolist/application/Main.java
@@ -4,7 +4,7 @@
 import static spark.route.HttpMethod.get;
 
 import uk.co.compendiumdev.thingifier.Thingifier;
-import uk.co.compendiumdev.thingifier.application.MainImplementation;
+import uk.co.compendiumdev.thingifier.adapter.spark.MainImplementation;
 import uk.co.compendiumdev.thingifier.application.examples.TodoManagerThingifier;
 
 public class Main {

diff --git a/standAloneTodoListRestApi/src/main/java/uk/co/compendiumdev/todolist/application/Main.java b/standAloneTodoListRestApi/src/main/java/uk/co/compendiumdev/todolist/application/Main.java
@@ -2,7 +2,7 @@
 
 import static spark.Spark.get;
 
-import uk.co.compendiumdev.thingifier.application.MainImplementation;
+import uk.co.compendiumdev.thingifier.adapter.spark.MainImplementation;
 import uk.co.compendiumdev.thingifier.application.examples.TodoListThingifier;
 
 public class Main {

diff --git a/...ng/SparkHttpGenericExceptionRoutings.java → ...tp/SparkHttpGenericExceptionRoutings.java b/...ng/SparkHttpGenericExceptionRoutings.java → ...tp/SparkHttpGenericExceptionRoutings.java
@@ -1,4 +1,4 @@
-package uk.co.compendiumdev.thingifier.application.httprouting;
+package uk.co.compendiumdev.thingifier.adapter.http;
 
 import static spark.Spark.exception;
 

diff --git a/...prouting/ThingifierAutoDocGenRouting.java → ...ter/http/ThingifierAutoDocGenRouting.java b/...prouting/ThingifierAutoDocGenRouting.java → ...ter/http/ThingifierAutoDocGenRouting.java
@@ -1,4 +1,4 @@
-package uk.co.compendiumdev.thingifier.application.httprouting;
+package uk.co.compendiumdev.thingifier.adapter.http;
 
 import static spark.Spark.get;