load TreeStyleTabWindow and TreeStyleTabBrowser constructors in the main window

content/treestyletab/treestyletab.xul

@@ -12,14 +12,15 @@
 <script src="res/UninstallationListener.js" type="application/javascript"/>
 
 <script type="application/javascript"><![CDATA[
-(function() {
-	var ns = {};
-	Components.utils.import('resource://treestyletab-modules/window.js', ns);
-	new ns.TreeStyleTabWindow(window);
-})();
+
+Components.utils.import('resource://treestyletab-modules/window.js');
+Components.utils.import('resource://treestyletab-modules/browser.js');
+new TreeStyleTabWindow(window);
+
 ]]></script>
+
 <script src="windowHelper.js" type="application/javascript"/>
-<script src="hacks.js" type="application/javascript"/>
+<script src="windowHelperHacks.js" type="application/javascript"/>
 
 <script src="bookmarksOverlay.js" type="application/javascript"/>
 <script src="bookmarksOverlayEditable.js" type="application/javascript"/>

content/treestyletab/windowHelper.js

@@ -56,18 +56,18 @@ var TreeStyleTabWindowHelper = {
 			);
 		}
 
-		this.overrideExtensionsPreInit(); // hacks.js
+		this.overrideExtensionsPreInit(); // windowHelperHacks.js
 	},
  
 	onBeforeBrowserInit : function TSTWH_onBeforeBrowserInit() 
 	{
-		this.overrideExtensionsBeforeBrowserInit(); // hacks.js
+		this.overrideExtensionsBeforeBrowserInit(); // windowHelperHacks.js
 		this.overrideGlobalFunctions();
 	},
  
 	onAfterBrowserInit : function TSTWH_onAfterBrowserInit() 
 	{
-		this.overrideExtensionsAfterBrowserInit(); // hacks.js
+		this.overrideExtensionsAfterBrowserInit(); // windowHelperHacks.js
 	},
 	
 	updateTabDNDObserver : function TSTWH_updateTabDNDObserver(aObserver)