diff --git a/optimiser-controller/build.gradle b/optimiser-controller/build.gradle
index f3b1e8b..0a0e2c4 100644
--- a/optimiser-controller/build.gradle
+++ b/optimiser-controller/build.gradle
@@ -60,7 +60,7 @@ java {
 
 application {
     // Define the main class for the application.
-    mainClass = 'eu.nebulous.optimiser.controller.Main'
+    mainClass = 'eu.nebulouscloud.optimiser.controller.Main'
 }
 
 jar {
diff --git a/optimiser-controller/src/main/java/eu/nebulous/optimiser/controller/AppParser.java b/optimiser-controller/src/main/java/eu/nebulouscloud/optimiser/controller/AppParser.java
similarity index 90%
rename from optimiser-controller/src/main/java/eu/nebulous/optimiser/controller/AppParser.java
rename to optimiser-controller/src/main/java/eu/nebulouscloud/optimiser/controller/AppParser.java
index 317236b..18f05dd 100644
--- a/optimiser-controller/src/main/java/eu/nebulous/optimiser/controller/AppParser.java
+++ b/optimiser-controller/src/main/java/eu/nebulouscloud/optimiser/controller/AppParser.java
@@ -1,10 +1,9 @@
-package eu.nebulous.optimiser.controller;
+package eu.nebulouscloud.optimiser.controller;
 
 import com.amihaiemil.eoyaml.Yaml;
-import com.amihaiemil.eoyaml.YamlMapping;
 
-import java.io.File;
 import java.io.IOException;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/optimiser-controller/src/main/java/eu/nebulous/optimiser/controller/Main.java b/optimiser-controller/src/main/java/eu/nebulouscloud/optimiser/controller/Main.java
similarity index 98%
rename from optimiser-controller/src/main/java/eu/nebulous/optimiser/controller/Main.java
rename to optimiser-controller/src/main/java/eu/nebulouscloud/optimiser/controller/Main.java
index 2caf1a0..3b289f2 100644
--- a/optimiser-controller/src/main/java/eu/nebulous/optimiser/controller/Main.java
+++ b/optimiser-controller/src/main/java/eu/nebulouscloud/optimiser/controller/Main.java
@@ -1,6 +1,5 @@
-package eu.nebulous.optimiser.controller;
+package eu.nebulouscloud.optimiser.controller;
 
-import java.io.File;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
diff --git a/optimiser-controller/src/main/java/eu/nebulous/optimiser/controller/NebulousApp.java b/optimiser-controller/src/main/java/eu/nebulouscloud/optimiser/controller/NebulousApp.java
similarity index 93%
rename from optimiser-controller/src/main/java/eu/nebulous/optimiser/controller/NebulousApp.java
rename to optimiser-controller/src/main/java/eu/nebulouscloud/optimiser/controller/NebulousApp.java
index 631865b..9b934cc 100644
--- a/optimiser-controller/src/main/java/eu/nebulous/optimiser/controller/NebulousApp.java
+++ b/optimiser-controller/src/main/java/eu/nebulouscloud/optimiser/controller/NebulousApp.java
@@ -1,4 +1,4 @@
-package eu.nebulous.optimiser.controller;
+package eu.nebulouscloud.optimiser.controller;
 
 import com.amihaiemil.eoyaml.*;
 
@@ -12,7 +12,7 @@ public class NebulousApp {
     /**
      * Creates a NebulousApp object.
      *
-     * Example KubeVela and parameter files can be found below {@link
+     * Example KubeVela and parameter files can be found below {@code
      * optimiser-controller/src/test/resources}
      *
      * @param kubevela A parsed representation of the deployable KubeVela App model
@@ -44,8 +44,8 @@ public class NebulousApp {
     /**
      * Return the location of a path in the application's KubeVela model.
      *
-     * @param path the path to the requested node, in {@link
-     * https://mikefarah.gitbook.io/yq/ yq} notation
+     * @param path the path to the requested node, in yq notation (see <a
+     *  href="https://mikefarah.gitbook.io/yq/">https://mikefarah.gitbook.io/yq/</a>)
      * @return the node identified by the given path, or null if the path
      * cannot be followed
      */
diff --git a/optimiser-controller/src/main/java/eu/nebulous/optimiser/controller/SalConnector.java b/optimiser-controller/src/main/java/eu/nebulouscloud/optimiser/controller/SalConnector.java
similarity index 98%
rename from optimiser-controller/src/main/java/eu/nebulous/optimiser/controller/SalConnector.java
rename to optimiser-controller/src/main/java/eu/nebulouscloud/optimiser/controller/SalConnector.java
index d88b6c1..7082a6f 100644
--- a/optimiser-controller/src/main/java/eu/nebulous/optimiser/controller/SalConnector.java
+++ b/optimiser-controller/src/main/java/eu/nebulouscloud/optimiser/controller/SalConnector.java
@@ -1,4 +1,4 @@
-package eu.nebulous.optimiser.controller;
+package eu.nebulouscloud.optimiser.controller;
 
 import java.io.IOException;
 import java.net.URI;
diff --git a/optimiser-controller/src/test/java/eu/nebulous/optimiser/controller/AppParserTest.java b/optimiser-controller/src/test/java/eu/nebulouscloud/optimiser/controller/AppParserTest.java
similarity index 85%
rename from optimiser-controller/src/test/java/eu/nebulous/optimiser/controller/AppParserTest.java
rename to optimiser-controller/src/test/java/eu/nebulouscloud/optimiser/controller/AppParserTest.java
index 12e2580..6c0f8ec 100644
--- a/optimiser-controller/src/test/java/eu/nebulous/optimiser/controller/AppParserTest.java
+++ b/optimiser-controller/src/test/java/eu/nebulouscloud/optimiser/controller/AppParserTest.java
@@ -1,10 +1,8 @@
-package eu.nebulous.optimiser.controller;
+package eu.nebulouscloud.optimiser.controller;
 
 import org.junit.jupiter.api.Test;
 
-import java.io.File;
 import java.io.IOException;
-import java.net.URI;
 import java.net.URISyntaxException;
 import java.net.URL;
 import java.nio.charset.StandardCharsets;
@@ -12,7 +10,8 @@ import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class AppParserTest {
 
diff --git a/optimiser-controller/src/test/java/eu/nebulous/optimiser/controller/MainTest.java b/optimiser-controller/src/test/java/eu/nebulouscloud/optimiser/controller/MainTest.java
similarity index 69%
rename from optimiser-controller/src/test/java/eu/nebulous/optimiser/controller/MainTest.java
rename to optimiser-controller/src/test/java/eu/nebulouscloud/optimiser/controller/MainTest.java
index 8f79a52..ce1eb3b 100644
--- a/optimiser-controller/src/test/java/eu/nebulous/optimiser/controller/MainTest.java
+++ b/optimiser-controller/src/test/java/eu/nebulouscloud/optimiser/controller/MainTest.java
@@ -1,10 +1,11 @@
 /*
  * This Java source file was generated by the Gradle 'init' task.
  */
-package eu.nebulous.optimiser.controller;
+package eu.nebulouscloud.optimiser.controller;
 
 import org.junit.jupiter.api.Test;
-import static org.junit.jupiter.api.Assertions.*;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 class MainTest {
     @Test void noArgRunSucceeds() {
diff --git a/optimiser-controller/src/test/java/eu/nebulous/optimiser/controller/SALConnectorTests.java b/optimiser-controller/src/test/java/eu/nebulouscloud/optimiser/controller/SALConnectorTests.java
similarity index 88%
rename from optimiser-controller/src/test/java/eu/nebulous/optimiser/controller/SALConnectorTests.java
rename to optimiser-controller/src/test/java/eu/nebulouscloud/optimiser/controller/SALConnectorTests.java
index ce7cd48..3ea74cc 100644
--- a/optimiser-controller/src/test/java/eu/nebulous/optimiser/controller/SALConnectorTests.java
+++ b/optimiser-controller/src/test/java/eu/nebulouscloud/optimiser/controller/SALConnectorTests.java
@@ -1,4 +1,4 @@
-package eu.nebulous.optimiser.controller;
+package eu.nebulouscloud.optimiser.controller;
 
 import com.github.tomakehurst.wiremock.client.WireMock;
 import com.github.tomakehurst.wiremock.junit5.WireMockRuntimeInfo;
@@ -8,7 +8,8 @@ import org.junit.jupiter.api.Test;
 import java.net.URI;
 
 import static com.github.tomakehurst.wiremock.client.WireMock.*;
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 @WireMockTest
 public class SALConnectorTests {
diff --git a/optimiser-controller/startup.jsh b/optimiser-controller/startup.jsh
index f9080d7..d7a9b2d 100644
--- a/optimiser-controller/startup.jsh
+++ b/optimiser-controller/startup.jsh
@@ -1,2 +1,2 @@
 // This startup script applies when running `./gradlew --console plain jshell`.
-import eu.nebulous.optimiser.controller.*;
+import eu.nebulouscloud.optimiser.controller.*;