diff --git a/src/main/scala/model/Account.scala b/src/main/scala/model/Account.scala
index 30fabe8..84661c4 100644
--- a/src/main/scala/model/Account.scala
+++ b/src/main/scala/model/Account.scala
@@ -2,7 +2,7 @@
 
 import scala.slick.driver.H2Driver.simple._
 
-object Accounts extends Table[Account]("ACCOUNT") with Functions {
+object Accounts extends Table[Account]("ACCOUNT") {
   def userName = column[String]("USER_NAME", O PrimaryKey)
   def mailAddress = column[String]("MAIL_ADDRESS")
   def password = column[String]("PASSWORD")
diff --git a/src/main/scala/model/Activity.scala b/src/main/scala/model/Activity.scala
index ffba3d2..9c2ae02 100644
--- a/src/main/scala/model/Activity.scala
+++ b/src/main/scala/model/Activity.scala
@@ -2,7 +2,7 @@
 
 import scala.slick.driver.H2Driver.simple._
 
-object Activities extends Table[Activity]("ACTIVITY") with BasicTemplate with Functions {
+object Activities extends Table[Activity]("ACTIVITY") with BasicTemplate {
   def activityId = column[Int]("ACTIVITY_ID", O AutoInc)
   def activityUserName = column[String]("ACTIVITY_USER_NAME")
   def activityType = column[String]("ACTIVITY_TYPE")
diff --git a/src/main/scala/model/Functions.scala b/src/main/scala/model/Functions.scala
deleted file mode 100644
index dd47b8c..0000000
--- a/src/main/scala/model/Functions.scala
+++ /dev/null
@@ -1,17 +0,0 @@
-package model
-
-import scala.slick.lifted.MappedTypeMapper
-
-protected[model] trait Functions {
-  // java.util.Date TypeMapper
-  implicit val dateTypeMapper = MappedTypeMapper.base[java.util.Date, java.sql.Timestamp](
-      d => new java.sql.Timestamp(d.getTime),
-      t => new java.util.Date(t.getTime)
-  )
-
-  /**
-   * Returns system date.
-   */
-  def currentDate = new java.util.Date()
-
-}
\ No newline at end of file
diff --git a/src/main/scala/model/Issue.scala b/src/main/scala/model/Issue.scala
index fdb644e..d134b8e 100644
--- a/src/main/scala/model/Issue.scala
+++ b/src/main/scala/model/Issue.scala
@@ -7,7 +7,7 @@
   def byPrimaryKey(owner: String, repository: String) = byRepository(owner, repository)
 }
 
-object Issues extends Table[Issue]("ISSUE") with IssueTemplate with MilestoneTemplate with Functions {
+object Issues extends Table[Issue]("ISSUE") with IssueTemplate with MilestoneTemplate {
   def openedUserName = column[String]("OPENED_USER_NAME")
   def assignedUserName = column[String]("ASSIGNED_USER_NAME")
   def title = column[String]("TITLE")
diff --git a/src/main/scala/model/IssueComment.scala b/src/main/scala/model/IssueComment.scala
index 9f5c3a6..1084a33 100644
--- a/src/main/scala/model/IssueComment.scala
+++ b/src/main/scala/model/IssueComment.scala
@@ -2,7 +2,7 @@
 
 import scala.slick.driver.H2Driver.simple._
 
-object IssueComments extends Table[IssueComment]("ISSUE_COMMENT") with IssueTemplate with Functions {
+object IssueComments extends Table[IssueComment]("ISSUE_COMMENT") with IssueTemplate {
   def commentId = column[Int]("COMMENT_ID", O AutoInc)
   def action = column[String]("ACTION")
   def commentedUserName = column[String]("COMMENTED_USER_NAME")
diff --git a/src/main/scala/model/Milestone.scala b/src/main/scala/model/Milestone.scala
index db17f27..deb0848 100644
--- a/src/main/scala/model/Milestone.scala
+++ b/src/main/scala/model/Milestone.scala
@@ -2,7 +2,7 @@
 
 import scala.slick.driver.H2Driver.simple._
 
-object Milestones extends Table[Milestone]("MILESTONE") with MilestoneTemplate with Functions {
+object Milestones extends Table[Milestone]("MILESTONE") with MilestoneTemplate {
   def title = column[String]("TITLE")
   def description = column[String]("DESCRIPTION")
   def dueDate = column[java.util.Date]("DUE_DATE")
diff --git a/src/main/scala/model/Repository.scala b/src/main/scala/model/Repository.scala
index 6f41ee9..fcfb336 100644
--- a/src/main/scala/model/Repository.scala
+++ b/src/main/scala/model/Repository.scala
@@ -2,7 +2,7 @@
 
 import scala.slick.driver.H2Driver.simple._
 
-object Repositories extends Table[Repository]("REPOSITORY") with BasicTemplate with Functions {
+object Repositories extends Table[Repository]("REPOSITORY") with BasicTemplate {
   def isPrivate = column[Boolean]("PRIVATE")
   def description = column[String]("DESCRIPTION")
   def defaultBranch = column[String]("DEFAULT_BRANCH")
diff --git a/src/main/scala/model/package.scala b/src/main/scala/model/package.scala
new file mode 100644
index 0000000..475da12
--- /dev/null
+++ b/src/main/scala/model/package.scala
@@ -0,0 +1,15 @@
+package object model {
+  import scala.slick.lifted.MappedTypeMapper
+
+  // java.util.Date TypeMapper
+  implicit val dateTypeMapper = MappedTypeMapper.base[java.util.Date, java.sql.Timestamp](
+      d => new java.sql.Timestamp(d.getTime),
+      t => new java.util.Date(t.getTime)
+  )
+
+  /**
+   * Returns system date.
+   */
+  def currentDate = new java.util.Date()
+
+}
\ No newline at end of file
diff --git a/src/main/scala/service/AccountService.scala b/src/main/scala/service/AccountService.scala
index 83d6d05..9111cd9 100644
--- a/src/main/scala/service/AccountService.scala
+++ b/src/main/scala/service/AccountService.scala
@@ -1,7 +1,6 @@
 package service
 
 import model._
-import Accounts._
 import scala.slick.driver.H2Driver.simple._
 import Database.threadLocalSession
 
diff --git a/src/main/scala/service/ActivityService.scala b/src/main/scala/service/ActivityService.scala
index 0d0b494..c653313 100644
--- a/src/main/scala/service/ActivityService.scala
+++ b/src/main/scala/service/ActivityService.scala
@@ -1,7 +1,6 @@
 package service
 
 import model._
-import Activities._
 import scala.slick.driver.H2Driver.simple._
 import Database.threadLocalSession
 
diff --git a/src/main/scala/service/IssuesService.scala b/src/main/scala/service/IssuesService.scala
index c3c19d3..9641aa4 100644
--- a/src/main/scala/service/IssuesService.scala
+++ b/src/main/scala/service/IssuesService.scala
@@ -6,7 +6,6 @@
 import Q.interpolation
 
 import model._
-import Issues._
 import util.Implicits._
 
 trait IssuesService {
diff --git a/src/main/scala/service/MilestonesService.scala b/src/main/scala/service/MilestonesService.scala
index 5befbd9..01160c3 100644
--- a/src/main/scala/service/MilestonesService.scala
+++ b/src/main/scala/service/MilestonesService.scala
@@ -4,7 +4,6 @@
 import Database.threadLocalSession
 
 import model._
-import Milestones._
 
 trait MilestonesService {
 
diff --git a/src/main/scala/service/RepositoryService.scala b/src/main/scala/service/RepositoryService.scala
index d354b87..546d0bf 100644
--- a/src/main/scala/service/RepositoryService.scala
+++ b/src/main/scala/service/RepositoryService.scala
@@ -1,7 +1,6 @@
 package service
 
 import model._
-import Repositories._
 import scala.slick.driver.H2Driver.simple._
 import Database.threadLocalSession
 import util.JGitUtil