diff --git a/buildVersion.py b/buildVersion.py
index 41677e009fa5079dc9650255f9f31a41570057ac..1a49896abac8bb5bfeb0476b8267df45d84fcd16 100755
--- a/buildVersion.py
+++ b/buildVersion.py
@@ -268,10 +268,14 @@ def yuicompressor():
         if os.path.exists(el): 
             os.remove(el)
             print 'Remove javascript library', el
-            
+
     # debug version of the javascript library
     print 'Debug version of the javascript library', JSLIBDEBUG
-    subprocess.call('cat %s/*.js > %s' % (JSLIBSRC, JSLIBDEBUG), shell=True)
+            
+    subprocess.call("find %s -iname '*.js' | sort > JsFiles.txt" % JSLIBSRC, shell=True)
+    jsfiles = ' '.join(open("JsFiles.txt").readlines()).replace('\n', '')
+    subprocess.call("cat %s > %s" % (jsfiles, JSLIBDEBUG), shell=True)
+    os.remove("JsFiles.txt")
 
     # Minified version of the javascript library
     print 'Minified version of the javascript library', JSLIBMIN
diff --git a/modules/plugin_dbui/helper.py b/modules/plugin_dbui/helper.py
index def82abe5176c2807deb619535105761d7c4ce20..17fe2a4c889f1f56f96f4e37229fa4b786079d79 100644
--- a/modules/plugin_dbui/helper.py
+++ b/modules/plugin_dbui/helper.py
@@ -297,10 +297,8 @@ def get_file_paths(path, ext=None, alpha=True):
             
         elif os.path.isdir(p):
             for file in os.listdir(p):
-                pfile = os.path.join(server_path, el, file)
-                if os.path.isfile(pfile):
-                    if ext and (not pfile.endswith(ext)): continue
-                    li.append(os.path.join(client_path, el, file))
+                pfile = os.path.join(el, file)
+                li.extend(get_file_paths(pfile, ext, alpha))
     
     if alpha:
         li.sort()
@@ -558,7 +556,7 @@ def get_versions():
     server_path, client_path = get_reference_paths()
 
     # plugin dbui
-    fn = os.path.join(server_path, 'static', 'plugin_dbui', 'src', 'base.js')
+    fn = os.path.join(server_path, 'static', 'plugin_dbui', 'src', 'App.js')
     
     fi = open(fn, 'rb')
     s = fi.read()
diff --git a/static/plugin_dbui/src/base.js b/static/plugin_dbui/src/App.js
similarity index 100%
rename from static/plugin_dbui/src/base.js
rename to static/plugin_dbui/src/App.js
diff --git a/static/plugin_dbui/src/buttondownload.js b/static/plugin_dbui/src/button/Download.js
similarity index 100%
rename from static/plugin_dbui/src/buttondownload.js
rename to static/plugin_dbui/src/button/Download.js
diff --git a/static/plugin_dbui/src/directstore.js b/static/plugin_dbui/src/data/DirectStore.js
similarity index 100%
rename from static/plugin_dbui/src/directstore.js
rename to static/plugin_dbui/src/data/DirectStore.js
diff --git a/static/plugin_dbui/src/directproxy.js b/static/plugin_dbui/src/data/proxy/Direct.js
similarity index 100%
rename from static/plugin_dbui/src/directproxy.js
rename to static/plugin_dbui/src/data/proxy/Direct.js
diff --git a/static/plugin_dbui/src/form.js b/static/plugin_dbui/src/form/Panel.js
similarity index 100%
rename from static/plugin_dbui/src/form.js
rename to static/plugin_dbui/src/form/Panel.js
diff --git a/static/plugin_dbui/src/fieldeditor.js b/static/plugin_dbui/src/form/field/AceEditor.js
similarity index 100%
rename from static/plugin_dbui/src/fieldeditor.js
rename to static/plugin_dbui/src/form/field/AceEditor.js
diff --git a/static/plugin_dbui/src/combobox.js b/static/plugin_dbui/src/form/field/ComboBox.js
similarity index 100%
rename from static/plugin_dbui/src/combobox.js
rename to static/plugin_dbui/src/form/field/ComboBox.js
diff --git a/static/plugin_dbui/src/comboboxmaster.js b/static/plugin_dbui/src/form/field/ComboBoxMaster.js
similarity index 100%
rename from static/plugin_dbui/src/comboboxmaster.js
rename to static/plugin_dbui/src/form/field/ComboBoxMaster.js
diff --git a/static/plugin_dbui/src/comboboxslave.js b/static/plugin_dbui/src/form/field/ComboBoxSlave.js
similarity index 100%
rename from static/plugin_dbui/src/comboboxslave.js
rename to static/plugin_dbui/src/form/field/ComboBoxSlave.js
diff --git a/static/plugin_dbui/src/fielddict.js b/static/plugin_dbui/src/form/field/Dict.js
similarity index 100%
rename from static/plugin_dbui/src/fielddict.js
rename to static/plugin_dbui/src/form/field/Dict.js
diff --git a/static/plugin_dbui/src/fieldlist.js b/static/plugin_dbui/src/form/field/List.js
similarity index 100%
rename from static/plugin_dbui/src/fieldlist.js
rename to static/plugin_dbui/src/form/field/List.js
diff --git a/static/plugin_dbui/src/pregexp.js b/static/plugin_dbui/src/form/plugin/RegExp.js
similarity index 92%
rename from static/plugin_dbui/src/pregexp.js
rename to static/plugin_dbui/src/form/plugin/RegExp.js
index f1c9dfe0de4d7a4f4e5f8315d2fa08387d8c7d3e..cf6b02f5b19f887abc4c488d73aff84f02ab3a53 100644
--- a/static/plugin_dbui/src/pregexp.js
+++ b/static/plugin_dbui/src/form/plugin/RegExp.js
@@ -3,7 +3,7 @@
  * by a regular expression object.
  *
  */
