diff --git a/src/main/java/fil/sr2/flopbox/FTPResource.java b/src/main/java/fil/sr2/flopbox/FTPResource.java
index 480ac5fb0e10f66e6b1f8630da3ae9e02e17022e..2d857c3a006c0d08f61f1818cea5b1c44d208afe 100644
--- a/src/main/java/fil/sr2/flopbox/FTPResource.java
+++ b/src/main/java/fil/sr2/flopbox/FTPResource.java
@@ -10,6 +10,8 @@ import java.util.Map;
 import java.util.HashMap;
 import java.util.ArrayList;
 
+import fil.sr2.flopbox.utils.*;
+
 @Path("/ftps")
 public class FTPResource {
 
@@ -54,6 +56,7 @@ public class FTPResource {
             @PathParam("path") String searchTerm,
             @HeaderParam("X-FTP-User") String user,
             @HeaderParam("X-FTP-Pass") String pass) {
+
         System.out.println("searchFiles()");
         List<FTPServerConfig> servers = FTPServerRepository.getInstance().getAllServers();
         Map<String, List<String>> results = new HashMap<>();
diff --git a/src/main/java/fil/sr2/flopbox/FTPServerRepository.java b/src/main/java/fil/sr2/flopbox/FTPServerRepository.java
index afe3c0654565d4768129390182904b7b074820bd..73cd3b8351b9675902d6337c062834c4761e5d7d 100644
--- a/src/main/java/fil/sr2/flopbox/FTPServerRepository.java
+++ b/src/main/java/fil/sr2/flopbox/FTPServerRepository.java
@@ -2,6 +2,8 @@ package fil.sr2.flopbox;
 
 import java.util.*;
 
+import fil.sr2.flopbox.utils.*;
+
 public class FTPServerRepository {
     private static FTPServerRepository instance = new FTPServerRepository();
     private Map<String, FTPServerConfig> serverMap = new HashMap<>();
diff --git a/src/main/java/fil/sr2/flopbox/FTPService.java b/src/main/java/fil/sr2/flopbox/FTPService.java
index fa337b72c49e4042974891dc925a81cab87a2715..82e6cf0c9a4994b548b1ef7495b9f2848c7fc372 100644
--- a/src/main/java/fil/sr2/flopbox/FTPService.java
+++ b/src/main/java/fil/sr2/flopbox/FTPService.java
@@ -15,6 +15,8 @@ import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
 import java.io.ByteArrayInputStream;
 
+import fil.sr2.flopbox.utils.*;
+
 public class FTPService {
 
     public FtpNode getResourceTree(String alias, String path, String user, String pass)
diff --git a/src/main/java/fil/sr2/flopbox/AuthFilter.java b/src/main/java/fil/sr2/flopbox/utils/AuthFilter.java
similarity index 98%
rename from src/main/java/fil/sr2/flopbox/AuthFilter.java
rename to src/main/java/fil/sr2/flopbox/utils/AuthFilter.java
index 9582c958cc6b6deb339408edc2660f9c11d5409b..2d28ee5b1bc317528d6cbe6e8da69f9a8d5c5781 100644
--- a/src/main/java/fil/sr2/flopbox/AuthFilter.java
+++ b/src/main/java/fil/sr2/flopbox/utils/AuthFilter.java
@@ -1,4 +1,4 @@
-package fil.sr2.flopbox;
+package fil.sr2.flopbox.utils;
 
 import java.io.IOException;
 import java.util.HashMap;
diff --git a/src/main/java/fil/sr2/flopbox/FTPClientFactory.java b/src/main/java/fil/sr2/flopbox/utils/FTPClientFactory.java
similarity index 89%
rename from src/main/java/fil/sr2/flopbox/FTPClientFactory.java
rename to src/main/java/fil/sr2/flopbox/utils/FTPClientFactory.java
index f9c0b92d52c7e9e6d36a85243a78f8977e880ead..232fbbff524ad5e083ed3835bf3f55501ab446c8 100644
--- a/src/main/java/fil/sr2/flopbox/FTPClientFactory.java
+++ b/src/main/java/fil/sr2/flopbox/utils/FTPClientFactory.java
@@ -1,8 +1,10 @@
-package fil.sr2.flopbox;
+package fil.sr2.flopbox.utils;
 
 import org.apache.commons.net.ftp.FTPClient;
 import java.io.IOException;
 
+import fil.sr2.flopbox.FTPServerRepository;
+
 public class FTPClientFactory {
 
     public static FTPClient createClient(String alias) throws FTPException {
diff --git a/src/main/java/fil/sr2/flopbox/FTPException.java b/src/main/java/fil/sr2/flopbox/utils/FTPException.java
similarity index 84%
rename from src/main/java/fil/sr2/flopbox/FTPException.java
rename to src/main/java/fil/sr2/flopbox/utils/FTPException.java
index 42e6f38032cbf6667c8bde4a01e81edfae669e7b..de05f079e78d31c6a3d563dd3574550d28d0b7bb 100644
--- a/src/main/java/fil/sr2/flopbox/FTPException.java
+++ b/src/main/java/fil/sr2/flopbox/utils/FTPException.java
@@ -1,4 +1,4 @@
-package fil.sr2.flopbox;
+package fil.sr2.flopbox.utils;
 
 public class FTPException extends Exception {
     private final int status;
diff --git a/src/main/java/fil/sr2/flopbox/FTPServerConfig.java b/src/main/java/fil/sr2/flopbox/utils/FTPServerConfig.java
similarity index 95%
rename from src/main/java/fil/sr2/flopbox/FTPServerConfig.java
rename to src/main/java/fil/sr2/flopbox/utils/FTPServerConfig.java
index 5a1ea89e15748bd8884289d800d7fa0d01219f30..7e95f471d0387b052cdb3c2bdab2ea05e07b37b1 100644
--- a/src/main/java/fil/sr2/flopbox/FTPServerConfig.java
+++ b/src/main/java/fil/sr2/flopbox/utils/FTPServerConfig.java
@@ -1,4 +1,4 @@
-package fil.sr2.flopbox;
+package fil.sr2.flopbox.utils;
 
 public class FTPServerConfig {
     private String alias;