diff --git a/src/main/java/com/rohitawate/everest/Main.java b/src/main/java/com/rohitawate/everest/Main.java
index 889ad90..cbf93db 100644
--- a/src/main/java/com/rohitawate/everest/Main.java
+++ b/src/main/java/com/rohitawate/everest/Main.java
@@ -15,10 +15,10 @@
  */
 package com.rohitawate.everest;
 
-import com.rohitawate.everest.util.EverestUtilities;
-import com.rohitawate.everest.util.Services;
-import com.rohitawate.everest.util.settings.SettingsLoader;
-import com.rohitawate.everest.util.themes.ThemeManager;
+import com.rohitawate.everest.misc.EverestUtilities;
+import com.rohitawate.everest.misc.Services;
+import com.rohitawate.everest.misc.ThemeManager;
+import com.rohitawate.everest.settings.SettingsLoader;
 import javafx.application.Application;
 import javafx.fxml.FXMLLoader;
 import javafx.geometry.Rectangle2D;
diff --git a/src/main/java/com/rohitawate/everest/controllers/BodyTabController.java b/src/main/java/com/rohitawate/everest/controllers/BodyTabController.java
index 96eebaf..6a054d7 100644
--- a/src/main/java/com/rohitawate/everest/controllers/BodyTabController.java
+++ b/src/main/java/com/rohitawate/everest/controllers/BodyTabController.java
@@ -18,10 +18,10 @@ package com.rohitawate.everest.controllers;
 
 import com.rohitawate.everest.controllers.codearea.EverestCodeArea;
 import com.rohitawate.everest.controllers.codearea.EverestCodeArea.HighlightMode;
+import com.rohitawate.everest.misc.Services;
+import com.rohitawate.everest.misc.ThemeManager;
 import com.rohitawate.everest.models.DashboardState;
 import com.rohitawate.everest.models.requests.DataDispatchRequest;
-import com.rohitawate.everest.util.Services;
-import com.rohitawate.everest.util.themes.ThemeManager;
 import javafx.fxml.FXML;
 import javafx.fxml.FXMLLoader;
 import javafx.fxml.Initializable;
diff --git a/src/main/java/com/rohitawate/everest/controllers/DashboardController.java b/src/main/java/com/rohitawate/everest/controllers/DashboardController.java
index fc02c35..fd040bc 100644
--- a/src/main/java/com/rohitawate/everest/controllers/DashboardController.java
+++ b/src/main/java/com/rohitawate/everest/controllers/DashboardController.java
@@ -23,6 +23,9 @@ import com.rohitawate.everest.controllers.codearea.EverestCodeArea;
 import com.rohitawate.everest.controllers.codearea.EverestCodeArea.HighlightMode;
 import com.rohitawate.everest.exceptions.RedirectException;
 import com.rohitawate.everest.exceptions.UnreliableResponseException;
+import com.rohitawate.everest.misc.EverestUtilities;
+import com.rohitawate.everest.misc.Services;
+import com.rohitawate.everest.misc.ThemeManager;
 import com.rohitawate.everest.models.DashboardState;
 import com.rohitawate.everest.models.requests.DELETERequest;
 import com.rohitawate.everest.models.requests.DataDispatchRequest;
@@ -30,9 +33,6 @@ import com.rohitawate.everest.models.requests.GETRequest;
 import com.rohitawate.everest.models.responses.EverestResponse;
 import com.rohitawate.everest.requestmanager.DataDispatchRequestManager;
 import com.rohitawate.everest.requestmanager.RequestManager;
-import com.rohitawate.everest.util.EverestUtilities;
-import com.rohitawate.everest.util.Services;
-import com.rohitawate.everest.util.themes.ThemeManager;
 import javafx.beans.binding.Bindings;
 import javafx.beans.property.IntegerProperty;
 import javafx.beans.property.SimpleIntegerProperty;
diff --git a/src/main/java/com/rohitawate/everest/controllers/FormDataTabController.java b/src/main/java/com/rohitawate/everest/controllers/FormDataTabController.java
index 0935258..0e88826 100644
--- a/src/main/java/com/rohitawate/everest/controllers/FormDataTabController.java
+++ b/src/main/java/com/rohitawate/everest/controllers/FormDataTabController.java
@@ -16,8 +16,8 @@
 
 package com.rohitawate.everest.controllers;
 
-import com.rohitawate.everest.util.Services;
-import com.rohitawate.everest.util.themes.ThemeManager;
+import com.rohitawate.everest.misc.Services;
+import com.rohitawate.everest.misc.ThemeManager;
 import javafx.beans.binding.Bindings;
 import javafx.beans.property.IntegerProperty;
 import javafx.beans.property.SimpleIntegerProperty;
