diff --git a/src/main/scala/util/AutoUpdate.scala b/src/main/scala/servlet/AutoUpdateListener.scala
similarity index 92%
rename from src/main/scala/util/AutoUpdate.scala
rename to src/main/scala/servlet/AutoUpdateListener.scala
index 6fa18430e..aa48a0042 100644
--- a/src/main/scala/util/AutoUpdate.scala
+++ b/src/main/scala/servlet/AutoUpdateListener.scala
@@ -1,12 +1,12 @@
-package util
+package servlet
 
 import java.io.File
 import java.sql.Connection
 import org.apache.commons.io.FileUtils
 import javax.servlet.ServletContextEvent
 import org.apache.commons.io.IOUtils
-import org.slf4j.Logger
 import org.slf4j.LoggerFactory
+import util.Directory
 
 object AutoUpdate {
   
@@ -18,7 +18,7 @@ object AutoUpdate {
    */
   case class Version(majorVersion: Int, minorVersion: Int){
     
-    private val logger = LoggerFactory.getLogger(classOf[Version])
+    private val logger = LoggerFactory.getLogger(classOf[servlet.AutoUpdate.Version])
     
     /**
      * Execute update/MAJOR_MINOR.sql to update schema to this version.
diff --git a/src/main/scala/util/BasicAuthenticationFilter.scala b/src/main/scala/servlet/BasicAuthenticationFilter.scala
similarity index 99%
rename from src/main/scala/util/BasicAuthenticationFilter.scala
rename to src/main/scala/servlet/BasicAuthenticationFilter.scala
index c81c221d9..d097c9f6e 100644
--- a/src/main/scala/util/BasicAuthenticationFilter.scala
+++ b/src/main/scala/servlet/BasicAuthenticationFilter.scala
@@ -1,4 +1,4 @@
-package util
+package servlet
 
 import javax.servlet._
 import javax.servlet.http._
diff --git a/src/main/scala/util/GitRepositoryServlet.scala b/src/main/scala/servlet/GitRepositoryServlet.scala
similarity index 96%
rename from src/main/scala/util/GitRepositoryServlet.scala
rename to src/main/scala/servlet/GitRepositoryServlet.scala
index 7f1461a2d..77dd293ab 100644
--- a/src/main/scala/util/GitRepositoryServlet.scala
+++ b/src/main/scala/servlet/GitRepositoryServlet.scala
@@ -1,10 +1,11 @@
-package util
+package servlet
 
 import java.io._
 import javax.servlet._
 import javax.servlet.http._
 import org.eclipse.jgit.http.server.GitServlet
 import org.slf4j.LoggerFactory
+import util.Directory
 
 /**
  * Provides Git repository via HTTP.
diff --git a/src/main/scala/util/TransactionFilter.scala b/src/main/scala/servlet/TransactionFilter.scala
similarity index 94%
rename from src/main/scala/util/TransactionFilter.scala
rename to src/main/scala/servlet/TransactionFilter.scala
index 499a62fdf..cfc21eefe 100644
--- a/src/main/scala/util/TransactionFilter.scala
+++ b/src/main/scala/servlet/TransactionFilter.scala
@@ -1,4 +1,4 @@
-package util
+package servlet
 
 import javax.servlet._
 import org.slf4j.LoggerFactory
diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
index cb3399648..a051a6724 100644
--- a/src/main/webapp/WEB-INF/web.xml
+++ b/src/main/webapp/WEB-INF/web.xml
@@ -13,7 +13,7 @@
   
   <servlet>
     <servlet-name>GitRepositoryServlet</servlet-name>
-    <servlet-class>util.GitRepositoryServlet</servlet-class>
+    <servlet-class>servlet.GitRepositoryServlet</servlet-class>
   </servlet>
   
   <servlet-mapping>
@@ -23,7 +23,7 @@
   
   <filter>
     <filter-name>TransactionFilter</filter-name>
-    <filter-class>util.TransactionFilter</filter-class>
+    <filter-class>servlet.TransactionFilter</filter-class>
   </filter>
   
   <filter-mapping>
@@ -33,7 +33,7 @@
   
   <filter>
     <filter-name>BasicAuthenticationFilter</filter-name>
-    <filter-class>util.BasicAuthenticationFilter</filter-class>
+    <filter-class>servlet.BasicAuthenticationFilter</filter-class>
   </filter>
   
   <filter-mapping>
@@ -45,7 +45,7 @@
   <!-- H2 database configuration -->
   <!-- ===================================================================== -->
   <listener>
-    <listener-class>util.AutoUpdateListener</listener-class>
+    <listener-class>servlet.AutoUpdateListener</listener-class>
   </listener>
   
   <context-param>