diff --git a/src/main/scala/app/IndexController.scala b/src/main/scala/app/IndexController.scala
index 3bc6620..a51025d 100644
--- a/src/main/scala/app/IndexController.scala
+++ b/src/main/scala/app/IndexController.scala
@@ -48,7 +48,7 @@
 
   get("/activities.atom"){
     contentType = "application/atom+xml; type=feed"
-    xml.feed(getRecentActivities())
+    helper.xml.feed(getRecentActivities())
   }
 
   /**
diff --git a/src/main/twirl/feed.scala.xml b/src/main/twirl/feed.scala.xml
deleted file mode 100644
index f870ca3..0000000
--- a/src/main/twirl/feed.scala.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-@(activities: List[model.Activity])(implicit context: app.Context)<?xml version="1.0" encoding="UTF-8"?>
-@import context._
-@import view.helpers._
-<feed xmlns="http://www.w3.org/2005/Atom" xmlns:media="http://search.yahoo.com/mrss/" xml:lang="en-US">
-  @header(activities)
-  @activities.map { activity => @item(activity) }
-</feed>
-
-@header(activities: List[model.Activity]) = {<id>tag:@context.host,2013:gitbucket</id>
-  <title>Gitbucket's activities</title>
-  <link type="application/atom+xml" rel="self" href="@context.baseURL/activities.atom"/>
-  <author>
-    <name>Gitbucket</name>
-    <uri>@context.baseURL</uri>
-  </author>
-  <updated>@datetimeRFC3339(activities.map(_.activityDate).max)</updated>}
-
-@item(activity: model.Activity) = {
-  <entry>
-    <id>tag:@context.host,@date(activity.activityDate):activity:@activity.activityId</id>
-    <published>@datetimeRFC3339(activity.activityDate)</published>
-    <updated>@datetimeRFC3339(activity.activityDate)</updated>
-    <link type="text/html" rel="alternate" href="@context.baseURL/@activity.userName/@activity.repositoryName" />
-    <title type="html">@activity.activityType</title>
-    <author>
-      <name>@activity.activityUserName</name>
-      <uri>@url(activity.activityUserName)</uri>
-    </author>
-    <content type="html">@activityMessage(activity.message)</content>
-  </entry>}
diff --git a/src/main/twirl/helper/feed.scala.xml b/src/main/twirl/helper/feed.scala.xml
new file mode 100644
index 0000000..f870ca3
--- /dev/null
+++ b/src/main/twirl/helper/feed.scala.xml
@@ -0,0 +1,30 @@
+@(activities: List[model.Activity])(implicit context: app.Context)<?xml version="1.0" encoding="UTF-8"?>
+@import context._
+@import view.helpers._
+<feed xmlns="http://www.w3.org/2005/Atom" xmlns:media="http://search.yahoo.com/mrss/" xml:lang="en-US">
+  @header(activities)
+  @activities.map { activity => @item(activity) }
+</feed>
+
+@header(activities: List[model.Activity]) = {<id>tag:@context.host,2013:gitbucket</id>
+  <title>Gitbucket's activities</title>
+  <link type="application/atom+xml" rel="self" href="@context.baseURL/activities.atom"/>
+  <author>
+    <name>Gitbucket</name>
+    <uri>@context.baseURL</uri>
+  </author>
+  <updated>@datetimeRFC3339(activities.map(_.activityDate).max)</updated>}
+
+@item(activity: model.Activity) = {
+  <entry>
+    <id>tag:@context.host,@date(activity.activityDate):activity:@activity.activityId</id>
+    <published>@datetimeRFC3339(activity.activityDate)</published>
+    <updated>@datetimeRFC3339(activity.activityDate)</updated>
+    <link type="text/html" rel="alternate" href="@context.baseURL/@activity.userName/@activity.repositoryName" />
+    <title type="html">@activity.activityType</title>
+    <author>
+      <name>@activity.activityUserName</name>
+      <uri>@url(activity.activityUserName)</uri>
+    </author>
+    <content type="html">@activityMessage(activity.message)</content>
+  </entry>}