diff --git a/DevConsole/Program.cs b/DevConsole/Program.cs
index bdb0e3f..a02a43e 100644
--- a/DevConsole/Program.cs
+++ b/DevConsole/Program.cs
@@ -11,7 +11,7 @@ namespace DevConsole
         {
             while (true)
             {
-                Console.WriteLine($"Connection State: {parser.GetConnectionState()}");
+                Console.WriteLine($"Connection State: {parser.ReportConnectionState()}");
                 CommandsMenu();
             }
         }
@@ -75,7 +75,7 @@ namespace DevConsole
 
         private static void OptionB()
         {
-            Console.WriteLine("Enter a Game ID (1043)");
+            Console.WriteLine("Enter a game ID:");
             string r = Console.ReadLine();
             Console.Write("\n");
 
@@ -84,7 +84,7 @@ namespace DevConsole
 
         private static void OptionC()
         {
-            Console.WriteLine("Enter a Game ID (1043)");
+            Console.WriteLine("Enter a game ID:");
             string r = Console.ReadLine();
             Console.Write("\n");
 
@@ -93,7 +93,7 @@ namespace DevConsole
 
         private static void OptionD()
         {
-            Console.WriteLine("Enter game to search");
+            Console.WriteLine("Enter game title to search:");
             string r = Console.ReadLine();
             Console.Write("\n");
 
@@ -101,7 +101,7 @@ namespace DevConsole
         }
         #endregion
 
-        private static void PrintGameEntries(List<GameEntry> gameEntries)
+        private static void PrintGameEntries(List<GameEntryModal> gameEntries)
         {
             foreach (var game in gameEntries)
             {
@@ -113,7 +113,7 @@ namespace DevConsole
             }
         }
 
-        private static void PrintDirectories(List<Directories> directoryEntries)
+        private static void PrintDirectories(List<DirectoriesModel> directoryEntries)
         {
             foreach (var directory in directoryEntries)
             {
diff --git a/GSMParser/Modals/Directories.cs b/GSMParser/DataModels/DirectoriesModel.cs
similarity index 92%
rename from GSMParser/Modals/Directories.cs
rename to GSMParser/DataModels/DirectoriesModel.cs
index 1b9504c..fb19f08 100644
--- a/GSMParser/Modals/Directories.cs
+++ b/GSMParser/DataModels/DirectoriesModel.cs
@@ -1,4 +1,4 @@
-public class Directories
+public class DirectoriesModel
 {
     public int id { get; set; }
     public int GameID { get; set; }
diff --git a/GSMParser/Modals/GameEntry.cs b/GSMParser/DataModels/GameEntryModal.cs
similarity index 89%
rename from GSMParser/Modals/GameEntry.cs
rename to GSMParser/DataModels/GameEntryModal.cs
index 2e3bf11..15f1bb1 100644
--- a/GSMParser/Modals/GameEntry.cs
+++ b/GSMParser/DataModels/GameEntryModal.cs
@@ -1,6 +1,6 @@
 using System.Data.Common;
 
-public class GameEntry
+public class GameEntryModal
 {
     public int id { get; set; }
     public string GameName { get; set; }
diff --git a/GSMParser/Main.cs b/GSMParser/Main.cs
index 153a2b5..2dee9e3 100644
--- a/GSMParser/Main.cs
+++ b/GSMParser/Main.cs
@@ -19,22 +19,28 @@ public class GSMParser
         DBConnection.Open();
     }
 
-    public void CloseCurrentConnection() { DBConnection.Close(); }
-
-    public string GetConnectionState() { return Convert.ToString(DBConnection.State); }
-
-    public List<GameEntry> QueryGameById(string id)
+    public void CloseCurrentConnection()
     {
-        return (List<GameEntry>)DBConnection.Query<GameEntry>(QueryBuilder.GameById(id), new DynamicParameters());
+        DBConnection.Close();
     }
 
-    public List<Directories> QueryDirectoryById(string id)
+    public string ReportConnectionState()
     {
-        return (List<Directories>)DBConnection.Query<Directories>(QueryBuilder.DirectoryById(id), new DynamicParameters());
+        return Convert.ToString(DBConnection.State);
     }
 
-    public List<GameEntry> QueryGameByName(string name)
+    public List<GameEntryModal> QueryGameById(string id)
     {
-        return (List<GameEntry>) DBConnection.Query<GameEntry>(QueryBuilder.GameByName(name), new DynamicParameters());
+        return (List<GameEntryModal>)DBConnection.Query<GameEntryModal>(QueryBuilder.GameEntryByGameId(id), new DynamicParameters());
+    }
+
+    public List<DirectoriesModel> QueryDirectoryById(string id)
+    {
+        return (List<DirectoriesModel>)DBConnection.Query<DirectoriesModel>(QueryBuilder.DirectoryByGameId(id), new DynamicParameters());
+    }
+
+    public List<GameEntryModal> QueryGameByName(string name)
+    {
+        return (List<GameEntryModal>) DBConnection.Query<GameEntryModal>(QueryBuilder.GameEntryByName(name), new DynamicParameters());
     }
 }
diff --git a/GSMParser/QueryBuilder.cs b/GSMParser/QueryBuilder.cs
index e045d13..77e29f4 100644
--- a/GSMParser/QueryBuilder.cs
+++ b/GSMParser/QueryBuilder.cs
@@ -1,6 +1,6 @@
 public static class QueryBuilder
 {
-    public static string GameByName(string name)
+    public static string GameEntryByName(string name)
     {
         return $"SELECT \"GameName\",*" +
                $"FROM \"main\".\"GameEntry\"" +
@@ -8,7 +8,7 @@
                $"LIKE \"%{name}%\"";
     }
 
-    public static string GameById(string id)
+    public static string GameEntryByGameId(string id)
     {
         return $"SELECT \"GameName\",*" +
                $"FROM \"main\".\"GameEntry\"" +
@@ -16,7 +16,7 @@
                $"LIKE \"{id}\"";
     }
 
-    public static string DirectoryById(string id)
+    public static string DirectoryByGameId(string id)
     {
         return $"SELECT \"Path\",*" +
                $"FROM \"main\".\"Directories\"" +