diff --git a/deploy-assembly/deploy-assembly-jar.sh b/deploy-assembly/deploy-assembly-jar.sh
new file mode 100755
index 0000000..26fe060
--- /dev/null
+++ b/deploy-assembly/deploy-assembly-jar.sh
@@ -0,0 +1,11 @@
+#!/bin/sh
+./sbt.sh clean assembly
+
+mvn deploy:deploy-file \
+  -DgroupId=gitbucket\
+  -DartifactId=gitbucket-assembly\
+  -Dversion=3.2.0\
+  -Dpackaging=jar\
+  -Dfile=../target/scala-2.11/gitbucket-assembly-3.2.0.jar\
+  -DrepositoryId=sourceforge.jp\
+  -Durl=scp://shell.sourceforge.jp/home/groups/a/am/amateras/htdocs/mvn/
diff --git a/deploy-assembly/pom.xml b/deploy-assembly/pom.xml
new file mode 100644
index 0000000..40693f2
--- /dev/null
+++ b/deploy-assembly/pom.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>jp.sf.amateras</groupId>
+    <artifactId>gitbucket-assembly</artifactId>
+    <version>0.0.1</version>
+    <build>
+        <extensions>
+            <extension>
+                <groupId>org.apache.maven.wagon</groupId>
+                <artifactId>wagon-ssh</artifactId>
+                <version>1.0-beta-6</version>
+            </extension>
+        </extensions>
+    </build>
+</project>
\ No newline at end of file
diff --git a/deploy-assemby-jar.sh b/deploy-assemby-jar.sh
deleted file mode 100755
index d6c8b5c..0000000
--- a/deploy-assemby-jar.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-./sbt.sh clean assembly
-
-mvn deploy:deploy-file \
-  -DgroupId=gitbucket\
-  -DartifactId=gitbucket-assembly\
-  -Dversion=3.2.0\
-  -Dpackaging=jar\
-  -Dfile=target/scala-2.11/gitbucket-assembly-3.2.0.jar\
-  -DrepositoryId=sourceforge.jp\
-  -Durl=scp://shell.sourceforge.jp/home/groups/a/am/amateras/htdocs/mvn/
diff --git a/doc/release.md b/doc/release.md
index 9691d6d..d3feef5 100644
--- a/doc/release.md
+++ b/doc/release.md
@@ -31,7 +31,7 @@
     ...
 ```
 
-### deploy-assembly-jar.sh
+### deploy-assembly/deploy-assembly-jar.sh
 
 ```bash
 #!/bin/sh
@@ -42,7 +42,7 @@
   -DartifactId=gitbucket-assembly\
   -Dversion=3.2.0\ # <---- update here!!
   -Dpackaging=jar\
-  -Dfile=target/scala-2.11/gitbucket-assembly-x.x.x.jar\ # <---- update here!!
+  -Dfile=../target/scala-2.11/gitbucket-assembly-x.x.x.jar\ # <---- update here!!
   -DrepositoryId=sourceforge.jp\
   -Durl=scp://shell.sourceforge.jp/home/groups/a/am/amateras/htdocs/mvn/
 ```
@@ -61,6 +61,7 @@
 For plug-in development, we have to publish the assembly jar file to the public Maven repository.
 
 ```
+cd deploy-assembly/
 ./deploy-assembly-jar.sh
 ```
 
diff --git a/gitbucket-assembly.iml b/gitbucket-assembly.iml
new file mode 100644
index 0000000..3f0a572
--- /dev/null
+++ b/gitbucket-assembly.iml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="false">
+    <output url="file://$MODULE_DIR$/target/classes" />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
+      <excludeFolder url="file://$MODULE_DIR$/target" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
deleted file mode 100644
index 40693f2..0000000
--- a/pom.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>jp.sf.amateras</groupId>
-    <artifactId>gitbucket-assembly</artifactId>
-    <version>0.0.1</version>
-    <build>
-        <extensions>
-            <extension>
-                <groupId>org.apache.maven.wagon</groupId>
-                <artifactId>wagon-ssh</artifactId>
-                <version>1.0-beta-6</version>
-            </extension>
-        </extensions>
-    </build>
-</project>
\ No newline at end of file
diff --git a/project/build.scala b/project/build.scala
index f2f5058..02bd67b 100644
--- a/project/build.scala
+++ b/project/build.scala
@@ -47,7 +47,7 @@
       "org.scalatra" %% "scalatra" % ScalatraVersion,
       "org.scalatra" %% "scalatra-specs2" % ScalatraVersion % "test",
       "org.scalatra" %% "scalatra-json" % ScalatraVersion,
-      "org.json4s" %% "json4s-jackson" % "3.2.11",
+      //"org.json4s" %% "json4s-jackson" % "3.2.11",
       "jp.sf.amateras" %% "scalatra-forms" % "0.1.0",
       "commons-io" % "commons-io" % "2.4",
       "org.pegdown" % "pegdown" % "1.4.1", // 1.4.2 has incompatible APi changes
@@ -66,7 +66,12 @@
       "com.typesafe" % "config" % "1.2.1",
       "com.typesafe.play" %% "twirl-compiler" % "1.0.4",
       "com.typesafe.akka" %% "akka-actor" % "2.3.10",
-      "com.enragedginger" %% "akka-quartz-scheduler" % "1.3.0-akka-2.3.x"
+      "com.enragedginger" %% "akka-quartz-scheduler" % "1.3.0-akka-2.3.x",
+      "org.elasticsearch" % "elasticsearch" % "1.5.2",
+      "com.sksamuel.elastic4s" %% "elastic4s" % "1.5.6",
+      "com.fasterxml.jackson.core" % "jackson-core" % "2.4.2",
+      "com.fasterxml.jackson.core" % "jackson-databind" % "2.4.2",
+      "com.fasterxml.jackson.module" %% "jackson-module-scala" % "2.4.2"
     ),
     play.twirl.sbt.Import.TwirlKeys.templateImports += "gitbucket.core._",
     EclipseKeys.withSource := true,