diff --git a/src/main/java/io/codeka/gaia/runner/StackCommandBuilder.java b/src/main/java/io/codeka/gaia/runner/StackCommandBuilder.java
index c7b489edf..355445810 100644
--- a/src/main/java/io/codeka/gaia/runner/StackCommandBuilder.java
+++ b/src/main/java/io/codeka/gaia/runner/StackCommandBuilder.java
@@ -1,7 +1,7 @@
 package io.codeka.gaia.runner;
 
 import com.github.mustachejava.Mustache;
-import io.codeka.gaia.bo.Settings;
+import io.codeka.gaia.settings.bo.Settings;
 import io.codeka.gaia.stacks.bo.Stack;
 import io.codeka.gaia.modules.bo.TerraformModule;
 import io.codeka.gaia.stacks.bo.mustache.TerraformScript;
diff --git a/src/main/java/io/codeka/gaia/runner/StackRunner.java b/src/main/java/io/codeka/gaia/runner/StackRunner.java
index 832ad640a..c8b3aa90d 100644
--- a/src/main/java/io/codeka/gaia/runner/StackRunner.java
+++ b/src/main/java/io/codeka/gaia/runner/StackRunner.java
@@ -3,8 +3,8 @@
 import com.spotify.docker.client.DockerClient;
 import com.spotify.docker.client.exceptions.DockerException;
 import com.spotify.docker.client.messages.ContainerConfig;
-import io.codeka.gaia.bo.*;
 import io.codeka.gaia.modules.bo.TerraformModule;
+import io.codeka.gaia.settings.bo.Settings;
 import io.codeka.gaia.stacks.repository.JobRepository;
 import io.codeka.gaia.stacks.repository.StackRepository;
 import io.codeka.gaia.stacks.bo.Job;
diff --git a/src/main/java/io/codeka/gaia/runner/config/DockerConfig.java b/src/main/java/io/codeka/gaia/runner/config/DockerConfig.java
index 65bcf31d3..533092579 100644
--- a/src/main/java/io/codeka/gaia/runner/config/DockerConfig.java
+++ b/src/main/java/io/codeka/gaia/runner/config/DockerConfig.java
@@ -4,7 +4,7 @@
 import com.spotify.docker.client.DockerClient;
 import com.spotify.docker.client.messages.ContainerConfig;
 import com.spotify.docker.client.messages.HostConfig;
-import io.codeka.gaia.bo.Settings;
+import io.codeka.gaia.settings.bo.Settings;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
diff --git a/src/main/java/io/codeka/gaia/bo/Settings.java b/src/main/java/io/codeka/gaia/settings/bo/Settings.java
similarity index 98%
rename from src/main/java/io/codeka/gaia/bo/Settings.java
rename to src/main/java/io/codeka/gaia/settings/bo/Settings.java
index 9e2bde82a..17d4d65e7 100644
--- a/src/main/java/io/codeka/gaia/bo/Settings.java
+++ b/src/main/java/io/codeka/gaia/settings/bo/Settings.java
@@ -1,4 +1,4 @@
-package io.codeka.gaia.bo;
+package io.codeka.gaia.settings.bo;
 
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.stereotype.Component;
diff --git a/src/main/java/io/codeka/gaia/controller/SettingsController.java b/src/main/java/io/codeka/gaia/settings/controller/SettingsController.java
similarity index 89%
rename from src/main/java/io/codeka/gaia/controller/SettingsController.java
rename to src/main/java/io/codeka/gaia/settings/controller/SettingsController.java
index 946452149..56fc1fb9f 100644
--- a/src/main/java/io/codeka/gaia/controller/SettingsController.java
+++ b/src/main/java/io/codeka/gaia/settings/controller/SettingsController.java
@@ -1,7 +1,7 @@
-package io.codeka.gaia.controller;
+package io.codeka.gaia.settings.controller;
 
-import io.codeka.gaia.bo.Settings;
-import io.codeka.gaia.repository.SettingsRepository;
+import io.codeka.gaia.settings.bo.Settings;
+import io.codeka.gaia.settings.repository.SettingsRepository;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.annotation.Secured;
 import org.springframework.stereotype.Controller;
diff --git a/src/main/java/io/codeka/gaia/repository/SettingsRepository.java b/src/main/java/io/codeka/gaia/settings/repository/SettingsRepository.java
similarity index 93%
rename from src/main/java/io/codeka/gaia/repository/SettingsRepository.java
rename to src/main/java/io/codeka/gaia/settings/repository/SettingsRepository.java
index 43ecd92d9..fe89e30f0 100644
--- a/src/main/java/io/codeka/gaia/repository/SettingsRepository.java
+++ b/src/main/java/io/codeka/gaia/settings/repository/SettingsRepository.java
@@ -1,6 +1,6 @@
-package io.codeka.gaia.repository;
+package io.codeka.gaia.settings.repository;
 
-import io.codeka.gaia.bo.Settings;
+import io.codeka.gaia.settings.bo.Settings;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.stereotype.Repository;
diff --git a/src/test/java/io/codeka/gaia/runner/StackCommandBuilderTest.java b/src/test/java/io/codeka/gaia/runner/StackCommandBuilderTest.java
index 152042a4b..f2eb51171 100644
--- a/src/test/java/io/codeka/gaia/runner/StackCommandBuilderTest.java
+++ b/src/test/java/io/codeka/gaia/runner/StackCommandBuilderTest.java
@@ -2,7 +2,7 @@
 
 import com.github.mustachejava.DefaultMustacheFactory;
 import com.github.mustachejava.Mustache;
-import io.codeka.gaia.bo.Settings;
+import io.codeka.gaia.settings.bo.Settings;
 import io.codeka.gaia.stacks.bo.Stack;
 import io.codeka.gaia.modules.bo.TerraformModule;
 import io.codeka.gaia.modules.bo.TerraformVariable;