diff --git a/src/main/java/com/rohitawate/everest/controllers/HeaderTabController.java b/src/main/java/com/rohitawate/everest/controllers/HeaderTabController.java
index cbe6f6f..d1b09f1 100644
--- a/src/main/java/com/rohitawate/everest/controllers/HeaderTabController.java
+++ b/src/main/java/com/rohitawate/everest/controllers/HeaderTabController.java
@@ -16,8 +16,8 @@
 
 package com.rohitawate.everest.controllers;
 
-import com.rohitawate.everest.util.Services;
-import com.rohitawate.everest.util.themes.ThemeManager;
+import com.rohitawate.everest.misc.Services;
+import com.rohitawate.everest.misc.ThemeManager;
 import javafx.beans.binding.Bindings;
 import javafx.beans.property.IntegerProperty;
 import javafx.beans.property.SimpleIntegerProperty;
diff --git a/src/main/java/com/rohitawate/everest/controllers/HomeWindowController.java b/src/main/java/com/rohitawate/everest/controllers/HomeWindowController.java
index 34917c1..3f89774 100644
--- a/src/main/java/com/rohitawate/everest/controllers/HomeWindowController.java
+++ b/src/main/java/com/rohitawate/everest/controllers/HomeWindowController.java
@@ -17,10 +17,10 @@
 package com.rohitawate.everest.controllers;
 
 import com.jfoenix.controls.JFXButton;
+import com.rohitawate.everest.misc.KeyMap;
+import com.rohitawate.everest.misc.Services;
+import com.rohitawate.everest.misc.ThemeManager;
 import com.rohitawate.everest.models.DashboardState;
-import com.rohitawate.everest.util.KeyMap;
-import com.rohitawate.everest.util.Services;
-import com.rohitawate.everest.util.themes.ThemeManager;
 import javafx.application.Platform;
 import javafx.beans.binding.Bindings;
 import javafx.beans.property.StringProperty;
diff --git a/src/main/java/com/rohitawate/everest/controllers/URLTabController.java b/src/main/java/com/rohitawate/everest/controllers/URLTabController.java
index 69449e1..40676f9 100644
--- a/src/main/java/com/rohitawate/everest/controllers/URLTabController.java
+++ b/src/main/java/com/rohitawate/everest/controllers/URLTabController.java
@@ -16,8 +16,8 @@
 
 package com.rohitawate.everest.controllers;
 
-import com.rohitawate.everest.util.Services;
-import com.rohitawate.everest.util.themes.ThemeManager;
+import com.rohitawate.everest.misc.Services;
+import com.rohitawate.everest.misc.ThemeManager;
 import javafx.beans.binding.Bindings;
 import javafx.beans.property.IntegerProperty;
 import javafx.beans.property.SimpleIntegerProperty;
diff --git a/src/main/java/com/rohitawate/everest/controllers/codearea/EverestCodeArea.java b/src/main/java/com/rohitawate/everest/controllers/codearea/EverestCodeArea.java
index edd7dbe..5f42df0 100644
--- a/src/main/java/com/rohitawate/everest/controllers/codearea/EverestCodeArea.java
+++ b/src/main/java/com/rohitawate/everest/controllers/codearea/EverestCodeArea.java
@@ -20,7 +20,7 @@ import com.rohitawate.everest.controllers.codearea.highlighters.Highlighter;
 import com.rohitawate.everest.controllers.codearea.highlighters.JSONHighlighter;
 import com.rohitawate.everest.controllers.codearea.highlighters.PlaintextHighlighter;
 import com.rohitawate.everest.controllers.codearea.highlighters.XMLHighlighter;
-import com.rohitawate.everest.util.settings.Settings;
+import com.rohitawate.everest.settings.Settings;
 import javafx.geometry.Insets;
 import org.fxmisc.richtext.CodeArea;
 
diff --git a/src/main/java/com/rohitawate/everest/util/history/HistoryManager.java b/src/main/java/com/rohitawate/everest/history/HistoryManager.java
similarity index 99%
rename from src/main/java/com/rohitawate/everest/util/history/HistoryManager.java
rename to src/main/java/com/rohitawate/everest/history/HistoryManager.java
index bb7d4f0..34486a5 100644
--- a/src/main/java/com/rohitawate/everest/util/history/HistoryManager.java
+++ b/src/main/java/com/rohitawate/everest/history/HistoryManager.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package com.rohitawate.everest.util.history;
+package com.rohitawate.everest.history;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.rohitawate.everest.misc.EverestUtilities;
+import com.rohitawate.everest.misc.Services;
 import com.rohitawate.everest.models.DashboardState;
