diff --git a/gitiles-servlet/src/main/java/com/google/gitiles/CommitSoyData.java b/gitiles-servlet/src/main/java/com/google/gitiles/CommitSoyData.java
index 973eede..bd03eb2 100644
--- a/gitiles-servlet/src/main/java/com/google/gitiles/CommitSoyData.java
+++ b/gitiles-servlet/src/main/java/com/google/gitiles/CommitSoyData.java
@@ -47,7 +47,7 @@
 import javax.servlet.http.HttpServletRequest;
 
 /** Soy data converter for git commits. */
-class CommitSoyData {
+public class CommitSoyData {
   static final ImmutableSet<Field> DEFAULT_FIELDS = Sets.immutableEnumSet(Field.AUTHOR,
       Field.COMMITTER, Field.SHA, Field.TREE, Field.TREE_URL, Field.PARENTS, Field.MESSAGE,
       Field.LOG_URL, Field.ARCHIVE_URL, Field.ARCHIVE_TYPE);
@@ -142,7 +142,7 @@
   }
 
   // TODO(dborowitz): Extract this.
-  static Map<String, String> toSoyData(PersonIdent ident, GitDateFormatter df) {
+  public static Map<String, String> toSoyData(PersonIdent ident, GitDateFormatter df) {
     return ImmutableMap.of(
         "name", ident.getName(),
         "email", ident.getEmailAddress(),
diff --git a/gitiles-servlet/src/main/java/com/google/gitiles/GitilesFilter.java b/gitiles-servlet/src/main/java/com/google/gitiles/GitilesFilter.java
index c45470a..b5a5d8e 100644
--- a/gitiles-servlet/src/main/java/com/google/gitiles/GitilesFilter.java
+++ b/gitiles-servlet/src/main/java/com/google/gitiles/GitilesFilter.java
@@ -27,6 +27,9 @@
 import com.google.common.collect.ListMultimap;
 import com.google.common.collect.Maps;
 import com.google.gitiles.Renderer.FileUrlMapper;
+import com.google.gitiles.blame.BlameCache;
+import com.google.gitiles.blame.BlameCacheImpl;
+import com.google.gitiles.blame.BlameServlet;
 
 import org.eclipse.jgit.errors.ConfigInvalidException;
 import org.eclipse.jgit.errors.RepositoryNotFoundException;
diff --git a/gitiles-servlet/src/main/java/com/google/gitiles/GitilesServlet.java b/gitiles-servlet/src/main/java/com/google/gitiles/GitilesServlet.java
index cc49466..a3c15b3 100644
--- a/gitiles-servlet/src/main/java/com/google/gitiles/GitilesServlet.java
+++ b/gitiles-servlet/src/main/java/com/google/gitiles/GitilesServlet.java
@@ -14,6 +14,8 @@
 
 package com.google.gitiles;
 
+import com.google.gitiles.blame.BlameCache;
+
 import org.eclipse.jgit.http.server.glue.MetaServlet;
 import org.eclipse.jgit.lib.Config;
 import org.eclipse.jgit.transport.resolver.RepositoryResolver;
diff --git a/gitiles-servlet/src/main/java/com/google/gitiles/BlameCache.java b/gitiles-servlet/src/main/java/com/google/gitiles/blame/BlameCache.java
similarity index 98%
rename from gitiles-servlet/src/main/java/com/google/gitiles/BlameCache.java
rename to gitiles-servlet/src/main/java/com/google/gitiles/blame/BlameCache.java
index cf105ad..cf5e477 100644
--- a/gitiles-servlet/src/main/java/com/google/gitiles/BlameCache.java
+++ b/gitiles-servlet/src/main/java/com/google/gitiles/blame/BlameCache.java
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.gitiles;
+package com.google.gitiles.blame;
 
 import com.google.common.base.Objects;
 
diff --git a/gitiles-servlet/src/main/java/com/google/gitiles/BlameCacheImpl.java b/gitiles-servlet/src/main/java/com/google/gitiles/blame/BlameCacheImpl.java
similarity index 98%
rename from gitiles-servlet/src/main/java/com/google/gitiles/BlameCacheImpl.java
rename to gitiles-servlet/src/main/java/com/google/gitiles/blame/BlameCacheImpl.java
index 1fa870b..ea10d73 100644
--- a/gitiles-servlet/src/main/java/com/google/gitiles/BlameCacheImpl.java
+++ b/gitiles-servlet/src/main/java/com/google/gitiles/blame/BlameCacheImpl.java
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.gitiles;
+package com.google.gitiles.blame;
 
 import com.google.common.base.Objects;
 import com.google.common.cache.CacheBuilder;
diff --git a/gitiles-servlet/src/main/java/com/google/gitiles/BlameServlet.java b/gitiles-servlet/src/main/java/com/google/gitiles/blame/BlameServlet.java
similarity index 94%
rename from gitiles-servlet/src/main/java/com/google/gitiles/BlameServlet.java
rename to gitiles-servlet/src/main/java/com/google/gitiles/blame/BlameServlet.java
index 0383b4f..b50b2fb 100644
--- a/gitiles-servlet/src/main/java/com/google/gitiles/BlameServlet.java
+++ b/gitiles-servlet/src/main/java/com/google/gitiles/blame/BlameServlet.java
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.gitiles;
+package com.google.gitiles.blame;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 import static javax.servlet.http.HttpServletResponse.SC_NOT_FOUND;
@@ -21,6 +21,13 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
+import com.google.gitiles.BaseServlet;
+import com.google.gitiles.BlobSoyData;
+import com.google.gitiles.CommitSoyData;
+import com.google.gitiles.GitilesAccess;
+import com.google.gitiles.GitilesView;
+import com.google.gitiles.Renderer;
+import com.google.gitiles.ViewFilter;
 
 import org.eclipse.jgit.errors.IncorrectObjectTypeException;
 import org.eclipse.jgit.http.server.ServletUtils;