diff --git a/app/src/main/java/code/App.java b/app/src/main/java/code/App.java
index 3e9a369..8462006 100644
--- a/app/src/main/java/code/App.java
+++ b/app/src/main/java/code/App.java
@@ -8,10 +8,10 @@
 import code.client.View.*;
 import code.server.BaseServer;
 import code.server.AppServer;
-import code.server.MockServer;
 import code.client.Controllers.*;
 import javafx.scene.Scene;
 import code.server.IRecipeDb;
+import code.server.mocking.MockServer;
 
 import java.io.FileReader;
 import java.io.IOException;
diff --git a/app/src/main/java/code/server/ShareLinkMongoDb.java b/app/src/main/java/code/server/ShareLinkMongoDb.java
deleted file mode 100644
index 071e7c4..0000000
--- a/app/src/main/java/code/server/ShareLinkMongoDb.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package code.server;
-
-import java.util.List;
-
-import org.bson.Document;
-
-import com.google.gson.Gson;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-import com.mongodb.client.MongoCollection;
-
-public class ShareLinkMongoDb implements IShareLinkDb {
-    private MongoCollection<Document> shareLinkDocumentCollection;
-
-    public ShareLinkMongoDb(MongoCollection<Document> shareLinkDocumentCollection) {
-        this.shareLinkDocumentCollection = shareLinkDocumentCollection;
-    }
-
-    private ShareLink jsonToShareLink(Document shareLinkDocument) {
-        // Gson gson = new Gson();
-        // ShareLink shareLink = gson.fromJson(shareLinkDocument.toJson(), ShareLink.class);
-        // JsonObject jsonObj = JsonParser.parseString(shareLinkDocument.toJson().toString()).getAsJsonObject();
-        // String shareLinkId = jsonObj.getAsJsonObject("_id").get("$oid").getAsString();
-        // shareLink.setId(shareLinkId);
-        // return shareLink;
-        return null;
-    }
-
-    @Override
-    public List<String> getRecipeIds(String receiverId) {
-        // TODO Auto-generated method stub
-        throw new UnsupportedOperationException("Unimplemented method 'getRecipeIds'");
-    }
-
-    @Override
-    public List<String> getRecipeIds(String senderId, String receiverId) {
-        // TODO Auto-generated method stub
-        throw new UnsupportedOperationException("Unimplemented method 'getRecipeIds'");
-    }
-    
-}
diff --git a/app/src/main/java/code/server/MockChatGPTRequestHandler.java b/app/src/main/java/code/server/mocking/MockChatGPTRequestHandler.java
similarity index 95%
rename from app/src/main/java/code/server/MockChatGPTRequestHandler.java
rename to app/src/main/java/code/server/mocking/MockChatGPTRequestHandler.java
index edf2205..e37798b 100644
--- a/app/src/main/java/code/server/MockChatGPTRequestHandler.java
+++ b/app/src/main/java/code/server/mocking/MockChatGPTRequestHandler.java
@@ -1,9 +1,11 @@
-package code.server;
+package code.server.mocking;
 
 import java.io.IOException;
 import java.io.OutputStream;
 import com.sun.net.httpserver.*;
 
