diff --git a/.classpath b/.classpath
index 85d371e..dd99747 100644
--- a/.classpath
+++ b/.classpath
@@ -9,5 +9,11 @@
+
+
+
+
+
+
diff --git a/.factorypath b/.factorypath
new file mode 100644
index 0000000..a22aefe
--- /dev/null
+++ b/.factorypath
@@ -0,0 +1,4 @@
+
+
+
+
diff --git a/.gitignore b/.gitignore
index b3043cf..c5a661b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
-.settings/
+.settings/org.eclipse.jdt.core.prefs
bin/
.project
config.txt
dist/
testApi/
+.apt_generated/*
diff --git a/.settings/org.eclipse.jdt.apt.core.prefs b/.settings/org.eclipse.jdt.apt.core.prefs
new file mode 100644
index 0000000..4dfc072
--- /dev/null
+++ b/.settings/org.eclipse.jdt.apt.core.prefs
@@ -0,0 +1,6 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.apt.aptEnabled=true
+org.eclipse.jdt.apt.genSrcDir=.apt_generated
+org.eclipse.jdt.apt.genTestSrcDir=.apt_generated_tests
+org.eclipse.jdt.apt.processorOptions/treasure.source=%sourcepath%
+org.eclipse.jdt.apt.reconcileEnabled=true
diff --git a/Treasure.jar b/Treasure.jar
new file mode 100644
index 0000000..594c3ee
Binary files /dev/null and b/Treasure.jar differ
diff --git a/src/be/jeffcheasey88/peeratcode/Main.java b/src/be/jeffcheasey88/peeratcode/Main.java
index 9afabfb..dd5ed3a 100644
--- a/src/be/jeffcheasey88/peeratcode/Main.java
+++ b/src/be/jeffcheasey88/peeratcode/Main.java
@@ -11,6 +11,14 @@ import javax.net.ssl.SSLServerSocketFactory;
import org.jose4j.jwk.RsaJsonWebKey;
import org.jose4j.jwk.RsaJwkGenerator;
+import be.jeffcheasey88.peeratcode.framework.Client;
+import be.jeffcheasey88.peeratcode.framework.HttpReader;
+import be.jeffcheasey88.peeratcode.framework.HttpUtil;
+import be.jeffcheasey88.peeratcode.framework.HttpWriter;
+import be.jeffcheasey88.peeratcode.framework.Response;
+import be.jeffcheasey88.peeratcode.framework.Route;
+import be.jeffcheasey88.peeratcode.framework.Router;
+import be.jeffcheasey88.peeratcode.framework.User;
import be.jeffcheasey88.peeratcode.repository.DatabaseRepository;
import be.jeffcheasey88.peeratcode.routes.BadgeDetails;
import be.jeffcheasey88.peeratcode.routes.ChapterElement;
@@ -24,14 +32,6 @@ import be.jeffcheasey88.peeratcode.routes.Register;
import be.jeffcheasey88.peeratcode.routes.Result;
import be.jeffcheasey88.peeratcode.routes.groups.CreateGroup;
import be.jeffcheasey88.peeratcode.routes.groups.GroupList;
-import be.jeffcheasey88.peeratcode.webserver.Client;
-import be.jeffcheasey88.peeratcode.webserver.HttpReader;
-import be.jeffcheasey88.peeratcode.webserver.HttpUtil;
-import be.jeffcheasey88.peeratcode.webserver.HttpWriter;
-import be.jeffcheasey88.peeratcode.webserver.Response;
-import be.jeffcheasey88.peeratcode.webserver.Route;
-import be.jeffcheasey88.peeratcode.webserver.Router;
-import be.jeffcheasey88.peeratcode.webserver.User;
public class Main {
public static void main(String[] args) throws Exception {
diff --git a/src/be/jeffcheasey88/peeratcode/webserver/Client.java b/src/be/jeffcheasey88/peeratcode/framework/Client.java
similarity index 97%
rename from src/be/jeffcheasey88/peeratcode/webserver/Client.java
rename to src/be/jeffcheasey88/peeratcode/framework/Client.java
index 9f68d14..7d1b9b6 100644
--- a/src/be/jeffcheasey88/peeratcode/webserver/Client.java
+++ b/src/be/jeffcheasey88/peeratcode/framework/Client.java
@@ -1,4 +1,4 @@
-package be.jeffcheasey88.peeratcode.webserver;
+package be.jeffcheasey88.peeratcode.framework;
import java.net.Socket;
import java.util.Arrays;
diff --git a/src/be/jeffcheasey88/peeratcode/webserver/HttpReader.java b/src/be/jeffcheasey88/peeratcode/framework/HttpReader.java
similarity index 95%
rename from src/be/jeffcheasey88/peeratcode/webserver/HttpReader.java
rename to src/be/jeffcheasey88/peeratcode/framework/HttpReader.java
index 6fe32cb..53b18c3 100644
--- a/src/be/jeffcheasey88/peeratcode/webserver/HttpReader.java
+++ b/src/be/jeffcheasey88/peeratcode/framework/HttpReader.java
@@ -1,4 +1,4 @@
-package be.jeffcheasey88.peeratcode.webserver;
+package be.jeffcheasey88.peeratcode.framework;
import java.io.BufferedReader;
import java.io.IOException;
diff --git a/src/be/jeffcheasey88/peeratcode/webserver/HttpUtil.java b/src/be/jeffcheasey88/peeratcode/framework/HttpUtil.java
similarity index 99%
rename from src/be/jeffcheasey88/peeratcode/webserver/HttpUtil.java
rename to src/be/jeffcheasey88/peeratcode/framework/HttpUtil.java
index 416ea78..3740bf3 100644
--- a/src/be/jeffcheasey88/peeratcode/webserver/HttpUtil.java
+++ b/src/be/jeffcheasey88/peeratcode/framework/HttpUtil.java
@@ -1,4 +1,4 @@
-package be.jeffcheasey88.peeratcode.webserver;
+package be.jeffcheasey88.peeratcode.framework;
import java.security.MessageDigest;
import java.util.ArrayList;
diff --git a/src/be/jeffcheasey88/peeratcode/webserver/HttpWriter.java b/src/be/jeffcheasey88/peeratcode/framework/HttpWriter.java
similarity index 94%
rename from src/be/jeffcheasey88/peeratcode/webserver/HttpWriter.java
rename to src/be/jeffcheasey88/peeratcode/framework/HttpWriter.java
index 20fa494..614f8fb 100644
--- a/src/be/jeffcheasey88/peeratcode/webserver/HttpWriter.java
+++ b/src/be/jeffcheasey88/peeratcode/framework/HttpWriter.java
@@ -1,4 +1,4 @@
-package be.jeffcheasey88.peeratcode.webserver;
+package be.jeffcheasey88.peeratcode.framework;
import java.io.BufferedWriter;
import java.io.IOException;
diff --git a/src/be/jeffcheasey88/peeratcode/webserver/Response.java b/src/be/jeffcheasey88/peeratcode/framework/Response.java
similarity index 76%
rename from src/be/jeffcheasey88/peeratcode/webserver/Response.java
rename to src/be/jeffcheasey88/peeratcode/framework/Response.java
index 2c51825..033a6c1 100644
--- a/src/be/jeffcheasey88/peeratcode/webserver/Response.java
+++ b/src/be/jeffcheasey88/peeratcode/framework/Response.java
@@ -1,4 +1,4 @@
-package be.jeffcheasey88.peeratcode.webserver;
+package be.jeffcheasey88.peeratcode.framework;
import java.util.regex.Matcher;
diff --git a/src/be/jeffcheasey88/peeratcode/webserver/Route.java b/src/be/jeffcheasey88/peeratcode/framework/Route.java
similarity index 88%
rename from src/be/jeffcheasey88/peeratcode/webserver/Route.java
rename to src/be/jeffcheasey88/peeratcode/framework/Route.java
index 71f3834..487eaaf 100644
--- a/src/be/jeffcheasey88/peeratcode/webserver/Route.java
+++ b/src/be/jeffcheasey88/peeratcode/framework/Route.java
@@ -1,4 +1,4 @@
-package be.jeffcheasey88.peeratcode.webserver;
+package be.jeffcheasey88.peeratcode.framework;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
diff --git a/src/be/jeffcheasey88/peeratcode/webserver/Router.java b/src/be/jeffcheasey88/peeratcode/framework/Router.java
similarity index 98%
rename from src/be/jeffcheasey88/peeratcode/webserver/Router.java
rename to src/be/jeffcheasey88/peeratcode/framework/Router.java
index e6bc073..c1295bd 100644
--- a/src/be/jeffcheasey88/peeratcode/webserver/Router.java
+++ b/src/be/jeffcheasey88/peeratcode/framework/Router.java
@@ -1,4 +1,4 @@
-package be.jeffcheasey88.peeratcode.webserver;
+package be.jeffcheasey88.peeratcode.framework;
import java.lang.reflect.Method;
import java.util.HashMap;
diff --git a/src/be/jeffcheasey88/peeratcode/webserver/User.java b/src/be/jeffcheasey88/peeratcode/framework/User.java
similarity index 82%
rename from src/be/jeffcheasey88/peeratcode/webserver/User.java
rename to src/be/jeffcheasey88/peeratcode/framework/User.java
index 949bc12..e8073ff 100644
--- a/src/be/jeffcheasey88/peeratcode/webserver/User.java
+++ b/src/be/jeffcheasey88/peeratcode/framework/User.java
@@ -1,4 +1,4 @@
-package be.jeffcheasey88.peeratcode.webserver;
+package be.jeffcheasey88.peeratcode.framework;
import org.jose4j.jwt.JwtClaims;
diff --git a/src/be/jeffcheasey88/peeratcode/model/Badge.java b/src/be/jeffcheasey88/peeratcode/model/Badge.java
index 48f54f6..84af7c3 100644
--- a/src/be/jeffcheasey88/peeratcode/model/Badge.java
+++ b/src/be/jeffcheasey88/peeratcode/model/Badge.java
@@ -1,6 +1,10 @@
package be.jeffcheasey88.peeratcode.model;
+import be.jeffcheasey88.peeratcode.mapping.Treasure;
+
+@Treasure
public class Badge {
+
private String name;
private byte[] logo;
private int level;
@@ -11,7 +15,7 @@ public class Badge {
this.level = level;
}
- public String getName() {
+ public String getName(){
return name;
}
diff --git a/src/be/jeffcheasey88/peeratcode/routes/BadgeDetails.java b/src/be/jeffcheasey88/peeratcode/routes/BadgeDetails.java
index 89c3302..bd55db4 100644
--- a/src/be/jeffcheasey88/peeratcode/routes/BadgeDetails.java
+++ b/src/be/jeffcheasey88/peeratcode/routes/BadgeDetails.java
@@ -5,14 +5,14 @@ import java.util.regex.Matcher;
import org.json.simple.JSONObject;
+import be.jeffcheasey88.peeratcode.framework.HttpReader;
+import be.jeffcheasey88.peeratcode.framework.HttpUtil;
+import be.jeffcheasey88.peeratcode.framework.HttpWriter;
+import be.jeffcheasey88.peeratcode.framework.Response;
+import be.jeffcheasey88.peeratcode.framework.Route;
+import be.jeffcheasey88.peeratcode.framework.User;
import be.jeffcheasey88.peeratcode.model.Badge;
import be.jeffcheasey88.peeratcode.repository.DatabaseRepository;
-import be.jeffcheasey88.peeratcode.webserver.HttpReader;
-import be.jeffcheasey88.peeratcode.webserver.HttpUtil;
-import be.jeffcheasey88.peeratcode.webserver.HttpWriter;
-import be.jeffcheasey88.peeratcode.webserver.Response;
-import be.jeffcheasey88.peeratcode.webserver.Route;
-import be.jeffcheasey88.peeratcode.webserver.User;
public class BadgeDetails implements Response {
diff --git a/src/be/jeffcheasey88/peeratcode/routes/ChapterElement.java b/src/be/jeffcheasey88/peeratcode/routes/ChapterElement.java
index 2bd05a0..803ecad 100644
--- a/src/be/jeffcheasey88/peeratcode/routes/ChapterElement.java
+++ b/src/be/jeffcheasey88/peeratcode/routes/ChapterElement.java
@@ -5,15 +5,15 @@ import java.util.regex.Matcher;
import org.json.simple.JSONArray;
import org.json.simple.JSONObject;
+import be.jeffcheasey88.peeratcode.framework.HttpReader;
+import be.jeffcheasey88.peeratcode.framework.HttpUtil;
+import be.jeffcheasey88.peeratcode.framework.HttpWriter;
+import be.jeffcheasey88.peeratcode.framework.Response;
+import be.jeffcheasey88.peeratcode.framework.Route;
+import be.jeffcheasey88.peeratcode.framework.User;
import be.jeffcheasey88.peeratcode.model.Chapter;
import be.jeffcheasey88.peeratcode.model.Puzzle;
import be.jeffcheasey88.peeratcode.repository.DatabaseRepository;
-import be.jeffcheasey88.peeratcode.webserver.HttpReader;
-import be.jeffcheasey88.peeratcode.webserver.HttpUtil;
-import be.jeffcheasey88.peeratcode.webserver.HttpWriter;
-import be.jeffcheasey88.peeratcode.webserver.Response;
-import be.jeffcheasey88.peeratcode.webserver.Route;
-import be.jeffcheasey88.peeratcode.webserver.User;
public class ChapterElement implements Response {
diff --git a/src/be/jeffcheasey88/peeratcode/routes/ChapterList.java b/src/be/jeffcheasey88/peeratcode/routes/ChapterList.java
index 63f514b..6982242 100644
--- a/src/be/jeffcheasey88/peeratcode/routes/ChapterList.java
+++ b/src/be/jeffcheasey88/peeratcode/routes/ChapterList.java
@@ -6,14 +6,14 @@ import java.util.regex.Matcher;
import org.json.simple.JSONArray;
import org.json.simple.JSONObject;
+import be.jeffcheasey88.peeratcode.framework.HttpReader;
+import be.jeffcheasey88.peeratcode.framework.HttpUtil;
+import be.jeffcheasey88.peeratcode.framework.HttpWriter;
+import be.jeffcheasey88.peeratcode.framework.Response;
+import be.jeffcheasey88.peeratcode.framework.Route;
+import be.jeffcheasey88.peeratcode.framework.User;
import be.jeffcheasey88.peeratcode.model.Chapter;
import be.jeffcheasey88.peeratcode.repository.DatabaseRepository;
-import be.jeffcheasey88.peeratcode.webserver.HttpReader;
-import be.jeffcheasey88.peeratcode.webserver.HttpUtil;
-import be.jeffcheasey88.peeratcode.webserver.HttpWriter;
-import be.jeffcheasey88.peeratcode.webserver.Response;
-import be.jeffcheasey88.peeratcode.webserver.Route;
-import be.jeffcheasey88.peeratcode.webserver.User;
public class ChapterList implements Response {
diff --git a/src/be/jeffcheasey88/peeratcode/routes/Leaderboard.java b/src/be/jeffcheasey88/peeratcode/routes/Leaderboard.java
index 9b29237..4bd0958 100644
--- a/src/be/jeffcheasey88/peeratcode/routes/Leaderboard.java
+++ b/src/be/jeffcheasey88/peeratcode/routes/Leaderboard.java
@@ -8,16 +8,16 @@ import java.util.regex.Matcher;
import org.json.simple.JSONArray;
import org.json.simple.JSONObject;
+import be.jeffcheasey88.peeratcode.framework.HttpReader;
+import be.jeffcheasey88.peeratcode.framework.HttpUtil;
+import be.jeffcheasey88.peeratcode.framework.HttpWriter;
+import be.jeffcheasey88.peeratcode.framework.Response;
+import be.jeffcheasey88.peeratcode.framework.Route;
+import be.jeffcheasey88.peeratcode.framework.User;
import be.jeffcheasey88.peeratcode.model.Chapter;
import be.jeffcheasey88.peeratcode.model.Group;
import be.jeffcheasey88.peeratcode.model.Player;
import be.jeffcheasey88.peeratcode.repository.DatabaseRepository;
-import be.jeffcheasey88.peeratcode.webserver.HttpReader;
-import be.jeffcheasey88.peeratcode.webserver.HttpUtil;
-import be.jeffcheasey88.peeratcode.webserver.HttpWriter;
-import be.jeffcheasey88.peeratcode.webserver.Response;
-import be.jeffcheasey88.peeratcode.webserver.Route;
-import be.jeffcheasey88.peeratcode.webserver.User;
public class Leaderboard implements Response {
diff --git a/src/be/jeffcheasey88/peeratcode/routes/Login.java b/src/be/jeffcheasey88/peeratcode/routes/Login.java
index 877b73d..cae3a74 100644
--- a/src/be/jeffcheasey88/peeratcode/routes/Login.java
+++ b/src/be/jeffcheasey88/peeratcode/routes/Login.java
@@ -4,14 +4,14 @@ import java.util.regex.Matcher;
import org.json.simple.JSONObject;
+import be.jeffcheasey88.peeratcode.framework.HttpReader;
+import be.jeffcheasey88.peeratcode.framework.HttpUtil;
+import be.jeffcheasey88.peeratcode.framework.HttpWriter;
+import be.jeffcheasey88.peeratcode.framework.Response;
+import be.jeffcheasey88.peeratcode.framework.Route;
+import be.jeffcheasey88.peeratcode.framework.Router;
+import be.jeffcheasey88.peeratcode.framework.User;
import be.jeffcheasey88.peeratcode.repository.DatabaseRepository;
-import be.jeffcheasey88.peeratcode.webserver.HttpReader;
-import be.jeffcheasey88.peeratcode.webserver.HttpUtil;
-import be.jeffcheasey88.peeratcode.webserver.HttpWriter;
-import be.jeffcheasey88.peeratcode.webserver.Response;
-import be.jeffcheasey88.peeratcode.webserver.Route;
-import be.jeffcheasey88.peeratcode.webserver.Router;
-import be.jeffcheasey88.peeratcode.webserver.User;
public class Login implements Response {
diff --git a/src/be/jeffcheasey88/peeratcode/routes/PlayerDetails.java b/src/be/jeffcheasey88/peeratcode/routes/PlayerDetails.java
index d7e2b11..48663a0 100644
--- a/src/be/jeffcheasey88/peeratcode/routes/PlayerDetails.java
+++ b/src/be/jeffcheasey88/peeratcode/routes/PlayerDetails.java
@@ -5,14 +5,14 @@ import java.util.regex.Matcher;
import org.json.simple.JSONObject;
+import be.jeffcheasey88.peeratcode.framework.HttpReader;
+import be.jeffcheasey88.peeratcode.framework.HttpUtil;
+import be.jeffcheasey88.peeratcode.framework.HttpWriter;
+import be.jeffcheasey88.peeratcode.framework.Response;
+import be.jeffcheasey88.peeratcode.framework.Route;
+import be.jeffcheasey88.peeratcode.framework.User;
import be.jeffcheasey88.peeratcode.model.Player;
import be.jeffcheasey88.peeratcode.repository.DatabaseRepository;
-import be.jeffcheasey88.peeratcode.webserver.HttpReader;
-import be.jeffcheasey88.peeratcode.webserver.HttpUtil;
-import be.jeffcheasey88.peeratcode.webserver.HttpWriter;
-import be.jeffcheasey88.peeratcode.webserver.Response;
-import be.jeffcheasey88.peeratcode.webserver.Route;
-import be.jeffcheasey88.peeratcode.webserver.User;
public class PlayerDetails implements Response {
diff --git a/src/be/jeffcheasey88/peeratcode/routes/PuzzleElement.java b/src/be/jeffcheasey88/peeratcode/routes/PuzzleElement.java
index ef642b7..f26e2a7 100644
--- a/src/be/jeffcheasey88/peeratcode/routes/PuzzleElement.java
+++ b/src/be/jeffcheasey88/peeratcode/routes/PuzzleElement.java
@@ -4,14 +4,14 @@ import java.util.regex.Matcher;
import org.json.simple.JSONObject;
+import be.jeffcheasey88.peeratcode.framework.HttpReader;
+import be.jeffcheasey88.peeratcode.framework.HttpUtil;
+import be.jeffcheasey88.peeratcode.framework.HttpWriter;
+import be.jeffcheasey88.peeratcode.framework.Response;
+import be.jeffcheasey88.peeratcode.framework.Route;
+import be.jeffcheasey88.peeratcode.framework.User;
import be.jeffcheasey88.peeratcode.model.Puzzle;
import be.jeffcheasey88.peeratcode.repository.DatabaseRepository;
-import be.jeffcheasey88.peeratcode.webserver.HttpReader;
-import be.jeffcheasey88.peeratcode.webserver.HttpUtil;
-import be.jeffcheasey88.peeratcode.webserver.HttpWriter;
-import be.jeffcheasey88.peeratcode.webserver.Response;
-import be.jeffcheasey88.peeratcode.webserver.Route;
-import be.jeffcheasey88.peeratcode.webserver.User;
public class PuzzleElement implements Response {
diff --git a/src/be/jeffcheasey88/peeratcode/routes/PuzzleResponse.java b/src/be/jeffcheasey88/peeratcode/routes/PuzzleResponse.java
index 2edde70..36ed097 100644
--- a/src/be/jeffcheasey88/peeratcode/routes/PuzzleResponse.java
+++ b/src/be/jeffcheasey88/peeratcode/routes/PuzzleResponse.java
@@ -10,16 +10,16 @@ import java.util.regex.Matcher;
import org.json.simple.JSONObject;
+import be.jeffcheasey88.peeratcode.framework.HttpReader;
+import be.jeffcheasey88.peeratcode.framework.HttpUtil;
+import be.jeffcheasey88.peeratcode.framework.HttpWriter;
+import be.jeffcheasey88.peeratcode.framework.Response;
+import be.jeffcheasey88.peeratcode.framework.Route;
+import be.jeffcheasey88.peeratcode.framework.User;
import be.jeffcheasey88.peeratcode.model.Completion;
import be.jeffcheasey88.peeratcode.model.Player;
import be.jeffcheasey88.peeratcode.model.Puzzle;
import be.jeffcheasey88.peeratcode.repository.DatabaseRepository;
-import be.jeffcheasey88.peeratcode.webserver.HttpReader;
-import be.jeffcheasey88.peeratcode.webserver.HttpUtil;
-import be.jeffcheasey88.peeratcode.webserver.HttpWriter;
-import be.jeffcheasey88.peeratcode.webserver.Response;
-import be.jeffcheasey88.peeratcode.webserver.Route;
-import be.jeffcheasey88.peeratcode.webserver.User;
public class PuzzleResponse implements Response {
private final DatabaseRepository databaseRepo;
diff --git a/src/be/jeffcheasey88/peeratcode/routes/Register.java b/src/be/jeffcheasey88/peeratcode/routes/Register.java
index a3e7b5f..7eb20a4 100644
--- a/src/be/jeffcheasey88/peeratcode/routes/Register.java
+++ b/src/be/jeffcheasey88/peeratcode/routes/Register.java
@@ -7,14 +7,14 @@ import java.util.regex.Matcher;
import org.json.simple.JSONObject;
+import be.jeffcheasey88.peeratcode.framework.HttpReader;
+import be.jeffcheasey88.peeratcode.framework.HttpUtil;
+import be.jeffcheasey88.peeratcode.framework.HttpWriter;
+import be.jeffcheasey88.peeratcode.framework.Response;
+import be.jeffcheasey88.peeratcode.framework.Route;
+import be.jeffcheasey88.peeratcode.framework.Router;
+import be.jeffcheasey88.peeratcode.framework.User;
import be.jeffcheasey88.peeratcode.repository.DatabaseRepository;
-import be.jeffcheasey88.peeratcode.webserver.HttpReader;
-import be.jeffcheasey88.peeratcode.webserver.HttpUtil;
-import be.jeffcheasey88.peeratcode.webserver.HttpWriter;
-import be.jeffcheasey88.peeratcode.webserver.Response;
-import be.jeffcheasey88.peeratcode.webserver.Route;
-import be.jeffcheasey88.peeratcode.webserver.Router;
-import be.jeffcheasey88.peeratcode.webserver.User;
public class Register implements Response {
diff --git a/src/be/jeffcheasey88/peeratcode/routes/Result.java b/src/be/jeffcheasey88/peeratcode/routes/Result.java
index 6f77df0..5dd8cc4 100644
--- a/src/be/jeffcheasey88/peeratcode/routes/Result.java
+++ b/src/be/jeffcheasey88/peeratcode/routes/Result.java
@@ -2,13 +2,13 @@ package be.jeffcheasey88.peeratcode.routes;
import java.util.regex.Matcher;
+import be.jeffcheasey88.peeratcode.framework.HttpReader;
+import be.jeffcheasey88.peeratcode.framework.HttpUtil;
+import be.jeffcheasey88.peeratcode.framework.HttpWriter;
+import be.jeffcheasey88.peeratcode.framework.Response;
+import be.jeffcheasey88.peeratcode.framework.Route;
+import be.jeffcheasey88.peeratcode.framework.User;
import be.jeffcheasey88.peeratcode.repository.DatabaseRepository;
-import be.jeffcheasey88.peeratcode.webserver.HttpReader;
-import be.jeffcheasey88.peeratcode.webserver.HttpUtil;
-import be.jeffcheasey88.peeratcode.webserver.HttpWriter;
-import be.jeffcheasey88.peeratcode.webserver.Response;
-import be.jeffcheasey88.peeratcode.webserver.Route;
-import be.jeffcheasey88.peeratcode.webserver.User;
public class Result implements Response {
diff --git a/src/be/jeffcheasey88/peeratcode/routes/groups/CreateGroup.java b/src/be/jeffcheasey88/peeratcode/routes/groups/CreateGroup.java
index d550223..c630cbb 100644
--- a/src/be/jeffcheasey88/peeratcode/routes/groups/CreateGroup.java
+++ b/src/be/jeffcheasey88/peeratcode/routes/groups/CreateGroup.java
@@ -4,14 +4,14 @@ import java.util.regex.Matcher;
import org.json.simple.JSONObject;
+import be.jeffcheasey88.peeratcode.framework.HttpReader;
+import be.jeffcheasey88.peeratcode.framework.HttpUtil;
+import be.jeffcheasey88.peeratcode.framework.HttpWriter;
+import be.jeffcheasey88.peeratcode.framework.Response;
+import be.jeffcheasey88.peeratcode.framework.Route;
+import be.jeffcheasey88.peeratcode.framework.User;
import be.jeffcheasey88.peeratcode.model.Group;
import be.jeffcheasey88.peeratcode.repository.DatabaseRepository;
-import be.jeffcheasey88.peeratcode.webserver.HttpReader;
-import be.jeffcheasey88.peeratcode.webserver.HttpUtil;
-import be.jeffcheasey88.peeratcode.webserver.HttpWriter;
-import be.jeffcheasey88.peeratcode.webserver.Response;
-import be.jeffcheasey88.peeratcode.webserver.Route;
-import be.jeffcheasey88.peeratcode.webserver.User;
public class CreateGroup implements Response {
diff --git a/src/be/jeffcheasey88/peeratcode/routes/groups/GroupList.java b/src/be/jeffcheasey88/peeratcode/routes/groups/GroupList.java
index 8458497..5bf64f8 100644
--- a/src/be/jeffcheasey88/peeratcode/routes/groups/GroupList.java
+++ b/src/be/jeffcheasey88/peeratcode/routes/groups/GroupList.java
@@ -4,14 +4,14 @@ import java.util.regex.Matcher;
import org.json.simple.JSONArray;
+import be.jeffcheasey88.peeratcode.framework.HttpReader;
+import be.jeffcheasey88.peeratcode.framework.HttpUtil;
+import be.jeffcheasey88.peeratcode.framework.HttpWriter;
+import be.jeffcheasey88.peeratcode.framework.Response;
+import be.jeffcheasey88.peeratcode.framework.Route;
+import be.jeffcheasey88.peeratcode.framework.User;
import be.jeffcheasey88.peeratcode.model.Group;
import be.jeffcheasey88.peeratcode.repository.DatabaseRepository;
-import be.jeffcheasey88.peeratcode.webserver.HttpReader;
-import be.jeffcheasey88.peeratcode.webserver.HttpUtil;
-import be.jeffcheasey88.peeratcode.webserver.HttpWriter;
-import be.jeffcheasey88.peeratcode.webserver.Response;
-import be.jeffcheasey88.peeratcode.webserver.Route;
-import be.jeffcheasey88.peeratcode.webserver.User;
public class GroupList implements Response {
diff --git a/test/be/jeffcheasey88/peeratcode/webclient/WebClient.java b/test/be/jeffcheasey88/peeratcode/webclient/WebClient.java
index b489d97..b85dc0a 100644
--- a/test/be/jeffcheasey88/peeratcode/webclient/WebClient.java
+++ b/test/be/jeffcheasey88/peeratcode/webclient/WebClient.java
@@ -10,8 +10,8 @@ import java.util.regex.Pattern;
import org.json.simple.JSONObject;
-import be.jeffcheasey88.peeratcode.webserver.HttpReader;
-import be.jeffcheasey88.peeratcode.webserver.HttpWriter;
+import be.jeffcheasey88.peeratcode.framework.HttpReader;
+import be.jeffcheasey88.peeratcode.framework.HttpWriter;
public class WebClient {