diff --git a/scm-webapp/src/main/webapp/index.html b/scm-webapp/src/main/webapp/index.html
index cfa56d08d8..9de499f3f7 100644
--- a/scm-webapp/src/main/webapp/index.html
+++ b/scm-webapp/src/main/webapp/index.html
@@ -60,10 +60,14 @@
     <script type="text/javascript" src="resources/extjs/util/CheckColumn.js"></script>
 
     <script type="text/javascript" src="resources/js/sonia.global.js"></script>
-    <script type="text/javascript" src="resources/js/sonia.util.js"></script>
+    
+    <!-- sonia.util -->
+    <script type="text/javascript" src="resources/js/util/sonia.util.js"></script>
+    <script type="text/javascript" src="resources/js/util/sonia.util.link.js"></script>
     
     <!-- sonia.override -->
     <script type="text/javascript" src="resources/js/override/ext.form.field.js"></script>
+    <script type="text/javascript" src="resources/js/override/ext.util.format.js"></script>
     <script type="text/javascript" src="resources/js/override/ext.data.store.js"></script>
     <script type="text/javascript" src="resources/js/override/ext.grid.columnmodel.js"></script>
     <script type="text/javascript" src="resources/js/override/ext.grid.gridpanel.js"></script>
diff --git a/scm-webapp/src/main/webapp/resources/js/sonia.util.js b/scm-webapp/src/main/webapp/resources/js/override/ext.util.format.js
similarity index 77%
rename from scm-webapp/src/main/webapp/resources/js/sonia.util.js
rename to scm-webapp/src/main/webapp/resources/js/override/ext.util.format.js
index 796f7b8e8a..d30be69e15 100644
--- a/scm-webapp/src/main/webapp/resources/js/sonia.util.js
+++ b/scm-webapp/src/main/webapp/resources/js/override/ext.util.format.js
@@ -29,7 +29,8 @@
  * 
  */
 
- Ext.apply(Ext.util.Format, {
+
+Ext.apply(Ext.util.Format, {
 
   formatTimestamp: function(value){
     var date = null;
@@ -133,63 +134,3 @@
   }
   
 });
-
-Ext.ns('Sonia.util');
-
-// clone method
-
-Sonia.util.clone = function(obj) {
-  var newObj = (this instanceof Array) ? [] : {};
-  for (i in obj) {
-    if (i == 'clone') continue;
-    if (obj[i] && typeof obj[i] == "object") {
-      newObj[i] = Sonia.util.clone(obj[i]);
-    } else newObj[i] = obj[i]
-  } return newObj;
-};
-
-// link
-
-Sonia.util.Link = Ext.extend(Ext.BoxComponent, {
-
-  constructor: function(config) {
-    config = config || {};
-    config.xtype = 'box';
-    config.autoEl = { tag: 'a', html: config.text, href: '#' };
-    Sonia.util.Link.superclass.constructor.apply(this, arguments);
-    this.addEvents({
-      'click': true,
-      'mouseover': true,
-      'blur': true
-    });
-    this.text = config.text;
-  },
-    
-  onRender: function() {
-    theLnk = this;
-    this.constructor.superclass.onRender.apply(this, arguments);
-    if (!theLnk.disabled) {
-      this.el.on('blur', function(e) { theLnk.fireEvent('blur'); });
-      this.el.on('click', function(e) { theLnk.fireEvent('click'); });
-      this.el.on('mouseover', function(e) { theLnk.fireEvent('mouseover'); });
-    }
-  }
-
-});
-
-// register xtype
-Ext.reg('link', Sonia.util.Link);
-
-Sonia.util.getStringFromArray = function(array){
-  var value = '';
-  if ( Ext.isArray(array) ){
-    for ( var i=0; i<array.length; i++ ){
-      value += array[i];
-      if ( (i+1)<array.length ){
-        value += ', ';
-      }
-    }
-  }
-
-  return value;
-}
\ No newline at end of file
diff --git a/scm-webapp/src/main/webapp/resources/js/util/sonia.util.js b/scm-webapp/src/main/webapp/resources/js/util/sonia.util.js
new file mode 100644
index 0000000000..a5a0363340
--- /dev/null
+++ b/scm-webapp/src/main/webapp/resources/js/util/sonia.util.js
@@ -0,0 +1,59 @@
+/* *
+ * Copyright (c) 2010, Sebastian Sdorra
+ * All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * 
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ * 3. Neither the name of SCM-Manager; nor the names of its
+ *    contributors may be used to endorse or promote products derived from this
+ *    software without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * 
+ * http://bitbucket.org/sdorra/scm-manager
+ * 
+ */
+
+Ext.ns('Sonia.util');
+
+// functions
+
+Sonia.util.clone = function(obj) {
+  var newObj = (this instanceof Array) ? [] : {};
+  for (i in obj) {
+    if (i == 'clone') continue;
+    if (obj[i] && typeof obj[i] == "object") {
+      newObj[i] = Sonia.util.clone(obj[i]);
+    } else newObj[i] = obj[i]
+  } return newObj;
+};
+
+
+Sonia.util.getStringFromArray = function(array){
+  var value = '';
+  if ( Ext.isArray(array) ){
+    for ( var i=0; i<array.length; i++ ){
+      value += array[i];
+      if ( (i+1)<array.length ){
+        value += ', ';
+      }
+    }
+  }
+
+  return value;
+}
\ No newline at end of file
diff --git a/scm-webapp/src/main/webapp/resources/js/util/sonia.util.link.js b/scm-webapp/src/main/webapp/resources/js/util/sonia.util.link.js
new file mode 100644
index 0000000000..cb2ce4ec08
--- /dev/null
+++ b/scm-webapp/src/main/webapp/resources/js/util/sonia.util.link.js
@@ -0,0 +1,60 @@
+/* *
+ * Copyright (c) 2010, Sebastian Sdorra
+ * All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * 
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ * 3. Neither the name of SCM-Manager; nor the names of its
+ *    contributors may be used to endorse or promote products derived from this
+ *    software without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * 
+ * http://bitbucket.org/sdorra/scm-manager
+ * 
+ */
+
+Sonia.util.Link = Ext.extend(Ext.BoxComponent, {
+
+  constructor: function(config) {
+    config = config || {};
+    config.xtype = 'box';
+    config.autoEl = { tag: 'a', html: config.text, href: '#' };
+    Sonia.util.Link.superclass.constructor.apply(this, arguments);
+    this.addEvents({
+      'click': true,
+      'mouseover': true,
+      'blur': true
+    });
+    this.text = config.text;
+  },
+    
+  onRender: function() {
+    theLnk = this;
+    this.constructor.superclass.onRender.apply(this, arguments);
+    if (!theLnk.disabled) {
+      this.el.on('blur', function(e) { theLnk.fireEvent('blur'); });
+      this.el.on('click', function(e) { theLnk.fireEvent('click'); });
+      this.el.on('mouseover', function(e) { theLnk.fireEvent('mouseover'); });
+    }
+  }
+
+});
+
+// register xtype
+Ext.reg('link', Sonia.util.Link);
\ No newline at end of file