Refactored project structure

src/main/java/net/jrtechs/www/App.java

@@ -1,12 +1,13 @@
 package net.jrtechs.www;
 
-import net.jrtechs.www.server.Server;
+import net.jrtechs.www.server.old.Server;
 
 /**
  * Launcher for the server
  *
  * @author Jeffery Russell 6-9-18
  */
+@Deprecated
 public class App 
 {
     public static void main( String[] args )

src/main/java/net/jrtechs/www/SteamAPI/APIConnection.java

@@ -1,7 +1,7 @@
 package net.jrtechs.www.SteamAPI;
 
-import net.jrtechs.www.server.Game;
-import net.jrtechs.www.server.Player;
+import net.jrtechs.www.model.Game;
+import net.jrtechs.www.model.Player;
 import net.jrtechs.www.utils.ConfigLoader;
 
 import net.jrtechs.www.utils.WebScraper;
@@ -9,12 +9,9 @@ import net.jrtechs.www.webCrawler.APIThrottler;
 import org.json.JSONArray;
 import org.json.JSONObject;
 
-import javax.json.JsonArray;
-import javax.json.JsonObject;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 import java.util.stream.IntStream;
 
 /**

src/main/java/net/jrtechs/www/graphDB/SteamGraph.java

@@ -1,8 +1,8 @@
 package net.jrtechs.www.graphDB;
 
 import net.jrtechs.www.SteamAPI.SteamConnectionException;
-import net.jrtechs.www.server.Game;
-import net.jrtechs.www.server.Player;
+import net.jrtechs.www.model.Game;
+import net.jrtechs.www.model.Player;
 import net.jrtechs.www.SteamAPI.APIConnection;
 
 import java.util.ArrayList;

src/main/java/net/jrtechs/www/server/Game.java → src/main/java/net/jrtechs/www/model/Game.java

@@ -1,9 +1,8 @@
-package net.jrtechs.www.server;
+package net.jrtechs.www.model;
 
 
 import org.json.JSONObject;
 
-import javax.json.JsonObject;
 import java.util.List;
 import java.util.Map;
 

src/main/java/net/jrtechs/www/server/Player.java → src/main/java/net/jrtechs/www/model/Player.java

@@ -1,4 +1,4 @@
-package net.jrtechs.www.server;
+package net.jrtechs.www.model;
 
 import java.util.ArrayList;
 import java.util.List;

src/main/java/net/jrtechs/www/server/Client.java → src/main/java/net/jrtechs/www/server/old/Client.java

@@ -1,6 +1,7 @@
-package net.jrtechs.www.server;
+package net.jrtechs.www.server.old;
 
 import net.jrtechs.www.graphDB.SteamGraph;
+import net.jrtechs.www.model.Player;
 import org.java_websocket.WebSocket;
 import org.json.JSONObject;
 

src/main/java/net/jrtechs/www/server/Server.java → src/main/java/net/jrtechs/www/server/old/Server.java

@@ -1,4 +1,4 @@
-package net.jrtechs.www.server;
+package net.jrtechs.www.server.old;
 
 import org.java_websocket.WebSocket;
 import org.java_websocket.handshake.ClientHandshake;

src/main/java/net/jrtechs/www/webCrawler/FileIO.java

@@ -1,6 +1,6 @@
 package net.jrtechs.www.webCrawler;
 
-import net.jrtechs.www.server.Player;
+import net.jrtechs.www.model.Player;
 import net.jrtechs.www.utils.FileReader;
 import net.jrtechs.www.utils.WrappedFileWriter;
 import org.json.JSONArray;

src/main/java/net/jrtechs/www/webCrawler/SteamWebCrawler.java

@@ -1,7 +1,7 @@
 package net.jrtechs.www.webCrawler;
 
 import net.jrtechs.www.SteamAPI.APIConnection;
-import net.jrtechs.www.server.Player;
+import net.jrtechs.www.model.Player;
 
 import java.util.*;