diff --git a/src/test/java/io/codeka/gaia/runner/StackRunnerTest.java b/src/test/java/io/codeka/gaia/runner/StackRunnerTest.java
index 29a81ea59..16b6d4d08 100644
--- a/src/test/java/io/codeka/gaia/runner/StackRunnerTest.java
+++ b/src/test/java/io/codeka/gaia/runner/StackRunnerTest.java
@@ -5,8 +5,8 @@
 import com.spotify.docker.client.messages.ContainerConfig;
 import com.spotify.docker.client.messages.ContainerCreation;
 import com.spotify.docker.client.messages.ContainerExit;
-import io.codeka.gaia.bo.*;
 import io.codeka.gaia.modules.bo.TerraformModule;
+import io.codeka.gaia.settings.bo.Settings;
 import io.codeka.gaia.stacks.repository.JobRepository;
 import io.codeka.gaia.stacks.repository.StackRepository;
 import io.codeka.gaia.stacks.bo.*;
diff --git a/src/test/java/io/codeka/gaia/runner/config/DockerConfigTest.java b/src/test/java/io/codeka/gaia/runner/config/DockerConfigTest.java
index 1d55548dd..52b85315a 100644
--- a/src/test/java/io/codeka/gaia/runner/config/DockerConfigTest.java
+++ b/src/test/java/io/codeka/gaia/runner/config/DockerConfigTest.java
@@ -1,9 +1,8 @@
 package io.codeka.gaia.runner.config;
 
 
-import com.spotify.docker.client.DockerClient;
 import com.spotify.docker.client.exceptions.DockerException;
-import io.codeka.gaia.bo.Settings;
+import io.codeka.gaia.settings.bo.Settings;
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
diff --git a/src/test/java/io/codeka/gaia/bo/SettingsTest.java b/src/test/java/io/codeka/gaia/settings/bo/SettingsTest.java
similarity index 96%
rename from src/test/java/io/codeka/gaia/bo/SettingsTest.java
rename to src/test/java/io/codeka/gaia/settings/bo/SettingsTest.java
index d12216299..42bea8a37 100644
--- a/src/test/java/io/codeka/gaia/bo/SettingsTest.java
+++ b/src/test/java/io/codeka/gaia/settings/bo/SettingsTest.java
@@ -1,5 +1,6 @@
-package io.codeka.gaia.bo;
+package io.codeka.gaia.settings.bo;
 
+import io.codeka.gaia.settings.bo.Settings;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
diff --git a/src/test/java/io/codeka/gaia/controller/SettingsControllerTest.java b/src/test/java/io/codeka/gaia/settings/controller/SettingsControllerTest.java
similarity index 82%
rename from src/test/java/io/codeka/gaia/controller/SettingsControllerTest.java
rename to src/test/java/io/codeka/gaia/settings/controller/SettingsControllerTest.java
index 1b5da05a1..6fce9c809 100644
--- a/src/test/java/io/codeka/gaia/controller/SettingsControllerTest.java
+++ b/src/test/java/io/codeka/gaia/settings/controller/SettingsControllerTest.java
@@ -1,7 +1,7 @@
-package io.codeka.gaia.controller;
+package io.codeka.gaia.settings.controller;
 
-import io.codeka.gaia.bo.Settings;
-import io.codeka.gaia.repository.SettingsRepository;
+import io.codeka.gaia.settings.bo.Settings;
+import io.codeka.gaia.settings.repository.SettingsRepository;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.InjectMocks;
@@ -10,10 +10,8 @@
 
 import java.util.List;
 
-import static org.junit.jupiter.api.Assertions.*;
 import static org.mockito.ArgumentMatchers.anyList;
 import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyNoMoreInteractions;
 
 @ExtendWith(MockitoExtension.class)
 class SettingsControllerTest {
diff --git a/src/test/java/io/codeka/gaia/repository/SettingsRepositoryIT.java b/src/test/java/io/codeka/gaia/settings/repository/SettingsRepositoryIT.java
similarity index 91%
rename from src/test/java/io/codeka/gaia/repository/SettingsRepositoryIT.java
rename to src/test/java/io/codeka/gaia/settings/repository/SettingsRepositoryIT.java
index 18e002f97..9029639dc 100644
--- a/src/test/java/io/codeka/gaia/repository/SettingsRepositoryIT.java
+++ b/src/test/java/io/codeka/gaia/settings/repository/SettingsRepositoryIT.java
@@ -1,10 +1,9 @@
-package io.codeka.gaia.repository;
+package io.codeka.gaia.settings.repository;
 
-import io.codeka.gaia.bo.Settings;
+import io.codeka.gaia.settings.bo.Settings;
 import io.codeka.gaia.test.MongoContainer;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.autoconfigure.data.mongo.DataMongoTest;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.test.annotation.DirtiesContext;
diff --git a/src/test/java/io/codeka/gaia/repository/SettingsRepositoryTest.java b/src/test/java/io/codeka/gaia/settings/repository/SettingsRepositoryTest.java
similarity index 95%
rename from src/test/java/io/codeka/gaia/repository/SettingsRepositoryTest.java
rename to src/test/java/io/codeka/gaia/settings/repository/SettingsRepositoryTest.java
index d73e1bc1c..1b67d1562 100644
--- a/src/test/java/io/codeka/gaia/repository/SettingsRepositoryTest.java
+++ b/src/test/java/io/codeka/gaia/settings/repository/SettingsRepositoryTest.java
@@ -1,6 +1,6 @@
-package io.codeka.gaia.repository;
+package io.codeka.gaia.settings.repository;
 
-import io.codeka.gaia.bo.Settings;
+import io.codeka.gaia.settings.bo.Settings;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;