diff --git a/src/dorkbox/systemTray/jna/linux/AppIndicator.java b/src/dorkbox/systemTray/jna/linux/AppIndicator.java
index 2902b4a..90ebf65 100644
--- a/src/dorkbox/systemTray/jna/linux/AppIndicator.java
+++ b/src/dorkbox/systemTray/jna/linux/AppIndicator.java
@@ -21,6 +21,7 @@ import com.sun.jna.NativeLibrary;
 import com.sun.jna.Pointer;
 
 import dorkbox.systemTray.SystemTray;
+import dorkbox.systemTray.jna.linux.structs.AppIndicatorInstanceStruct;
 import dorkbox.util.OS;
 import dorkbox.util.jna.JnaHelper;
 
@@ -187,7 +188,8 @@ class AppIndicator {
 //    public static final int STATUS_ATTENTION = 2;
 
 
-    public static native AppIndicatorInstanceStruct app_indicator_new(String id, String icon_name, int category);
+    public static native
+    AppIndicatorInstanceStruct app_indicator_new(String id, String icon_name, int category);
 
     public static native void app_indicator_set_title(AppIndicatorInstanceStruct self, String title);
     public static native void app_indicator_set_status(AppIndicatorInstanceStruct self, int status);
diff --git a/src/dorkbox/systemTray/jna/linux/GEventCallback.java b/src/dorkbox/systemTray/jna/linux/GEventCallback.java
index 6feba57..32e2686 100644
--- a/src/dorkbox/systemTray/jna/linux/GEventCallback.java
+++ b/src/dorkbox/systemTray/jna/linux/GEventCallback.java
@@ -18,6 +18,7 @@ package dorkbox.systemTray.jna.linux;
 import com.sun.jna.Callback;
 import com.sun.jna.Pointer;
 
+import dorkbox.systemTray.jna.linux.structs.GdkEventButton;
 import dorkbox.util.Keep;
 
 @Keep
diff --git a/src/dorkbox/systemTray/jna/linux/Gtk.java b/src/dorkbox/systemTray/jna/linux/Gtk.java
index 08decfd..f4257ea 100644
--- a/src/dorkbox/systemTray/jna/linux/Gtk.java
+++ b/src/dorkbox/systemTray/jna/linux/Gtk.java
@@ -22,6 +22,7 @@ import com.sun.jna.NativeLibrary;
 import com.sun.jna.Pointer;
 
 import dorkbox.systemTray.SystemTray;
+import dorkbox.systemTray.jna.linux.structs.GtkStyle;
 import dorkbox.util.OS;
 import dorkbox.util.jna.JnaHelper;
 
diff --git a/src/dorkbox/systemTray/jna/linux/Gtk2.java b/src/dorkbox/systemTray/jna/linux/Gtk2.java
index ffe5e2d..e6e7db6 100644
--- a/src/dorkbox/systemTray/jna/linux/Gtk2.java
+++ b/src/dorkbox/systemTray/jna/linux/Gtk2.java
@@ -18,6 +18,8 @@ package dorkbox.systemTray.jna.linux;
 import com.sun.jna.Function;
 import com.sun.jna.Pointer;
 
+import dorkbox.systemTray.jna.linux.structs.GtkStyle;
+
 /**
  * Bindings for GTK+ 2. Bindings that are exclusively for GTK+ 3 are in that respective class
  *
diff --git a/src/dorkbox/systemTray/jna/linux/GtkTheme.java b/src/dorkbox/systemTray/jna/linux/GtkTheme.java
index 9e5985e..e66b9cb 100644
--- a/src/dorkbox/systemTray/jna/linux/GtkTheme.java
+++ b/src/dorkbox/systemTray/jna/linux/GtkTheme.java
@@ -20,6 +20,11 @@ import com.sun.jna.ptr.PointerByReference;
 
 import dorkbox.systemTray.SystemTray;
 import dorkbox.systemTray.Tray;
+import dorkbox.systemTray.jna.linux.structs.GdkColor;
+import dorkbox.systemTray.jna.linux.structs.GdkRGBAColor;
+import dorkbox.systemTray.jna.linux.structs.GtkRequisition;
+import dorkbox.systemTray.jna.linux.structs.GtkStyle;
+import dorkbox.systemTray.jna.linux.structs.PangoRectangle;
 import dorkbox.systemTray.util.CssParser;
 import dorkbox.systemTray.util.CssParser.Css;
 import dorkbox.systemTray.util.CssParser.CssNode;
diff --git a/src/dorkbox/systemTray/jna/linux/AppIndicatorInstanceStruct.java b/src/dorkbox/systemTray/jna/linux/structs/AppIndicatorInstanceStruct.java
similarity index 95%
rename from src/dorkbox/systemTray/jna/linux/AppIndicatorInstanceStruct.java
rename to src/dorkbox/systemTray/jna/linux/structs/AppIndicatorInstanceStruct.java
index eefec57..4d97eb1 100644
--- a/src/dorkbox/systemTray/jna/linux/AppIndicatorInstanceStruct.java
+++ b/src/dorkbox/systemTray/jna/linux/structs/AppIndicatorInstanceStruct.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package dorkbox.systemTray.jna.linux;
+package dorkbox.systemTray.jna.linux.structs;
 
 import java.util.Arrays;
 import java.util.List;
diff --git a/src/dorkbox/systemTray/jna/linux/GObjectStruct.java b/src/dorkbox/systemTray/jna/linux/structs/GObjectStruct.java
similarity index 96%
rename from src/dorkbox/systemTray/jna/linux/GObjectStruct.java
rename to src/dorkbox/systemTray/jna/linux/structs/GObjectStruct.java
index a252821..14d74d5 100644
--- a/src/dorkbox/systemTray/jna/linux/GObjectStruct.java
+++ b/src/dorkbox/systemTray/jna/linux/structs/GObjectStruct.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package dorkbox.systemTray.jna.linux;
+package dorkbox.systemTray.jna.linux.structs;
 
 import java.util.Arrays;
 import java.util.List;
diff --git a/src/dorkbox/systemTray/jna/linux/GParamSpecStruct.java b/src/dorkbox/systemTray/jna/linux/structs/GParamSpecStruct.java
similarity index 96%
rename from src/dorkbox/systemTray/jna/linux/GParamSpecStruct.java
rename to src/dorkbox/systemTray/jna/linux/structs/GParamSpecStruct.java
index b2dd37b..62daede 100644
--- a/src/dorkbox/systemTray/jna/linux/GParamSpecStruct.java
+++ b/src/dorkbox/systemTray/jna/linux/structs/GParamSpecStruct.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package dorkbox.systemTray.jna.linux;
+package dorkbox.systemTray.jna.linux.structs;
 
 import java.util.Arrays;
 import java.util.List;
diff --git a/src/dorkbox/systemTray/jna/linux/GTypeInstanceStruct.java b/src/dorkbox/systemTray/jna/linux/structs/GTypeInstanceStruct.java
similarity index 96%
rename from src/dorkbox/systemTray/jna/linux/GTypeInstanceStruct.java
rename to src/dorkbox/systemTray/jna/linux/structs/GTypeInstanceStruct.java
index 1525acd..6f27fbb 100644
--- a/src/dorkbox/systemTray/jna/linux/GTypeInstanceStruct.java
+++ b/src/dorkbox/systemTray/jna/linux/structs/GTypeInstanceStruct.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package dorkbox.systemTray.jna.linux;
+package dorkbox.systemTray.jna.linux.structs;
 
 import java.util.Arrays;
 import java.util.List;
diff --git a/src/dorkbox/systemTray/jna/linux/GdkColor.java b/src/dorkbox/systemTray/jna/linux/structs/GdkColor.java
similarity index 97%
rename from src/dorkbox/systemTray/jna/linux/GdkColor.java
rename to src/dorkbox/systemTray/jna/linux/structs/GdkColor.java
index 4343631..110c8bb 100644
--- a/src/dorkbox/systemTray/jna/linux/GdkColor.java
+++ b/src/dorkbox/systemTray/jna/linux/structs/GdkColor.java
@@ -1,4 +1,4 @@
-package dorkbox.systemTray.jna.linux;
+package dorkbox.systemTray.jna.linux.structs;
 
 import java.awt.Color;
 import java.util.Arrays;
diff --git a/src/dorkbox/systemTray/jna/linux/GdkEventButton.java b/src/dorkbox/systemTray/jna/linux/structs/GdkEventButton.java
similarity index 96%
rename from src/dorkbox/systemTray/jna/linux/GdkEventButton.java
rename to src/dorkbox/systemTray/jna/linux/structs/GdkEventButton.java
index 97e90de..e74510d 100644
--- a/src/dorkbox/systemTray/jna/linux/GdkEventButton.java
+++ b/src/dorkbox/systemTray/jna/linux/structs/GdkEventButton.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package dorkbox.systemTray.jna.linux;
+package dorkbox.systemTray.jna.linux.structs;
 
 import java.util.Arrays;
 import java.util.List;
diff --git a/src/dorkbox/systemTray/jna/linux/GdkRGBAColor.java b/src/dorkbox/systemTray/jna/linux/structs/GdkRGBAColor.java
similarity index 95%
rename from src/dorkbox/systemTray/jna/linux/GdkRGBAColor.java
rename to src/dorkbox/systemTray/jna/linux/structs/GdkRGBAColor.java
index 8ce452e..e252284 100644
--- a/src/dorkbox/systemTray/jna/linux/GdkRGBAColor.java
+++ b/src/dorkbox/systemTray/jna/linux/structs/GdkRGBAColor.java
@@ -1,4 +1,4 @@
-package dorkbox.systemTray.jna.linux;
+package dorkbox.systemTray.jna.linux.structs;
 
 import java.awt.Color;
 import java.util.Arrays;
diff --git a/src/dorkbox/systemTray/jna/linux/GtkRequisition.java b/src/dorkbox/systemTray/jna/linux/structs/GtkRequisition.java
similarity index 89%
rename from src/dorkbox/systemTray/jna/linux/GtkRequisition.java
rename to src/dorkbox/systemTray/jna/linux/structs/GtkRequisition.java
index 7d2f960..45e125a 100644
--- a/src/dorkbox/systemTray/jna/linux/GtkRequisition.java
+++ b/src/dorkbox/systemTray/jna/linux/structs/GtkRequisition.java
@@ -1,4 +1,4 @@
-package dorkbox.systemTray.jna.linux;
+package dorkbox.systemTray.jna.linux.structs;
 
 import java.util.Arrays;
 import java.util.List;
diff --git a/src/dorkbox/systemTray/jna/linux/GtkStyle.java b/src/dorkbox/systemTray/jna/linux/structs/GtkStyle.java
similarity index 98%
rename from src/dorkbox/systemTray/jna/linux/GtkStyle.java
rename to src/dorkbox/systemTray/jna/linux/structs/GtkStyle.java
index e65d4e5..6571c4a 100644
--- a/src/dorkbox/systemTray/jna/linux/GtkStyle.java
+++ b/src/dorkbox/systemTray/jna/linux/structs/GtkStyle.java
@@ -1,4 +1,4 @@
-package dorkbox.systemTray.jna.linux;
+package dorkbox.systemTray.jna.linux.structs;
 
 import java.util.Arrays;
 import java.util.List;
diff --git a/src/dorkbox/systemTray/jna/linux/PangoRectangle.java b/src/dorkbox/systemTray/jna/linux/structs/PangoRectangle.java
similarity index 90%
rename from src/dorkbox/systemTray/jna/linux/PangoRectangle.java
rename to src/dorkbox/systemTray/jna/linux/structs/PangoRectangle.java
index 2c72540..96a3373 100644
--- a/src/dorkbox/systemTray/jna/linux/PangoRectangle.java
+++ b/src/dorkbox/systemTray/jna/linux/structs/PangoRectangle.java
@@ -1,4 +1,4 @@
-package dorkbox.systemTray.jna.linux;
+package dorkbox.systemTray.jna.linux.structs;
 
 import java.util.Arrays;
 import java.util.List;
diff --git a/src/dorkbox/systemTray/nativeUI/_AppIndicatorNativeTray.java b/src/dorkbox/systemTray/nativeUI/_AppIndicatorNativeTray.java
index 37a1500..abf6d07 100644
--- a/src/dorkbox/systemTray/nativeUI/_AppIndicatorNativeTray.java
+++ b/src/dorkbox/systemTray/nativeUI/_AppIndicatorNativeTray.java
@@ -25,9 +25,9 @@ import dorkbox.systemTray.SystemTray;
 import dorkbox.systemTray.Tray;
 import dorkbox.systemTray.gnomeShell.Extension;
 import dorkbox.systemTray.jna.linux.AppIndicator;
-import dorkbox.systemTray.jna.linux.AppIndicatorInstanceStruct;
 import dorkbox.systemTray.jna.linux.Gobject;
 import dorkbox.systemTray.jna.linux.GtkEventDispatch;
+import dorkbox.systemTray.jna.linux.structs.AppIndicatorInstanceStruct;
 import dorkbox.systemTray.util.ImageResizeUtil;
 
 /**
diff --git a/src/dorkbox/systemTray/nativeUI/_GtkStatusIconNativeTray.java b/src/dorkbox/systemTray/nativeUI/_GtkStatusIconNativeTray.java
index 5ee1f4f..994da4b 100644
--- a/src/dorkbox/systemTray/nativeUI/_GtkStatusIconNativeTray.java
+++ b/src/dorkbox/systemTray/nativeUI/_GtkStatusIconNativeTray.java
@@ -25,10 +25,10 @@ import dorkbox.systemTray.SystemTray;
 import dorkbox.systemTray.Tray;
 import dorkbox.systemTray.gnomeShell.Extension;
 import dorkbox.systemTray.jna.linux.GEventCallback;
-import dorkbox.systemTray.jna.linux.GdkEventButton;
 import dorkbox.systemTray.jna.linux.Gobject;
 import dorkbox.systemTray.jna.linux.Gtk;
 import dorkbox.systemTray.jna.linux.GtkEventDispatch;
+import dorkbox.systemTray.jna.linux.structs.GdkEventButton;
 
 /**
  * Class for handling all system tray interactions via GTK.