diff --git a/TODO b/TODO
index 0320155..95d7fa0 100644
--- a/TODO
+++ b/TODO
@@ -1,6 +1,8 @@
 TODO
 ----
 
+* use for (var i = 0; myArray[i++];) instead of i<myArray.length
+
 * add entry to popup menu when registering
 
 WONTFIX
diff --git a/src/Makefile b/src/Makefile
index a31fafa..4e491e0 100755
--- a/src/Makefile
+++ b/src/Makefile
@@ -84,7 +84,10 @@ chrome_sources := $(chrome_sources_js) \
 modules_dir := modules
 
 # The sources for the module files.
-modules_sources := $(wildcard $(modules_dir)/*.js) $(wildcard $(modules_dir)/*.jsm)
+modules_sources := $(wildcard $(modules_dir)/*.js) \
+		$(wildcard $(modules_dir)/*.jsm) \
+		$(wildcard $(modules_dir)/ctypes/*.jsm) \
+		$(wildcard $(modules_dir)/gtk2/*.jsm)
 
 # The sources for the XPI file. Uses variables defined in the included
 # Makefiles.
diff --git a/src/chrome/content/options.js b/src/chrome/content/options.js
index 8bc5989..bdd3588 100644
--- a/src/chrome/content/options.js
+++ b/src/chrome/content/options.js
@@ -382,7 +382,6 @@ var firetrayUIOptions = {
       let accountOrServerTypeOrder = parseInt(
         tree.view.getCellText(
           i, tree.columns.getNamedColumn("account_or_server_type_order")));
-
       LOG("account: "+accountOrServerTypeName+", "+accountOrServerTypeExcluded);
 
       if (tree.view.getLevel(i) === TREELEVEL_SERVER_TYPES) {
diff --git a/src/modules/FiretrayHandler.jsm b/src/modules/FiretrayHandler.jsm
index 957a61c..5d03edc 100644
--- a/src/modules/FiretrayHandler.jsm
+++ b/src/modules/FiretrayHandler.jsm
@@ -8,8 +8,8 @@ const Cu = Components.utils;
 
 Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource://gre/modules/ctypes.jsm");
-Cu.import("resource://firetray/gobject.jsm");
-Cu.import("resource://firetray/gtk.jsm");
+Cu.import("resource://firetray/ctypes/gobject.jsm");
+Cu.import("resource://firetray/ctypes/gtk.jsm");
 Cu.import("resource://firetray/commons.js");
 
 /**
diff --git a/src/modules/FiretrayMessaging.jsm b/src/modules/FiretrayMessaging.jsm
index d293044..b982aa3 100644
--- a/src/modules/FiretrayMessaging.jsm
+++ b/src/modules/FiretrayMessaging.jsm
@@ -8,7 +8,6 @@ const Cu = Components.utils;
 
 Cu.import("resource:///modules/mailServices.js");
 Cu.import("resource://gre/modules/PluralForm.jsm");
-// Cu.import("resource://firetray/FiretrayHandler.jsm");
 Cu.import("resource://firetray/commons.js");
 
 const FLDRS_UNINTERESTING = {
@@ -35,7 +34,7 @@ firetray.Messaging = {
 
   init: function() {
     if (this.initialized) {
-      LOG("Messaging already initialized");
+      WARN("Messaging already initialized");
       return;
     }
     LOG("Enabling Messaging");
diff --git a/src/modules/commons.js b/src/modules/commons.js
index 28ff8a5..a4a4bd8 100644
--- a/src/modules/commons.js
+++ b/src/modules/commons.js
@@ -68,11 +68,10 @@ firetray.Utils = {
   },
 
   QueryInterfaces: function(obj) {
-    for each (i in Components.interfaces) {
+    for each (i in Components.interfaces)
       try {
-        if (obj instanceof i) { LOG(i); }
-      } catch (x) {}
-    }
+        if (obj instanceof i) LOG (i);
+      } catch(x) {}
   },
 
   // adapted from http://forums.mozillazine.org/viewtopic.php?p=921150#921150
diff --git a/src/modules/cairo.jsm b/src/modules/ctypes/cairo.jsm
similarity index 94%
rename from src/modules/cairo.jsm
rename to src/modules/ctypes/cairo.jsm
index aead051..dee2069 100644
--- a/src/modules/cairo.jsm
+++ b/src/modules/ctypes/cairo.jsm
@@ -10,7 +10,7 @@ const Cc = Components.classes;
 const Ci = Components.interfaces;
 
 Cu.import("resource://gre/modules/ctypes.jsm");
-Cu.import("resource://firetray/ctypes-utils.jsm");
+Cu.import("resource://firetray/ctypes/ctypes-utils.jsm");
 
 function cairo_defines(lib) {
   this.cairo_t = ctypes.StructType("cairo_t");
diff --git a/src/modules/ctypes-utils.jsm b/src/modules/ctypes/ctypes-utils.jsm
similarity index 100%
rename from src/modules/ctypes-utils.jsm
rename to src/modules/ctypes/ctypes-utils.jsm
diff --git a/src/modules/ctypesMap.jsm b/src/modules/ctypes/ctypesMap.jsm
similarity index 100%
rename from src/modules/ctypesMap.jsm
rename to src/modules/ctypes/ctypesMap.jsm
diff --git a/src/modules/gdk.jsm b/src/modules/ctypes/gdk.jsm
similarity index 97%
rename from src/modules/gdk.jsm
rename to src/modules/ctypes/gdk.jsm
index 1743f00..6cbeb48 100644
--- a/src/modules/gdk.jsm
+++ b/src/modules/ctypes/gdk.jsm
@@ -47,11 +47,11 @@ const Cc = Components.classes;
 const Ci = Components.interfaces;
 
 Cu.import("resource://gre/modules/ctypes.jsm");
-Cu.import("resource://firetray/ctypes-utils.jsm");
-Cu.import("resource://firetray/cairo.jsm");
-Cu.import("resource://firetray/glib.jsm");
-Cu.import("resource://firetray/gobject.jsm");
-Cu.import("resource://firetray/x11.jsm");
+Cu.import("resource://firetray/ctypes/ctypes-utils.jsm");
+Cu.import("resource://firetray/ctypes/cairo.jsm");
+Cu.import("resource://firetray/ctypes/glib.jsm");
+Cu.import("resource://firetray/ctypes/gobject.jsm");
+Cu.import("resource://firetray/ctypes/x11.jsm");
 
 function gdk_defines(lib) {
   this.GdkInterpType = ctypes.int; // enum
diff --git a/src/modules/glib.jsm b/src/modules/ctypes/glib.jsm
similarity index 91%
rename from src/modules/glib.jsm
rename to src/modules/ctypes/glib.jsm
index 019e1db..409a08f 100644
--- a/src/modules/glib.jsm
+++ b/src/modules/ctypes/glib.jsm
@@ -10,7 +10,7 @@ const Cc = Components.classes;
 const Ci = Components.interfaces;
 
 Cu.import("resource://gre/modules/ctypes.jsm");
-Cu.import("resource://firetray/ctypes-utils.jsm");
+Cu.import("resource://firetray/ctypes/ctypes-utils.jsm");
 
 function glib_defines(lib) {
   /* mutual inclusion not possible */
diff --git a/src/modules/gobject.jsm b/src/modules/ctypes/gobject.jsm
similarity index 98%
rename from src/modules/gobject.jsm
rename to src/modules/ctypes/gobject.jsm
index d7a617c..7d29cb6 100644
--- a/src/modules/gobject.jsm
+++ b/src/modules/ctypes/gobject.jsm
@@ -47,8 +47,8 @@ const Cc = Components.classes;
 const Ci = Components.interfaces;
 
 Cu.import("resource://gre/modules/ctypes.jsm");
-Cu.import("resource://firetray/ctypes-utils.jsm");
-Cu.import("resource://firetray/glib.jsm");
+Cu.import("resource://firetray/ctypes/ctypes-utils.jsm");
+Cu.import("resource://firetray/ctypes/glib.jsm");
 
 function gobject_defines(lib) {
 
diff --git a/src/modules/gtk.jsm b/src/modules/ctypes/gtk.jsm
similarity index 96%
rename from src/modules/gtk.jsm
rename to src/modules/ctypes/gtk.jsm
index 89543f0..71630b1 100644
--- a/src/modules/gtk.jsm
+++ b/src/modules/ctypes/gtk.jsm
@@ -10,10 +10,10 @@ const Cc = Components.classes;
 const Ci = Components.interfaces;
 
 Cu.import("resource://gre/modules/ctypes.jsm");
-Cu.import("resource://firetray/ctypes-utils.jsm");
-Cu.import("resource://firetray/gdk.jsm");
-Cu.import("resource://firetray/gobject.jsm");
-Cu.import("resource://firetray/pango.jsm");
+Cu.import("resource://firetray/ctypes/ctypes-utils.jsm");
+Cu.import("resource://firetray/ctypes/gdk.jsm");
+Cu.import("resource://firetray/ctypes/gobject.jsm");
+Cu.import("resource://firetray/ctypes/pango.jsm");
 
 function gtk_defines(lib) {
   this.GTK_ICON_SIZE_MENU = 1; // enum GtkIconSize
diff --git a/src/modules/libc.jsm b/src/modules/ctypes/libc.jsm
similarity index 94%
rename from src/modules/libc.jsm
rename to src/modules/ctypes/libc.jsm
index 3d6a4f2..1f7315c 100644
--- a/src/modules/libc.jsm
+++ b/src/modules/ctypes/libc.jsm
@@ -10,7 +10,7 @@ const Cc = Components.classes;
 const Ci = Components.interfaces;
 
 Cu.import("resource://gre/modules/ctypes.jsm");
-Cu.import("resource://firetray/ctypes-utils.jsm");
+Cu.import("resource://firetray/ctypes/ctypes-utils.jsm");
 
 function libc_defines(lib) {
   this.FILE = ctypes.StructType("FILE");
diff --git a/src/modules/pango.jsm b/src/modules/ctypes/pango.jsm
similarity index 93%
rename from src/modules/pango.jsm
rename to src/modules/ctypes/pango.jsm
index a68a56b..da82217 100644
--- a/src/modules/pango.jsm
+++ b/src/modules/ctypes/pango.jsm
@@ -12,9 +12,9 @@ const Cc = Components.classes;
 const Ci = Components.interfaces;
 
 Cu.import("resource://gre/modules/ctypes.jsm");
-Cu.import("resource://firetray/ctypes-utils.jsm");
-Cu.import("resource://firetray/cairo.jsm");
-Cu.import("resource://firetray/gobject.jsm");
+Cu.import("resource://firetray/ctypes/ctypes-utils.jsm");
+Cu.import("resource://firetray/ctypes/cairo.jsm");
+Cu.import("resource://firetray/ctypes/gobject.jsm");
 
 function pango_defines(lib) {
   this.PANGO_WEIGHT_THIN       = 100;
diff --git a/src/modules/x11.jsm b/src/modules/ctypes/x11.jsm
similarity index 99%
rename from src/modules/x11.jsm
rename to src/modules/ctypes/x11.jsm
index a21df69..72236b7 100644
--- a/src/modules/x11.jsm
+++ b/src/modules/ctypes/x11.jsm
@@ -15,7 +15,7 @@ const Ci = Components.interfaces;
 
 Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource://gre/modules/ctypes.jsm");
-Cu.import("resource://firetray/ctypes-utils.jsm");
+Cu.import("resource://firetray/ctypes/ctypes-utils.jsm");
 Cu.import("resource://firetray/logging.jsm");
 
 const XATOMS_ICCCM = [ "WM_DELETE_WINDOW", "WM_STATE", "WM_CHANGE_STATE" ];
diff --git a/src/modules/gtk2/FiretrayStatusIcon.jsm b/src/modules/gtk2/FiretrayStatusIcon.jsm
index 3710d2c..704c5db 100644
--- a/src/modules/gtk2/FiretrayStatusIcon.jsm
+++ b/src/modules/gtk2/FiretrayStatusIcon.jsm
@@ -9,12 +9,12 @@ const Cu = Components.utils;
 Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource://gre/modules/ctypes.jsm");
-Cu.import("resource://firetray/cairo.jsm");
-Cu.import("resource://firetray/gobject.jsm");
-Cu.import("resource://firetray/gdk.jsm");
-Cu.import("resource://firetray/gtk.jsm");
-Cu.import("resource://firetray/libc.jsm");
-Cu.import("resource://firetray/pango.jsm");
+Cu.import("resource://firetray/ctypes/cairo.jsm");
+Cu.import("resource://firetray/ctypes/gobject.jsm");
+Cu.import("resource://firetray/ctypes/gdk.jsm");
+Cu.import("resource://firetray/ctypes/gtk.jsm");
+Cu.import("resource://firetray/ctypes/libc.jsm");
+Cu.import("resource://firetray/ctypes/pango.jsm");
 Cu.import("resource://firetray/commons.js");
 
 if ("undefined" == typeof(firetray.Handler))
diff --git a/src/modules/gtk2/FiretrayWindow.jsm b/src/modules/gtk2/FiretrayWindow.jsm
index a94fc36..d861f5e 100644
--- a/src/modules/gtk2/FiretrayWindow.jsm
+++ b/src/modules/gtk2/FiretrayWindow.jsm
@@ -16,12 +16,12 @@ const Cu = Components.utils;
 Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource://gre/modules/ctypes.jsm");
-Cu.import("resource://firetray/ctypesMap.jsm");
-Cu.import("resource://firetray/gobject.jsm");
-Cu.import("resource://firetray/gdk.jsm");
-Cu.import("resource://firetray/gtk.jsm");
-Cu.import("resource://firetray/libc.jsm");
-Cu.import("resource://firetray/x11.jsm");
+Cu.import("resource://firetray/ctypes/ctypesMap.jsm");
+Cu.import("resource://firetray/ctypes/gobject.jsm");
+Cu.import("resource://firetray/ctypes/gdk.jsm");
+Cu.import("resource://firetray/ctypes/gtk.jsm");
+Cu.import("resource://firetray/ctypes/libc.jsm");
+Cu.import("resource://firetray/ctypes/x11.jsm");
 Cu.import("resource://firetray/commons.js");
 
 const Services2 = {};
@@ -98,11 +98,8 @@ firetray.Window = {
    * @param userData: _find_data_t
    */
   _findGtkWindowByTitle: function(gtkWidget, userData) {
-    // LOG("GTK Window: "+gtkWidget+", "+userData);
-
     let data = ctypes.cast(userData, _find_data_t.ptr);
     let inTitle = data.contents.inTitle;
-    // LOG("inTitle="+inTitle.readString());
 
     let gtkWin = ctypes.cast(gtkWidget, gtk.GtkWindow.ptr);
     let winTitle = gtk.gtk_window_get_title(gtkWin);
@@ -332,8 +329,7 @@ firetray.Handler.gdkWindows = new ctypesMap(gdk.GdkWindow.ptr),
 /** debug facility */
 firetray.Handler.dumpWindows = function() {
   LOG(firetray.Handler.windowsCount);
-  for (let winId in firetray.Handler.windows)
-    LOG(winId+"="+firetray.Handler.gtkWindows.get(winId));
+  for (let winId in firetray.Handler.windows) LOG(winId+"="+firetray.Handler.gtkWindows.get(winId));
 };
 
 firetray.Handler.registerWindow = function(win) {