-Ext.define('App.form.plugin.PRegExp',  {
+Ext.define('App.form.plugin.RegExp',  {
 
     extend: 'Ext.AbstractPlugin',
     alias: 'plugin.pRegExp',
diff --git a/static/plugin_dbui/src/pformtooltip.js b/static/plugin_dbui/src/form/plugin/ToolTip.js
similarity index 100%
rename from static/plugin_dbui/src/pformtooltip.js
rename to static/plugin_dbui/src/form/plugin/ToolTip.js
diff --git a/static/plugin_dbui/src/gridfilter.js b/static/plugin_dbui/src/grid/Filter.js
similarity index 100%
rename from static/plugin_dbui/src/gridfilter.js
rename to static/plugin_dbui/src/grid/Filter.js
diff --git a/static/plugin_dbui/src/grid.js b/static/plugin_dbui/src/grid/Panel.js
similarity index 100%
rename from static/plugin_dbui/src/grid.js
rename to static/plugin_dbui/src/grid/Panel.js
diff --git a/static/plugin_dbui/src/pgridexpertmenu.js b/static/plugin_dbui/src/grid/plugin/ExpertMenu.js
similarity index 100%
rename from static/plugin_dbui/src/pgridexpertmenu.js
rename to static/plugin_dbui/src/grid/plugin/ExpertMenu.js
diff --git a/static/plugin_dbui/src/pgridmathjax.js b/static/plugin_dbui/src/grid/plugin/MathJax.js
similarity index 100%
rename from static/plugin_dbui/src/pgridmathjax.js
rename to static/plugin_dbui/src/grid/plugin/MathJax.js
diff --git a/static/plugin_dbui/src/pgridroweditorbase.js b/static/plugin_dbui/src/grid/plugin/RowEditorBase.js
similarity index 100%
rename from static/plugin_dbui/src/pgridroweditorbase.js
rename to static/plugin_dbui/src/grid/plugin/RowEditorBase.js
diff --git a/static/plugin_dbui/src/pgridroweditorconfirmdelete.js b/static/plugin_dbui/src/grid/plugin/RowEditorConfirmDelete.js
similarity index 100%
rename from static/plugin_dbui/src/pgridroweditorconfirmdelete.js
rename to static/plugin_dbui/src/grid/plugin/RowEditorConfirmDelete.js
diff --git a/static/plugin_dbui/src/pgridroweditorcontextmenu.js b/static/plugin_dbui/src/grid/plugin/RowEditorContextMenu.js
similarity index 100%
rename from static/plugin_dbui/src/pgridroweditorcontextmenu.js
rename to static/plugin_dbui/src/grid/plugin/RowEditorContextMenu.js
diff --git a/static/plugin_dbui/src/pgridroweditordblclick.js b/static/plugin_dbui/src/grid/plugin/RowEditorDblClick.js
similarity index 100%
rename from static/plugin_dbui/src/pgridroweditordblclick.js
rename to static/plugin_dbui/src/grid/plugin/RowEditorDblClick.js
diff --git a/static/plugin_dbui/src/pgridroweditortoolbar.js b/static/plugin_dbui/src/grid/plugin/RowEditorToolbar.js
similarity index 100%
rename from static/plugin_dbui/src/pgridroweditortoolbar.js
rename to static/plugin_dbui/src/grid/plugin/RowEditorToolbar.js
diff --git a/static/plugin_dbui/src/basepanelwithselector.js b/static/plugin_dbui/src/panel/BaseWithSelector.js
similarity index 100%
rename from static/plugin_dbui/src/basepanelwithselector.js
rename to static/plugin_dbui/src/panel/BaseWithSelector.js
diff --git a/static/plugin_dbui/src/gridwithfilter.js b/static/plugin_dbui/src/panel/GridWithFilter.js
similarity index 100%
rename from static/plugin_dbui/src/gridwithfilter.js
rename to static/plugin_dbui/src/panel/GridWithFilter.js
diff --git a/static/plugin_dbui/src/panelwithurlselector.js b/static/plugin_dbui/src/panel/WithUrlSelector.js
similarity index 100%
rename from static/plugin_dbui/src/panelwithurlselector.js
rename to static/plugin_dbui/src/panel/WithUrlSelector.js
diff --git a/static/plugin_dbui/src/ppanelloaderexception.js b/static/plugin_dbui/src/panel/plugin/LoaderException.js
similarity index 100%
rename from static/plugin_dbui/src/ppanelloaderexception.js
rename to static/plugin_dbui/src/panel/plugin/LoaderException.js
diff --git a/static/plugin_dbui/src/ppanelmathjax.js b/static/plugin_dbui/src/panel/plugin/MathJax.js
similarity index 100%
rename from static/plugin_dbui/src/ppanelmathjax.js
rename to static/plugin_dbui/src/panel/plugin/MathJax.js
diff --git a/static/plugin_dbui/src/viewport.js b/static/plugin_dbui/src/viewport/Viewport.js
similarity index 100%
rename from static/plugin_dbui/src/viewport.js
rename to static/plugin_dbui/src/viewport/Viewport.js
diff --git a/static/plugin_dbui/src/pviewportlogin.js b/static/plugin_dbui/src/viewport/plugin/Login.js
similarity index 100%
rename from static/plugin_dbui/src/pviewportlogin.js
rename to static/plugin_dbui/src/viewport/plugin/Login.js