+import code.server.TextToRecipe;
+
 public class MockChatGPTRequestHandler extends TextToRecipe implements HttpHandler {
 
     private String sampleRecipe = """
diff --git a/app/src/main/java/code/server/MockDallERequestHandler.java b/app/src/main/java/code/server/mocking/MockDallERequestHandler.java
similarity index 95%
rename from app/src/main/java/code/server/MockDallERequestHandler.java
rename to app/src/main/java/code/server/mocking/MockDallERequestHandler.java
index b2d5d3a..a1ef361 100644
--- a/app/src/main/java/code/server/MockDallERequestHandler.java
+++ b/app/src/main/java/code/server/mocking/MockDallERequestHandler.java
@@ -1,6 +1,8 @@
-package code.server;
+package code.server.mocking;
 
 import code.client.Model.AppConfig;
+import code.server.RecipeToImage;
+
 import com.sun.net.httpserver.*;
 
 import java.io.*;
diff --git a/app/src/main/java/code/server/MockHttpConnection.java b/app/src/main/java/code/server/mocking/MockHttpConnection.java
similarity index 94%
rename from app/src/main/java/code/server/MockHttpConnection.java
rename to app/src/main/java/code/server/mocking/MockHttpConnection.java
index bea2bbc..b4e702a 100644
--- a/app/src/main/java/code/server/MockHttpConnection.java
+++ b/app/src/main/java/code/server/mocking/MockHttpConnection.java
@@ -1,9 +1,11 @@
-package code.server;
+package code.server.mocking;
 
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 
+import code.server.IHttpConnection;
+
 public class MockHttpConnection implements IHttpConnection {
     private int responseCode;
     private InputStream inputStream;
diff --git a/app/src/main/java/code/server/MockServer.java b/app/src/main/java/code/server/mocking/MockServer.java
similarity index 90%
rename from app/src/main/java/code/server/MockServer.java
rename to app/src/main/java/code/server/mocking/MockServer.java
index eeaeb08..beba0af 100644
--- a/app/src/main/java/code/server/MockServer.java
+++ b/app/src/main/java/code/server/mocking/MockServer.java
@@ -1,4 +1,4 @@
-package code.server;
+package code.server.mocking;
 
 import com.mongodb.client.MongoClient;
 import com.mongodb.client.MongoClients;
@@ -7,6 +7,13 @@
 import com.sun.net.httpserver.*;
 
 import code.client.Model.AppConfig;
+import code.server.AccountMongoDB;
+import code.server.AccountRequestHandler;
+import code.server.BaseServer;
+import code.server.IRecipeDb;
+import code.server.RecipeMongoDb;
+import code.server.RecipeRequestHandler;
+import code.server.ShareRequestHandler;
 
 import java.io.IOException;
 import java.net.InetSocketAddress;
diff --git a/app/src/main/java/code/server/MockWhisperRequestHandler.java b/app/src/main/java/code/server/mocking/MockWhisperRequestHandler.java
similarity index 91%
rename from app/src/main/java/code/server/MockWhisperRequestHandler.java
rename to app/src/main/java/code/server/mocking/MockWhisperRequestHandler.java
index a225dc8..f7953ce 100644
--- a/app/src/main/java/code/server/MockWhisperRequestHandler.java
+++ b/app/src/main/java/code/server/mocking/MockWhisperRequestHandler.java
@@ -1,6 +1,10 @@
-package code.server;
+package code.server.mocking;
 
 import com.sun.net.httpserver.*;
+
+import code.server.IHttpConnection;
+import code.server.VoiceToText;
+
 import java.io.IOException;
 import java.io.OutputStream;
 import java.net.URI;
diff --git a/app/src/test/java/code/RecipeToImageTest.java b/app/src/test/java/code/RecipeToImageTest.java
index 2cbf815..37bc452 100644
--- a/app/src/test/java/code/RecipeToImageTest.java
+++ b/app/src/test/java/code/RecipeToImageTest.java
@@ -3,8 +3,8 @@
 import org.junit.jupiter.api.Test;
 
 import code.server.BaseServer;
-import code.server.MockServer;
 import code.server.Recipe;
+import code.server.mocking.MockServer;
 import code.client.Model.AppConfig;
 import code.client.Model.Model;
 
diff --git a/app/src/test/java/code/RefreshTest.java b/app/src/test/java/code/RefreshTest.java
index ca78dbd..63ea44b 100644
--- a/app/src/test/java/code/RefreshTest.java
+++ b/app/src/test/java/code/RefreshTest.java
@@ -14,6 +14,7 @@
 import code.client.View.*;
 import code.client.Controllers.*;
 import code.server.*;
+import code.server.mocking.MockServer;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotEquals;
diff --git a/app/src/test/java/code/ServerConnectionTest.java b/app/src/test/java/code/ServerConnectionTest.java
index 490363c..41c856f 100644
--- a/app/src/test/java/code/ServerConnectionTest.java
+++ b/app/src/test/java/code/ServerConnectionTest.java
@@ -7,7 +7,7 @@
 import code.client.Model.AppConfig;
 import code.client.View.ServerConnection;
 import code.server.BaseServer;
-import code.server.MockServer;
+import code.server.mocking.MockServer;
 
 import java.io.IOException;
 import java.io.PrintStream;
diff --git a/app/src/test/java/code/TextToRecipeTest.java b/app/src/test/java/code/TextToRecipeTest.java
index 9d3567a..d8c665a 100644
--- a/app/src/test/java/code/TextToRecipeTest.java
+++ b/app/src/test/java/code/TextToRecipeTest.java
@@ -6,6 +6,7 @@
 import code.client.Model.AppConfig;
 import code.client.Model.Model;
 import code.server.*;
+import code.server.mocking.MockServer;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotEquals;
diff --git a/app/src/test/java/code/VoiceToTextTest.java b/app/src/test/java/code/VoiceToTextTest.java
index 420518d..dc958c0 100644
--- a/app/src/test/java/code/VoiceToTextTest.java
+++ b/app/src/test/java/code/VoiceToTextTest.java
@@ -9,8 +9,8 @@
 import code.client.Model.Model;
 import code.server.BaseServer;
 import code.server.IHttpConnection;
-import code.server.MockHttpConnection;
-import code.server.MockServer;
+import code.server.mocking.MockHttpConnection;
+import code.server.mocking.MockServer;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;