-import com.rohitawate.everest.util.EverestUtilities;
-import com.rohitawate.everest.util.Services;
-import com.rohitawate.everest.util.settings.Settings;
+import com.rohitawate.everest.settings.Settings;
 
 import javax.ws.rs.core.MediaType;
 import java.io.File;
diff --git a/src/main/java/com/rohitawate/everest/util/logging/Level.java b/src/main/java/com/rohitawate/everest/logging/Level.java
similarity index 95%
rename from src/main/java/com/rohitawate/everest/util/logging/Level.java
rename to src/main/java/com/rohitawate/everest/logging/Level.java
index bd66ed7..0af5e95 100644
--- a/src/main/java/com/rohitawate/everest/util/logging/Level.java
+++ b/src/main/java/com/rohitawate/everest/logging/Level.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.rohitawate.everest.util.logging;
+package com.rohitawate.everest.logging;
 
 public enum Level {
     SEVERE, WARNING, INFO;
diff --git a/src/main/java/com/rohitawate/everest/util/logging/Log.java b/src/main/java/com/rohitawate/everest/logging/Log.java
similarity index 93%
rename from src/main/java/com/rohitawate/everest/util/logging/Log.java
rename to src/main/java/com/rohitawate/everest/logging/Log.java
index 8cb9032..eb91011 100644
--- a/src/main/java/com/rohitawate/everest/util/logging/Log.java
+++ b/src/main/java/com/rohitawate/everest/logging/Log.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.rohitawate.everest.util.logging;
+package com.rohitawate.everest.logging;
 
 class Log {
     Level level;
diff --git a/src/main/java/com/rohitawate/everest/util/logging/Logger.java b/src/main/java/com/rohitawate/everest/logging/Logger.java
similarity index 98%
rename from src/main/java/com/rohitawate/everest/util/logging/Logger.java
rename to src/main/java/com/rohitawate/everest/logging/Logger.java
index ac21aef..8f3a7c3 100644
--- a/src/main/java/com/rohitawate/everest/util/logging/Logger.java
+++ b/src/main/java/com/rohitawate/everest/logging/Logger.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.rohitawate.everest.util.logging;
+package com.rohitawate.everest.logging;
 
 import java.io.*;
 import java.time.LocalDate;
diff --git a/src/main/java/com/rohitawate/everest/util/logging/LoggingService.java b/src/main/java/com/rohitawate/everest/logging/LoggingService.java
similarity index 95%
rename from src/main/java/com/rohitawate/everest/util/logging/LoggingService.java
rename to src/main/java/com/rohitawate/everest/logging/LoggingService.java
index b0d8c31..707fc03 100644
--- a/src/main/java/com/rohitawate/everest/util/logging/LoggingService.java
+++ b/src/main/java/com/rohitawate/everest/logging/LoggingService.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.rohitawate.everest.util.logging;
+package com.rohitawate.everest.logging;
 
-import com.rohitawate.everest.util.Services;
+import com.rohitawate.everest.misc.Services;
 
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
diff --git a/src/main/java/com/rohitawate/everest/util/EverestUtilities.java b/src/main/java/com/rohitawate/everest/misc/EverestUtilities.java
similarity index 98%
rename from src/main/java/com/rohitawate/everest/util/EverestUtilities.java
rename to src/main/java/com/rohitawate/everest/misc/EverestUtilities.java
index 05239d6..deb09eb 100644
--- a/src/main/java/com/rohitawate/everest/util/EverestUtilities.java
+++ b/src/main/java/com/rohitawate/everest/misc/EverestUtilities.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.rohitawate.everest.util;
+package com.rohitawate.everest.misc;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
diff --git a/src/main/java/com/rohitawate/everest/util/KeyMap.java b/src/main/java/com/rohitawate/everest/misc/KeyMap.java
similarity index 98%
rename from src/main/java/com/rohitawate/everest/util/KeyMap.java
rename to src/main/java/com/rohitawate/everest/misc/KeyMap.java
index 51deaf8..622643d 100644
--- a/src/main/java/com/rohitawate/everest/util/KeyMap.java
+++ b/src/main/java/com/rohitawate/everest/misc/KeyMap.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.rohitawate.everest.util;
+package com.rohitawate.everest.misc;
 
 import javafx.scene.input.KeyCode;
 import javafx.scene.input.KeyCodeCombination;
diff --git a/src/main/java/com/rohitawate/everest/util/Services.java b/src/main/java/com/rohitawate/everest/misc/Services.java
similarity index 87%
rename from src/main/java/com/rohitawate/everest/util/Services.java
rename to src/main/java/com/rohitawate/everest/misc/Services.java
index 4f84c57..1455db0 100644
--- a/src/main/java/com/rohitawate/everest/util/Services.java
+++ b/src/main/java/com/rohitawate/everest/misc/Services.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package com.rohitawate.everest.util;
+package com.rohitawate.everest.misc;
 
 import com.google.common.util.concurrent.MoreExecutors;
 import com.rohitawate.everest.controllers.HomeWindowController;
+import com.rohitawate.everest.history.HistoryManager;
+import com.rohitawate.everest.logging.Level;
+import com.rohitawate.everest.logging.LoggingService;
 import com.rohitawate.everest.requestmanager.RequestManagersPool;
-import com.rohitawate.everest.util.history.HistoryManager;
-import com.rohitawate.everest.util.logging.Level;
-import com.rohitawate.everest.util.logging.LoggingService;
 
 import java.util.concurrent.Executor;
 
diff --git a/src/main/java/com/rohitawate/everest/util/themes/ThemeManager.java b/src/main/java/com/rohitawate/everest/misc/ThemeManager.java
similarity index 95%
rename from src/main/java/com/rohitawate/everest/util/themes/ThemeManager.java
rename to src/main/java/com/rohitawate/everest/misc/ThemeManager.java
index 0946d94..eb0475c 100644
--- a/src/main/java/com/rohitawate/everest/util/themes/ThemeManager.java
+++ b/src/main/java/com/rohitawate/everest/misc/ThemeManager.java
@@ -14,11 +14,10 @@
  * limitations under the License.
  */
 
-package com.rohitawate.everest.util.themes;
+package com.rohitawate.everest.misc;
 
 import com.rohitawate.everest.controllers.codearea.EverestCodeArea;
-import com.rohitawate.everest.util.Services;
-import com.rohitawate.everest.util.settings.Settings;
+import com.rohitawate.everest.settings.Settings;
 import javafx.scene.Parent;
 
 import java.io.File;
diff --git a/src/main/java/com/rohitawate/everest/requestmanager/RequestManager.java b/src/main/java/com/rohitawate/everest/requestmanager/RequestManager.java
index 2e9f84a..569ed23 100644
--- a/src/main/java/com/rohitawate/everest/requestmanager/RequestManager.java
+++ b/src/main/java/com/rohitawate/everest/requestmanager/RequestManager.java
@@ -19,7 +19,7 @@ import com.rohitawate.everest.exceptions.RedirectException;
 import com.rohitawate.everest.exceptions.UnreliableResponseException;
 import com.rohitawate.everest.models.requests.EverestRequest;
 import com.rohitawate.everest.models.responses.EverestResponse;
-import com.rohitawate.everest.util.settings.Settings;
+import com.rohitawate.everest.settings.Settings;
 import javafx.concurrent.Service;
 import org.glassfish.jersey.client.ClientProperties;
 import org.glassfish.jersey.client.HttpUrlConnectorProvider;
diff --git a/src/main/java/com/rohitawate/everest/util/settings/Settings.java b/src/main/java/com/rohitawate/everest/settings/Settings.java
similarity index 96%
rename from src/main/java/com/rohitawate/everest/util/settings/Settings.java
rename to src/main/java/com/rohitawate/everest/settings/Settings.java
index 05c55c3..941fe73 100644
--- a/src/main/java/com/rohitawate/everest/util/settings/Settings.java
+++ b/src/main/java/com/rohitawate/everest/settings/Settings.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.rohitawate.everest.util.settings;
+package com.rohitawate.everest.settings;
 
 /**
  * Holds default settings values which may
diff --git a/src/main/java/com/rohitawate/everest/util/settings/SettingsLoader.java b/src/main/java/com/rohitawate/everest/settings/SettingsLoader.java
similarity index 96%
rename from src/main/java/com/rohitawate/everest/util/settings/SettingsLoader.java
rename to src/main/java/com/rohitawate/everest/settings/SettingsLoader.java
index 0366938..c513864 100644
--- a/src/main/java/com/rohitawate/everest/util/settings/SettingsLoader.java
+++ b/src/main/java/com/rohitawate/everest/settings/SettingsLoader.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.rohitawate.everest.util.settings;
+package com.rohitawate.everest.settings;
 
 import com.fasterxml.jackson.databind.JsonNode;
-import com.rohitawate.everest.util.EverestUtilities;
-import com.rohitawate.everest.util.Services;
+import com.rohitawate.everest.misc.EverestUtilities;
+import com.rohitawate.everest.misc.Services;
 
 import java.io.File;
 import java.io.IOException;