diff --git a/README.md b/README.md
index 484074009..133e683c7 100644
--- a/README.md
+++ b/README.md
@@ -8,6 +8,7 @@ There are two ways of running this service
 
 * The easiest way is via docker (https://github.com/ONSdigital/ras-rm-docker-dev)
 * Alternatively running the service up in isolation
+* gcloud auth configure-docker when running locally
     ```bash
     cp .maven.settings.xml ~/.m2/settings.xml  # This only needs to be done once to set up mavens settings file
     mvn clean install
diff --git a/pom.xml b/pom.xml
index 813bfd8e2..4f7909d09 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
     <properties>
         <springboot.version>2.4.11</springboot.version>
         <spring.cloud.gcp.version>1.2.8.RELEASE</spring.cloud.gcp.version>
-        <jackson.version>2.12.2</jackson.version>
+        <jackson.version>2.13.0</jackson.version>
         <java.version>11</java.version>
         <orika.version>1.5.4</orika.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -52,6 +52,11 @@
             <artifactId>spring-boot-starter</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-jetty</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-validation</artifactId>
@@ -77,46 +82,11 @@
             <artifactId>spring-boot-starter-test</artifactId>
         </dependency>
 
-        <!-- Added because of mockito errors. It's explained more here
-        https://dev.to/scottshipp/how-to-fix-a-mockito-cannot-mock-this-class-exception-in-a-spring-boot-app-457e -->
-        <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-core</artifactId>
-            <version>2.22.0</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-jetty</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework.integration</groupId>
-            <artifactId>spring-integration-amqp</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework.integration</groupId>
-            <artifactId>spring-integration-xml</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework.amqp</groupId>
-            <artifactId>spring-amqp</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-jpa</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-configuration-processor</artifactId>
-            <optional>true</optional>
-        </dependency>
-
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-context-support</artifactId>
@@ -125,45 +95,40 @@
         <dependency>
             <groupId>org.springframework.security</groupId>
             <artifactId>spring-security-crypto</artifactId>
-            <version>5.0.19.RELEASE</version>
+            <version>5.5.2</version>
         </dependency>
 
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-gcp-starter-pubsub</artifactId>
         </dependency>
+
         <dependency>
-            <groupId>org.springframework.integration</groupId>
-            <artifactId>spring-integration-core</artifactId>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-configuration-processor</artifactId>
+            <optional>true</optional>
         </dependency>
 
         <!-- SPRING END -->
 
         <!-- third party libraries -->
 
-        <!-- Fixes missing SOAPException when running integration tests when upgrading from SB 2.0 to 2.1 -->
         <dependency>
-            <groupId>com.sun.xml.messaging.saaj</groupId>
-            <artifactId>saaj-impl</artifactId>
-            <version>1.5.2</version>
-        </dependency>
-
-        <dependency>
-            <groupId>commons-collections</groupId>
-            <artifactId>commons-collections</artifactId>
-            <version>3.2.2</version>
+            <groupId>ma.glasnost.orika</groupId>
+            <artifactId>orika-core</artifactId>
+            <version>${orika.version}</version>
         </dependency>
 
         <dependency>
             <groupId>ma.glasnost.orika</groupId>
-            <artifactId>orika-core</artifactId>
+            <artifactId>orika-eclipse-tools</artifactId>
             <version>${orika.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <version>1.18.2</version>
+            <version>1.18.22</version>
         </dependency>
 
         <dependency>
@@ -181,7 +146,7 @@
         <dependency>
             <groupId>net.codesup.util</groupId>
             <artifactId>jaxb2-rich-contract-plugin</artifactId>
-            <version>2.0.1</version>
+            <version>2.1.0</version>
         </dependency>
 
         <dependency>
@@ -195,18 +160,6 @@
             <scope>runtime</scope>
         </dependency>
 
-        <dependency>
-            <groupId>ma.glasnost.orika</groupId>
-            <artifactId>orika-eclipse-tools</artifactId>
-            <version>${orika.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>net.logstash.logback</groupId>
-            <artifactId>logstash-logback-encoder</artifactId>
-            <version>4.11</version>
-        </dependency>
-
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>javax.servlet-api</artifactId>
@@ -215,7 +168,7 @@
         <dependency>
             <groupId>org.springdoc</groupId>
             <artifactId>springdoc-openapi-ui</artifactId>
-            <version>1.4.1</version>
+            <version>1.5.11</version>
         </dependency>
 
         <dependency>
@@ -230,12 +183,6 @@
             </exclusions>
         </dependency>
 
-        <dependency>
-            <groupId>com.thoughtworks.xstream</groupId>
-            <artifactId>xstream</artifactId>
-            <version>1.4.18</version>
-        </dependency>
-
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-core</artifactId>
@@ -248,74 +195,30 @@
             <version>${jackson.version}</version>
         </dependency>
 
-        <dependency>
-            <groupId>com.fasterxml.jackson.dataformat</groupId>
-            <artifactId>jackson-dataformat-xml</artifactId>
-            <version>${jackson.version}</version>
-        </dependency>
-
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-annotations</artifactId>
             <version>${jackson.version}</version>
         </dependency>
 
-        <dependency>
-            <groupId>com.fasterxml.jackson.datatype</groupId>
-            <artifactId>jackson-datatype-jsr310</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>com.godaddy</groupId>
             <artifactId>logging</artifactId>
             <version>1.2.5</version>
         </dependency>
 
-        <dependency>
-            <groupId>javax.xml.bind</groupId>
-            <artifactId>jaxb-api</artifactId>
-            <version>2.3.1</version>
-        </dependency>
+        <!-- Third party end -->
 
-        <dependency>
-            <groupId>org.glassfish.jaxb</groupId>
-            <artifactId>jaxb-runtime</artifactId>
-            <version>2.3.3</version>
-        </dependency>
+        <!-- Testing -->
 
+        <!-- Added because of mockito errors. It's explained more here
+        https://dev.to/scottshipp/how-to-fix-a-mockito-cannot-mock-this-class-exception-in-a-spring-boot-app-457e -->
         <dependency>
-            <groupId>com.sun.xml.bind</groupId>
-            <artifactId>jaxb-core</artifactId>
-            <version>2.3.0</version>
-        </dependency>
-        <dependency>
-            <groupId>com.sun.xml.bind</groupId>
-            <artifactId>jaxb-impl</artifactId>
-            <version>2.3.0</version>
-        </dependency>
-        <dependency>
-            <groupId>javax.annotation</groupId>
-            <artifactId>javax.annotation-api</artifactId>
-            <version>1.3.2</version>
-        </dependency>
-        <dependency>
-            <groupId>xml-apis</groupId>
-            <artifactId>xml-apis</artifactId>
-            <version>1.4.01</version>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-core</artifactId>
+            <version>4.0.0</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>javax.activation</groupId>
-            <artifactId>activation</artifactId>
-            <version>1.1.1</version>
-        </dependency>
-        <dependency>
-            <groupId>com.google.cloud</groupId>
-            <artifactId>google-cloud-pubsub</artifactId>
-        </dependency>
-        <!-- Third party end -->
-
-        <!-- Testing -->
 
         <dependency>
             <groupId>com.mashape.unirest</groupId>
@@ -327,7 +230,7 @@
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
-            <version>2.7</version>
+            <version>2.11.0</version>
             <scope>test</scope>
         </dependency>
 
@@ -341,7 +244,7 @@
         <dependency>
             <groupId>com.github.tomakehurst</groupId>
             <artifactId>wiremock</artifactId>
-            <version>2.18.0</version>
+            <version>2.27.2</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/src/main/java/uk/gov/ons/response/survey/representation/SurveyClassifierDTO.java b/src/main/java/uk/gov/ons/ctp/response/collection/exercise/representation/SurveyClassifierDTO.java
similarity index 79%
rename from src/main/java/uk/gov/ons/response/survey/representation/SurveyClassifierDTO.java
rename to src/main/java/uk/gov/ons/ctp/response/collection/exercise/representation/SurveyClassifierDTO.java
index 0d3208075..a5abc7b21 100644
--- a/src/main/java/uk/gov/ons/response/survey/representation/SurveyClassifierDTO.java
+++ b/src/main/java/uk/gov/ons/ctp/response/collection/exercise/representation/SurveyClassifierDTO.java
@@ -1,4 +1,4 @@
-package uk.gov.ons.response.survey.representation;
+package uk.gov.ons.ctp.response.collection.exercise.representation;
 
 import lombok.AccessLevel;
 import lombok.Data;
diff --git a/src/main/java/uk/gov/ons/response/survey/representation/SurveyClassifierTypeDTO.java b/src/main/java/uk/gov/ons/ctp/response/collection/exercise/representation/SurveyClassifierTypeDTO.java
similarity index 83%
rename from src/main/java/uk/gov/ons/response/survey/representation/SurveyClassifierTypeDTO.java
rename to src/main/java/uk/gov/ons/ctp/response/collection/exercise/representation/SurveyClassifierTypeDTO.java
index ff68636dc..0b6dce16a 100644
--- a/src/main/java/uk/gov/ons/response/survey/representation/SurveyClassifierTypeDTO.java
+++ b/src/main/java/uk/gov/ons/ctp/response/collection/exercise/representation/SurveyClassifierTypeDTO.java
@@ -1,4 +1,4 @@
-package uk.gov.ons.response.survey.representation;
+package uk.gov.ons.ctp.response.collection.exercise.representation;
 
 import java.util.List;
 import lombok.AccessLevel;
diff --git a/src/main/java/uk/gov/ons/response/survey/representation/SurveyDTO.java b/src/main/java/uk/gov/ons/ctp/response/collection/exercise/representation/SurveyDTO.java
similarity index 91%
rename from src/main/java/uk/gov/ons/response/survey/representation/SurveyDTO.java
rename to src/main/java/uk/gov/ons/ctp/response/collection/exercise/representation/SurveyDTO.java
index 4cb92e76d..767c84a95 100644
--- a/src/main/java/uk/gov/ons/response/survey/representation/SurveyDTO.java
+++ b/src/main/java/uk/gov/ons/ctp/response/collection/exercise/representation/SurveyDTO.java
@@ -1,4 +1,4 @@
-package uk.gov.ons.response.survey.representation;
+package uk.gov.ons.ctp.response.collection.exercise.representation;
 
 import lombok.AccessLevel;
 import lombok.Data;