diff --git a/src/dorkbox/jna/linux/GtkCheck.java b/src/dorkbox/jna/linux/GtkCheck.java
index e25ad0f..5ffa1ad 100644
--- a/src/dorkbox/jna/linux/GtkCheck.java
+++ b/src/dorkbox/jna/linux/GtkCheck.java
@@ -15,9 +15,9 @@
  */
 package dorkbox.jna.linux;
 
-import dorkbox.util.javaFx.JavaFX;
+import dorkbox.javaFx.JavaFx;
+import dorkbox.swt.Swt;
 import dorkbox.util.SwingUtil;
-import dorkbox.util.swt.Swt;
 
 /**
  * Accessor methods/logic for determining if GTK is already loaded by the Swing/JavaFX/SWT, or if GTK has been manually loaded via
@@ -110,8 +110,8 @@ class GtkCheck {
             }
         }
 
-        if (JavaFX.isLoaded) {
-            if (JavaFX.isGtk3) {
+        if (JavaFx.isLoaded) {
+            if (JavaFx.isGtk3) {
                 return 3;
             } else {
                 return 2;
diff --git a/src/dorkbox/jna/linux/GtkEventDispatch.java b/src/dorkbox/jna/linux/GtkEventDispatch.java
index 4d57a7b..bda133f 100644
--- a/src/dorkbox/jna/linux/GtkEventDispatch.java
+++ b/src/dorkbox/jna/linux/GtkEventDispatch.java
@@ -27,8 +27,9 @@ import org.slf4j.LoggerFactory;
 
 import com.sun.jna.Pointer;
 
-import dorkbox.util.javaFx.JavaFX;
-import dorkbox.util.swt.Swt;
+import dorkbox.javaFx.JavaFx;
+import dorkbox.swt.Swt;
+
 
 public
 class GtkEventDispatch {
@@ -136,8 +137,8 @@ class GtkEventDispatch {
             }
         });
 
-        if (JavaFX.isLoaded) {
-            if (!JavaFX.isEventThread()) {
+        if (JavaFx.isLoaded) {
+            if (!JavaFx.isEventThread()) {
                 try {
                     if (!blockUntilStarted.await(10, TimeUnit.SECONDS)) {
                         if (DEBUG) {
@@ -271,14 +272,14 @@ class GtkEventDispatch {
     public static
     void dispatch(final Runnable runnable) {
         if (GtkLoader.alreadyRunningGTK) {
-            if (JavaFX.isLoaded) {
+            if (JavaFx.isLoaded) {
                 // JavaFX only
-                if (JavaFX.isEventThread()) {
+                if (JavaFx.isEventThread()) {
                     // Run directly on the JavaFX event thread
                     runnable.run();
                 }
                 else {
-                    JavaFX.dispatch(runnable);
+                    JavaFx.dispatch(runnable);
                 }
                 return;
             }
diff --git a/src/dorkbox/jna/linux/GtkLoader.java b/src/dorkbox/jna/linux/GtkLoader.java
index 0e2853f..7e1aa23 100644
--- a/src/dorkbox/jna/linux/GtkLoader.java
+++ b/src/dorkbox/jna/linux/GtkLoader.java
@@ -22,7 +22,7 @@ import com.sun.jna.NativeLibrary;
 
 import dorkbox.jna.JnaHelper;
 import dorkbox.os.OS;
-import dorkbox.util.swt.Swt;
+import dorkbox.swt.Swt;
 
 /**
  * Bindings for GTK+ 2. Bindings that are exclusively for GTK+ 3 are in that respective class
diff --git a/src/dorkbox/jna/linux/GtkTheme.java b/src/dorkbox/jna/linux/GtkTheme.java
index 504346f..17db290 100644
--- a/src/dorkbox/jna/linux/GtkTheme.java
+++ b/src/dorkbox/jna/linux/GtkTheme.java
@@ -38,9 +38,9 @@ import dorkbox.jna.linux.structs.GtkStyle;
 import dorkbox.jna.linux.structs.PangoRectangle;
 import dorkbox.os.OS;
 import dorkbox.os.OSUtil;
+import dorkbox.swt.Swt;
 import dorkbox.util.FileUtil;
 import dorkbox.util.MathUtil;
-import dorkbox.util.swt.Swt;
 
 /**
  * Class to contain all of the various methods needed to get information set by a GTK theme.