diff --git a/bin/install-elasticsearch-instance.sh b/bin/install-elasticsearch-instance.sh
index f873cf9..bf4cbb5 100755
--- a/bin/install-elasticsearch-instance.sh
+++ b/bin/install-elasticsearch-instance.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-# 1.3.3
-DOWNLOAD_URL="https://download.elasticsearch.org/elasticsearch/elasticsearch/elasticsearch-1.3.3.tar.gz"
+# 1.6.0
+DOWNLOAD_URL="https://download.elasticsearch.org/elasticsearch/elasticsearch/elasticsearch-1.6.0.tar.gz"
 
 # To find new URLs, see: http://www.elasticsearch.org/download/
 
diff --git a/pom.xml b/pom.xml
index 2717cb7..3a83364 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,63 +1,38 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-<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">
+<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>com.palantir.stash</groupId>
     <artifactId>stash-code-search</artifactId>
-    <version>${domainVersion}</version>
+    <version>4.0.0</version>
+    <packaging>atlassian-plugin</packaging>
+
     <name>Stash Codesearch</name>
     <description>Provides global repository, commit, and file content search for Stash instances</description>
-    <packaging>atlassian-plugin</packaging>
     <organization>
         <name>Palantir Technologies</name>
         <url>http://palantir.com</url>
     </organization>
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>com.atlassian.maven.plugins</groupId>
-                <artifactId>maven-stash-plugin</artifactId>
-                <version>${amps.version}</version>
-                <extensions>true</extensions>
-                <configuration>
-                    <products>
-                        <product>
-                            <id>stash</id>
-                            <instanceId>stash</instanceId>
-                            <version>${stash.version}</version>
-                            <dataVersion>${stash.data.version}</dataVersion>
-                            <containerId>${stash.containerId}</containerId>
-                        </product>
-                    </products>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                <extensions>true</extensions>
-            </plugin>
-            <plugin>
-                <groupId>net.sf.alchim</groupId>
-                <artifactId>yuicompressor-maven-plugin</artifactId>
-                <version>0.7.1</version>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>2.4</version>
-                <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
+
+    <properties>
+        <amps.version>6.1.0</amps.version>
+        <bitbucket.version>4.0.0</bitbucket.version>
+        <bitbucket.data.version>4.0.0</bitbucket.data.version>
+        <bitbucket.containerId>tomcat8x</bitbucket.containerId>
+        <ao.version>0.21.2</ao.version>
+        <elasticsearch.version>1.6.0</elasticsearch.version>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
     <dependencyManagement>
         <dependencies>
             <dependency>
-                <groupId>com.atlassian.stash</groupId>
-                <artifactId>stash-parent</artifactId>
-                <version>${stash.version}</version>
+                <groupId>com.atlassian.bitbucket.server</groupId>
+                <artifactId>bitbucket-parent</artifactId>
+                <version>4.0.0</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -65,38 +40,45 @@
     </dependencyManagement>
     <dependencies>
         <dependency>
-            <groupId>com.atlassian.stash</groupId>
-            <artifactId>stash-api</artifactId>
+            <groupId>com.atlassian.bitbucket.server</groupId>
+            <artifactId>bitbucket-api</artifactId>
+            <version>${bitbucket.version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>com.atlassian.stash</groupId>
-            <artifactId>stash-spi</artifactId>
+            <groupId>com.atlassian.bitbucket.server</groupId>
+            <artifactId>bitbucket-spi</artifactId>
+            <version>${bitbucket.version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>com.atlassian.stash</groupId>
-            <artifactId>stash-scm-git-api</artifactId>
+            <groupId>com.atlassian.bitbucket.server</groupId>
+            <artifactId>bitbucket-git-api</artifactId>
+            <version>${bitbucket.version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>com.atlassian.stash</groupId>
-            <artifactId>stash-scm-common</artifactId>
+            <groupId>com.atlassian.bitbucket.server</groupId>
+            <artifactId>bitbucket-scm-common</artifactId>
+            <version>${bitbucket.version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>com.atlassian.stash</groupId>
-            <artifactId>stash-page-objects</artifactId>
+            <groupId>com.atlassian.bitbucket.server</groupId>
+            <artifactId>bitbucket-page-objects</artifactId>
+            <version>${bitbucket.version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>com.atlassian.soy</groupId>
             <artifactId>soy-template-renderer-api</artifactId>
+            <version>${bitbucket.version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>com.atlassian.plugins</groupId>
             <artifactId>atlassian-plugins-webresource</artifactId>
+            <version>3.4.7</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -118,12 +100,13 @@
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>servlet-api</artifactId>
+            <version>2.5</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.elasticsearch</groupId>
             <artifactId>elasticsearch</artifactId>
-            <version>1.1.0</version>
+            <version>${elasticsearch.version}</version>
         </dependency>
         <dependency>
             <groupId>joda-time</groupId>
@@ -141,57 +124,61 @@
             <version>1.8.5</version>
             <scope>test</scope>
         </dependency>
-        <!-- needed for base64 encode -->
         <dependency>
             <groupId>commons-codec</groupId>
             <artifactId>commons-codec</artifactId>
             <version>1.9</version>
         </dependency>
-        <!-- needed for logger -->
         <dependency>
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-classic</artifactId>
-            <!-- <version>1.0.11</version>  version from stash-parent/pom.xml -->
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>com.atlassian.sal</groupId>
             <artifactId>sal-api</artifactId>
-            <!-- <version>2.10.9</version> version from stash-parent/pom.xml -->
             <scope>provided</scope>
         </dependency>
     </dependencies>
-    <properties>
-        <amps.version>5.0.4</amps.version>
-        <stash.version>3.6.0</stash.version>
-        <stash.data.version>3.6.0</stash.data.version>
-        <stash.containerId>tomcat7x</stash.containerId>
-        <ao.version>0.21.2</ao.version>
-    </properties>
-    <profiles>
-        <profile>
-            <id>gitversion</id>
-
-            <properties>
-                <domainVersion>${env.DOMAIN_VERSION}</domainVersion>
-            </properties>
-            <activation>
-                <property>
-                    <name>env.DOMAIN_VERSION</name>
-                </property>
-            </activation>
-        </profile>
-        <profile>
-            <id>defaultversion</id>
 
-            <properties>
-                <domainVersion>0.0.1-DEV</domainVersion>
-            </properties>
-            <activation>
-                <property>
-                    <name>!env.DOMAIN_VERSION</name>
-                </property>
-            </activation>
-        </profile>
-    </profiles>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>com.atlassian.maven.plugins</groupId>
+                <artifactId>bitbucket-maven-plugin</artifactId>
+                <version>6.1.0</version>
+                <extensions>true</extensions>
+                <configuration>
+                    <products>
+                        <product>
+                            <id>bitbucket</id>
+                            <instanceId>bitbucket</instanceId>
+                            <version>${bitbucket.version}</version>
+                            <dataVersion>${bitbucket.data.version}</dataVersion>
+                            <containerId>${bitbucket.containerId}</containerId>
+                        </product>
+                    </products>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <extensions>true</extensions>
+            </plugin>
+            <plugin>
+                <groupId>net.sf.alchim</groupId>
+                <artifactId>yuicompressor-maven-plugin</artifactId>
+                <version>0.7.1</version>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>2.4</version>
+                <configuration>
+                    <source>1.8</source>
+                    <target>1.8</target>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>
diff --git a/src/main/java/com/palantir/stash/codesearch/admin/GlobalSettingsServlet.java b/src/main/java/com/palantir/stash/codesearch/admin/GlobalSettingsServlet.java
index 338cd68..53e92c5 100644
--- a/src/main/java/com/palantir/stash/codesearch/admin/GlobalSettingsServlet.java
+++ b/src/main/java/com/palantir/stash/codesearch/admin/GlobalSettingsServlet.java
@@ -42,20 +42,20 @@
 import org.slf4j.LoggerFactory;
 
 import com.atlassian.soy.renderer.SoyTemplateRenderer;
-import com.atlassian.stash.exception.AuthorisationException;
-import com.atlassian.stash.server.ApplicationPropertiesService;
-import com.atlassian.stash.user.EscalatedSecurityContext;
-import com.atlassian.stash.user.Permission;
-import com.atlassian.stash.user.PermissionValidationService;
-import com.atlassian.stash.user.SecurityService;
-import com.atlassian.stash.util.Operation;
+import com.atlassian.bitbucket.AuthorisationException;
+import com.atlassian.bitbucket.server.ApplicationPropertiesService;
+import com.atlassian.bitbucket.user.EscalatedSecurityContext;
+import com.atlassian.bitbucket.permission.Permission;
+import com.atlassian.bitbucket.permission.PermissionValidationService;
+import com.atlassian.bitbucket.user.SecurityService;
+import com.atlassian.bitbucket.util.Operation;
 import com.google.common.collect.ImmutableMap;
 import com.palantir.stash.codesearch.updater.SearchUpdater;
 
 public class GlobalSettingsServlet extends HttpServlet {
 
     /**
-     * 
+     *
      */
     private static final long serialVersionUID = 1L;
 
@@ -141,7 +141,7 @@ private boolean verifySysAdmin(HttpServletRequest req, HttpServletResponse resp)
         }
         try {
             validationService.validateForGlobal(Permission.SYS_ADMIN);
-        } catch (AuthorisationException notSysAdminException) {
+        } catch ( AuthorisationException notSysAdminException) {
             log.warn("User {} is not a system administrator", req.getRemoteUser());
             resp.sendError(HttpServletResponse.SC_UNAUTHORIZED, "You do not have permission to access this page.");
             return false;
diff --git a/src/main/java/com/palantir/stash/codesearch/admin/RepositorySettingsServlet.java b/src/main/java/com/palantir/stash/codesearch/admin/RepositorySettingsServlet.java
index 9d3bdfa..f931327 100644
--- a/src/main/java/com/palantir/stash/codesearch/admin/RepositorySettingsServlet.java
+++ b/src/main/java/com/palantir/stash/codesearch/admin/RepositorySettingsServlet.java
@@ -20,22 +20,22 @@
 import org.slf4j.LoggerFactory;
 
 import com.atlassian.soy.renderer.SoyTemplateRenderer;
-import com.atlassian.stash.exception.AuthorisationException;
-import com.atlassian.stash.repository.Repository;
-import com.atlassian.stash.repository.RepositoryService;
-import com.atlassian.stash.server.ApplicationPropertiesService;
-import com.atlassian.stash.user.EscalatedSecurityContext;
-import com.atlassian.stash.user.Permission;
-import com.atlassian.stash.user.PermissionValidationService;
-import com.atlassian.stash.user.SecurityService;
-import com.atlassian.stash.util.Operation;
+import com.atlassian.bitbucket.AuthorisationException;
+import com.atlassian.bitbucket.repository.Repository;
+import com.atlassian.bitbucket.repository.RepositoryService;
+import com.atlassian.bitbucket.server.ApplicationPropertiesService;
+import com.atlassian.bitbucket.user.EscalatedSecurityContext;
+import com.atlassian.bitbucket.permission.Permission;
+import com.atlassian.bitbucket.permission.PermissionValidationService;
+import com.atlassian.bitbucket.user.SecurityService;
+import com.atlassian.bitbucket.util.Operation;
 import com.google.common.collect.ImmutableMap;
 import com.palantir.stash.codesearch.updater.SearchUpdater;
 
 public class RepositorySettingsServlet extends HttpServlet {
 
     /**
-     * 
+     *
      */
     private static final long serialVersionUID = 1L;
 
diff --git a/src/main/java/com/palantir/stash/codesearch/admin/SettingsManager.java b/src/main/java/com/palantir/stash/codesearch/admin/SettingsManager.java
index e034dc7..a41c921 100644
--- a/src/main/java/com/palantir/stash/codesearch/admin/SettingsManager.java
+++ b/src/main/java/com/palantir/stash/codesearch/admin/SettingsManager.java
@@ -3,7 +3,7 @@
  */
 
 package com.palantir.stash.codesearch.admin;
-import com.atlassian.stash.repository.Repository;
+import com.atlassian.bitbucket.repository.Repository;
 import com.palantir.stash.codesearch.updater.SearchUpdater;
 
 public interface SettingsManager {
diff --git a/src/main/java/com/palantir/stash/codesearch/admin/SettingsManagerImpl.java b/src/main/java/com/palantir/stash/codesearch/admin/SettingsManagerImpl.java
index e536890..77a9833 100644
--- a/src/main/java/com/palantir/stash/codesearch/admin/SettingsManagerImpl.java
+++ b/src/main/java/com/palantir/stash/codesearch/admin/SettingsManagerImpl.java
@@ -5,7 +5,7 @@
 package com.palantir.stash.codesearch.admin;
 
 import com.atlassian.activeobjects.external.ActiveObjects;
-import com.atlassian.stash.repository.Repository;
+import com.atlassian.bitbucket.repository.Repository;
 import com.palantir.stash.codesearch.updater.SearchUpdater;
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/main/java/com/palantir/stash/codesearch/event/IndexerEventListener.java b/src/main/java/com/palantir/stash/codesearch/event/IndexerEventListener.java
index c1b227a..7381135 100644
--- a/src/main/java/com/palantir/stash/codesearch/event/IndexerEventListener.java
+++ b/src/main/java/com/palantir/stash/codesearch/event/IndexerEventListener.java
@@ -5,11 +5,11 @@
 package com.palantir.stash.codesearch.event;
 
 import com.atlassian.event.api.EventListener;
-import com.atlassian.stash.event.RepositoryDeletedEvent;
-import com.atlassian.stash.event.RepositoryRefsChangedEvent;
-import com.atlassian.stash.repository.RefChange;
-import com.atlassian.stash.repository.RefChangeType;
-import com.atlassian.stash.repository.Repository;
+import com.atlassian.bitbucket.event.repository.RepositoryDeletedEvent;
+import com.atlassian.bitbucket.event.repository.RepositoryRefsChangedEvent;
+import com.atlassian.bitbucket.repository.RefChange;
+import com.atlassian.bitbucket.repository.RefChangeType;
+import com.atlassian.bitbucket.repository.Repository;
 import com.palantir.stash.codesearch.repository.RepositoryServiceManager;
 import com.palantir.stash.codesearch.updater.SearchUpdater;
 
diff --git a/src/main/java/com/palantir/stash/codesearch/repository/RepositoryServiceManager.java b/src/main/java/com/palantir/stash/codesearch/repository/RepositoryServiceManager.java
index e4f2822..35099af 100644
--- a/src/main/java/com/palantir/stash/codesearch/repository/RepositoryServiceManager.java
+++ b/src/main/java/com/palantir/stash/codesearch/repository/RepositoryServiceManager.java
@@ -4,8 +4,8 @@
 
 package com.palantir.stash.codesearch.repository;
 
-import com.atlassian.stash.repository.*;
-import com.atlassian.stash.user.PermissionValidationService;
+import com.atlassian.bitbucket.repository.*;
+import com.atlassian.bitbucket.permission.PermissionValidationService;
 import com.google.common.collect.ImmutableMap;
 
 public interface RepositoryServiceManager {
@@ -20,6 +20,6 @@ ImmutableMap<String, Repository> getRepositoryMap (
 
     RepositoryService getRepositoryService ();
 
-    RepositoryMetadataService getRepositoryMetadataService ();
+    RefService getRefService ();
 
 }
diff --git a/src/main/java/com/palantir/stash/codesearch/repository/RepositoryServiceManagerImpl.java b/src/main/java/com/palantir/stash/codesearch/repository/RepositoryServiceManagerImpl.java
index 6ff214f..5af172a 100644
--- a/src/main/java/com/palantir/stash/codesearch/repository/RepositoryServiceManagerImpl.java
+++ b/src/main/java/com/palantir/stash/codesearch/repository/RepositoryServiceManagerImpl.java
@@ -9,18 +9,18 @@
 
 import org.slf4j.Logger;
 
-import com.atlassian.stash.exception.AuthorisationException;
-import com.atlassian.stash.repository.Branch;
-import com.atlassian.stash.repository.RefOrder;
-import com.atlassian.stash.repository.Repository;
-import com.atlassian.stash.repository.RepositoryBranchesRequest;
-import com.atlassian.stash.repository.RepositoryMetadataService;
-import com.atlassian.stash.repository.RepositoryService;
-import com.atlassian.stash.user.Permission;
-import com.atlassian.stash.user.PermissionValidationService;
-import com.atlassian.stash.util.Page;
-import com.atlassian.stash.util.PageRequest;
-import com.atlassian.stash.util.PageRequestImpl;
+import com.atlassian.bitbucket.AuthorisationException;
+import com.atlassian.bitbucket.repository.Branch;
+import com.atlassian.bitbucket.repository.RefOrder;
+import com.atlassian.bitbucket.repository.Repository;
+import com.atlassian.bitbucket.repository.RepositoryBranchesRequest;
+import com.atlassian.bitbucket.repository.RefService;
+import com.atlassian.bitbucket.repository.RepositoryService;
+import com.atlassian.bitbucket.permission.Permission;
+import com.atlassian.bitbucket.permission.PermissionValidationService;
+import com.atlassian.bitbucket.util.Page;
+import com.atlassian.bitbucket.util.PageRequest;
+import com.atlassian.bitbucket.util.PageRequestImpl;
 import com.google.common.collect.ImmutableMap;
 import com.palantir.stash.codesearch.logger.PluginLoggerFactory;
 
@@ -30,16 +30,16 @@ public class RepositoryServiceManagerImpl implements RepositoryServiceManager {
 
     private final RepositoryService repositoryService;
 
-    private final RepositoryMetadataService repositoryMetadataService;
+    private final RefService refService;
 
     private final Logger log;
 
     public RepositoryServiceManagerImpl(
         PluginLoggerFactory plf,
         RepositoryService repositoryService,
-        RepositoryMetadataService repositoryMetadataService) {
+        RefService refService) {
         this.repositoryService = repositoryService;
-        this.repositoryMetadataService = repositoryMetadataService;
+        this.refService = refService;
         this.log = plf.getLogger(this.getClass().toString());
     }
 
@@ -79,9 +79,9 @@ public ImmutableMap<String, Branch> getBranchMap(Repository repository) {
         PageRequest req = new PageRequestImpl(0, PAGE_SIZE);
         Map<String, Branch> branchMap = new HashMap<String, Branch>();
         RepositoryBranchesRequest rbr =
-            new RepositoryBranchesRequest.Builder().repository(repository).order(RefOrder.ALPHABETICAL).build();
+            new RepositoryBranchesRequest.Builder(repository).order(RefOrder.ALPHABETICAL).build();
         while (true) {
-            Page<? extends Branch> branchPage = repositoryMetadataService.getBranches(rbr, req);
+            Page<? extends Branch> branchPage = refService.getBranches(rbr, req);
 
             for (Branch b : branchPage.getValues()) {
                 if (branchMap.containsKey(b)) {
@@ -105,8 +105,8 @@ public RepositoryService getRepositoryService() {
     }
 
     @Override
-    public RepositoryMetadataService getRepositoryMetadataService() {
-        return repositoryMetadataService;
+    public RefService getRefService() {
+        return refService;
     }
 
 }
diff --git a/src/main/java/com/palantir/stash/codesearch/search/SearchFilterUtils.java b/src/main/java/com/palantir/stash/codesearch/search/SearchFilterUtils.java
index 07657d1..1ebfe38 100644
--- a/src/main/java/com/palantir/stash/codesearch/search/SearchFilterUtils.java
+++ b/src/main/java/com/palantir/stash/codesearch/search/SearchFilterUtils.java
@@ -7,6 +7,7 @@
 import static org.elasticsearch.index.query.FilterBuilders.boolFilter;
 import static org.elasticsearch.index.query.FilterBuilders.matchAllFilter;
 import static org.elasticsearch.index.query.FilterBuilders.orFilter;
+import static org.elasticsearch.index.query.FilterBuilders.prefixFilter;
 import static org.elasticsearch.index.query.FilterBuilders.rangeFilter;
 import static org.elasticsearch.index.query.FilterBuilders.termFilter;
 import static org.elasticsearch.index.query.FilterBuilders.typeFilter;
@@ -23,7 +24,7 @@
 import org.joda.time.ReadableInstant;
 import org.slf4j.Logger;
 
-import com.atlassian.stash.repository.Repository;
+import com.atlassian.bitbucket.repository.Repository;
 import com.google.common.collect.Iterators;
 import com.palantir.stash.codesearch.logger.PluginLoggerFactory;
 
@@ -129,6 +130,13 @@ public FilterBuilder refFilter(Iterable<String> refs) {
         return filterAdded ? filter : matchAllFilter();
     }
 
+    public FilterBuilder personalFilter() {
+        BoolFilterBuilder filter = boolFilter();
+        filter.mustNot(prefixFilter("project", "~")
+                .cache(true));
+        return filter;
+    }
+
     public FilterBuilder projectFilter(String[] projects) {
         return projectFilter(toIterable(projects));
     }
diff --git a/src/main/java/com/palantir/stash/codesearch/search/SearchServlet.java b/src/main/java/com/palantir/stash/codesearch/search/SearchServlet.java
index cd90e43..8b01b92 100644
--- a/src/main/java/com/palantir/stash/codesearch/search/SearchServlet.java
+++ b/src/main/java/com/palantir/stash/codesearch/search/SearchServlet.java
@@ -55,11 +55,11 @@
 import org.slf4j.Logger;
 
 import com.atlassian.soy.renderer.SoyTemplateRenderer;
-import com.atlassian.stash.exception.AuthorisationException;
-import com.atlassian.stash.repository.Repository;
-import com.atlassian.stash.server.ApplicationPropertiesService;
-import com.atlassian.stash.user.Permission;
-import com.atlassian.stash.user.PermissionValidationService;
+import com.atlassian.bitbucket.AuthorisationException;
+import com.atlassian.bitbucket.repository.Repository;
+import com.atlassian.bitbucket.server.ApplicationPropertiesService;
+import com.atlassian.bitbucket.permission.Permission;
+import com.atlassian.bitbucket.permission.PermissionValidationService;
 import com.atlassian.webresource.api.assembler.PageBuilderService;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
@@ -74,7 +74,7 @@
 public class SearchServlet extends HttpServlet {
 
     /**
-     * 
+     *
      */
     private static final long serialVersionUID = 1L;
 
@@ -339,7 +339,8 @@ protected void doGet(HttpServletRequest req, HttpServletResponse resp)
                         sf.projectFilter(params.projectKeys.split(",")),
                         sf.repositoryFilter(params.repoNames.split(",")),
                         sf.extensionFilter(params.extensions.split(",")),
-                        sf.authorFilter(params.authorNames.split(","))
+                        sf.authorFilter(params.authorNames.split(",")),
+                        params.noPersonal ? sf.personalFilter() : matchAllFilter()
                         ),
                     sf.dateRangeFilter(params.committedAfter, params.committedBefore));
                 FilteredQueryBuilder finalQuery = filteredQuery(query, filter);
@@ -530,6 +531,7 @@ private static class SearchParams {
         public final boolean searchCode;
         public final boolean searchFilenames;
         public final boolean searchCommits;
+        public final boolean noPersonal;
         public final String projectKeys;
         public final String repoNames;
         public final String refNames;
@@ -542,15 +544,16 @@ private static class SearchParams {
 
         private SearchParams(boolean doSearch, String searchString, boolean showStatistics,
             boolean searchCode, boolean searchFilenames, boolean searchCommits,
-            String projectKeys, String repoNames, String refNames, String extensions,
-            String authorNames, int page, String committedAfterStr, String committedBeforeStr,
-            DateTimeZone tz) {
+            boolean noPersonal, String projectKeys, String repoNames, String refNames,
+            String extensions, String authorNames, int page, String committedAfterStr,
+            String committedBeforeStr, DateTimeZone tz) {
             this.doSearch = doSearch;
             this.searchString = searchString;
             this.showStatistics = showStatistics;
             this.searchCode = searchCode;
             this.searchFilenames = searchFilenames;
             this.searchCommits = searchCommits;
+            this.noPersonal = noPersonal;
             this.projectKeys = projectKeys;
             this.repoNames = repoNames;
             this.refNames = refNames;
@@ -563,6 +566,7 @@ private SearchParams(boolean doSearch, String searchString, boolean showStatisti
                 .put("searchCode", searchCode)
                 .put("searchFilenames", searchFilenames)
                 .put("searchCommits", searchCommits)
+                .put("noPersonal", noPersonal)
                 .put("projectKeys", projectKeys)
                 .put("repoNames", repoNames)
                 .put("refNames", refNames)
@@ -610,9 +614,10 @@ public static SearchParams getParams(HttpServletRequest req, DateTimeZone tz) {
             boolean searchCode = "on".equals(req.getParameter("searchCode"));
             boolean searchFilenames = "on".equals(req.getParameter("searchFilenames"));
             boolean searchCommits = "on".equals(req.getParameter("searchCommits"));
-            if (!searchFilenames && !searchCode && !searchCommits) {
+            boolean noPersonal = "on".equals(req.getParameter("noPersonal"));
+            if (!searchFilenames && !searchCode && !searchCommits && !noPersonal) {
                 // Reset checkboxes
-                searchFilenames = searchCode = searchCommits = true;
+                searchFilenames = searchCode = searchCommits = noPersonal = true;
             }
 
             String projectKeys = req.getParameter("projectKeys");
@@ -658,8 +663,9 @@ public static SearchParams getParams(HttpServletRequest req, DateTimeZone tz) {
             }
 
             return new SearchParams(doSearch, searchString, showStatistics, searchCode,
-                searchFilenames, searchCommits, projectKeys, repoNames, refNames, extensions,
-                authorNames, page, committedAfterStr, committedBeforeStr, tz);
+                searchFilenames, searchCommits, noPersonal, projectKeys, repoNames,
+                refNames, extensions, authorNames, page, committedAfterStr, committedBeforeStr,
+                tz);
         }
     }
 
diff --git a/src/main/java/com/palantir/stash/codesearch/updater/CatFileInputHandler.java b/src/main/java/com/palantir/stash/codesearch/updater/CatFileInputHandler.java
index e8dffc6..d8272c6 100644
--- a/src/main/java/com/palantir/stash/codesearch/updater/CatFileInputHandler.java
+++ b/src/main/java/com/palantir/stash/codesearch/updater/CatFileInputHandler.java
@@ -12,7 +12,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.atlassian.stash.scm.CommandInputHandler;
+import com.atlassian.bitbucket.scm.CommandInputHandler;
 import com.atlassian.utils.process.Watchdog;
 
 class CatFileInputHandler implements CommandInputHandler {
diff --git a/src/main/java/com/palantir/stash/codesearch/updater/CatFileOutputHandler.java b/src/main/java/com/palantir/stash/codesearch/updater/CatFileOutputHandler.java
index b6ae5cf..b479dba 100644
--- a/src/main/java/com/palantir/stash/codesearch/updater/CatFileOutputHandler.java
+++ b/src/main/java/com/palantir/stash/codesearch/updater/CatFileOutputHandler.java
@@ -11,7 +11,7 @@
 
 import org.slf4j.Logger;
 
-import com.atlassian.stash.scm.CommandOutputHandler;
+import com.atlassian.bitbucket.scm.CommandOutputHandler;
 import com.atlassian.utils.process.Watchdog;
 import com.palantir.stash.codesearch.logger.PluginLoggerFactory;
 
diff --git a/src/main/java/com/palantir/stash/codesearch/updater/SearchUpdateJob.java b/src/main/java/com/palantir/stash/codesearch/updater/SearchUpdateJob.java
index 2b379c8..c9434fc 100644
--- a/src/main/java/com/palantir/stash/codesearch/updater/SearchUpdateJob.java
+++ b/src/main/java/com/palantir/stash/codesearch/updater/SearchUpdateJob.java
@@ -4,8 +4,8 @@
 
 package com.palantir.stash.codesearch.updater;
 
-import com.atlassian.stash.repository.Repository;
-import com.atlassian.stash.scm.git.GitScm;
+import com.atlassian.bitbucket.repository.Repository;
+import com.atlassian.bitbucket.scm.git.GitScm;
 import com.palantir.stash.codesearch.admin.GlobalSettings;
 import org.elasticsearch.client.Client;
 
diff --git a/src/main/java/com/palantir/stash/codesearch/updater/SearchUpdateJobFactory.java b/src/main/java/com/palantir/stash/codesearch/updater/SearchUpdateJobFactory.java
index e2c6929..bee04a1 100644
--- a/src/main/java/com/palantir/stash/codesearch/updater/SearchUpdateJobFactory.java
+++ b/src/main/java/com/palantir/stash/codesearch/updater/SearchUpdateJobFactory.java
@@ -4,7 +4,7 @@
 
 package com.palantir.stash.codesearch.updater;
 
-import com.atlassian.stash.repository.Repository;
+import com.atlassian.bitbucket.repository.Repository;
 import com.palantir.stash.codesearch.logger.PluginLoggerFactory;
 import com.palantir.stash.codesearch.search.SearchFilterUtils;
 
diff --git a/src/main/java/com/palantir/stash/codesearch/updater/SearchUpdateJobFactoryImpl.java b/src/main/java/com/palantir/stash/codesearch/updater/SearchUpdateJobFactoryImpl.java
index 9acf9d9..a4dec0f 100644
--- a/src/main/java/com/palantir/stash/codesearch/updater/SearchUpdateJobFactoryImpl.java
+++ b/src/main/java/com/palantir/stash/codesearch/updater/SearchUpdateJobFactoryImpl.java
@@ -1,6 +1,6 @@
 package com.palantir.stash.codesearch.updater;
 
-import com.atlassian.stash.repository.Repository;
+import com.atlassian.bitbucket.repository.Repository;
 import com.palantir.stash.codesearch.logger.PluginLoggerFactory;
 import com.palantir.stash.codesearch.search.SearchFilterUtils;
 
diff --git a/src/main/java/com/palantir/stash/codesearch/updater/SearchUpdateJobImpl.java b/src/main/java/com/palantir/stash/codesearch/updater/SearchUpdateJobImpl.java
index 171d756..32703eb 100644
--- a/src/main/java/com/palantir/stash/codesearch/updater/SearchUpdateJobImpl.java
+++ b/src/main/java/com/palantir/stash/codesearch/updater/SearchUpdateJobImpl.java
@@ -22,12 +22,13 @@
 import org.elasticsearch.action.search.SearchRequestBuilder;
 import org.elasticsearch.action.update.UpdateRequestBuilder;
 import org.elasticsearch.client.Client;
+import org.elasticsearch.script.ScriptService;
 import org.elasticsearch.search.SearchHit;
 import org.slf4j.Logger;
 
-import com.atlassian.stash.repository.Repository;
-import com.atlassian.stash.scm.git.GitCommandBuilderFactory;
-import com.atlassian.stash.scm.git.GitScm;
+import com.atlassian.bitbucket.repository.Repository;
+import com.atlassian.bitbucket.scm.git.command.GitCommandBuilderFactory;
+import com.atlassian.bitbucket.scm.git.GitScm;
 import com.google.common.collect.ImmutableList;
 import com.palantir.stash.codesearch.admin.GlobalSettings;
 import com.palantir.stash.codesearch.elasticsearch.RequestBuffer;
@@ -172,7 +173,8 @@ private String getLatestHash(GitCommandBuilderFactory builderFactory) {
     private UpdateRequestBuilder buildDeleteFromRef(Client client, String type, String id) {
         return client.prepareUpdate(ES_UPDATEALIAS, type, id)
             .setScript("ctx._source.refs.contains(ref) ? ((ctx._source.refs.size() > 1) " +
-                "? (ctx._source.refs.remove(ref)) : (ctx.op = \"delete\")) : (ctx.op = \"none\")")
+                "? (ctx._source.refs.remove(ref)) : (ctx.op = \"delete\")) : (ctx.op = \"none\")",
+                ScriptService.ScriptType.INLINE)
             .setScriptLang("mvel")
             .addScriptParam("ref", ref)
             .setRetryOnConflict(MAX_ES_RETRIES)
@@ -183,7 +185,8 @@ private UpdateRequestBuilder buildDeleteFromRef(Client client, String type, Stri
     private UpdateRequestBuilder buildAddToRef(Client client, String type, String id) {
         return client.prepareUpdate(ES_UPDATEALIAS, type, id)
             .setScript("ctx._source.refs.contains(ref) " +
-                "? (ctx.op = \"none\") : (ctx._source.refs += ref)")
+                "? (ctx.op = \"none\") : (ctx._source.refs += ref)",
+                ScriptService.ScriptType.INLINE)
             .setScriptLang("mvel")
             .addScriptParam("ref", ref)
             .setRetryOnConflict(MAX_ES_RETRIES)
diff --git a/src/main/java/com/palantir/stash/codesearch/updater/SearchUpdater.java b/src/main/java/com/palantir/stash/codesearch/updater/SearchUpdater.java
index 6c9f48d..51e4213 100644
--- a/src/main/java/com/palantir/stash/codesearch/updater/SearchUpdater.java
+++ b/src/main/java/com/palantir/stash/codesearch/updater/SearchUpdater.java
@@ -9,7 +9,7 @@
 
 import java.util.concurrent.Future;
 
-import com.atlassian.stash.repository.Repository;
+import com.atlassian.bitbucket.repository.Repository;
 
 public interface SearchUpdater {
 
diff --git a/src/main/java/com/palantir/stash/codesearch/updater/SearchUpdaterImpl.java b/src/main/java/com/palantir/stash/codesearch/updater/SearchUpdaterImpl.java
index 9bafcef..9b80f14 100644
--- a/src/main/java/com/palantir/stash/codesearch/updater/SearchUpdaterImpl.java
+++ b/src/main/java/com/palantir/stash/codesearch/updater/SearchUpdaterImpl.java
@@ -26,9 +26,9 @@
 import org.slf4j.Logger;
 import org.springframework.beans.factory.DisposableBean;
 
-import com.atlassian.stash.repository.Branch;
-import com.atlassian.stash.repository.Repository;
-import com.atlassian.stash.scm.git.GitScm;
+import com.atlassian.bitbucket.repository.Branch;
+import com.atlassian.bitbucket.repository.Repository;
+import com.atlassian.bitbucket.scm.git.GitScm;
 import com.palantir.stash.codesearch.admin.GlobalSettings;
 import com.palantir.stash.codesearch.admin.RepositorySettings;
 import com.palantir.stash.codesearch.admin.SettingsManager;
@@ -42,7 +42,7 @@ public class SearchUpdaterImpl implements SearchUpdater, DisposableBean {
     private static class ResizableSemaphore extends Semaphore {
 
         /**
-         * 
+         *
          */
         private static final long serialVersionUID = 1L;
         private int curSize = 0;
@@ -475,7 +475,7 @@ private Future<Void> submitAsyncUpdateImpl(Repository repository, String ref,
         try {
             String defaultBranch = null;
             try {
-                defaultBranch = repositoryServiceManager.getRepositoryMetadataService()
+                defaultBranch = repositoryServiceManager.getRefService()
                     .getDefaultBranch(repository)
                     .getId();
             } catch (Exception e) {
diff --git a/src/main/java/com/palantir/stash/codesearch/updater/StringOutputHandler.java b/src/main/java/com/palantir/stash/codesearch/updater/StringOutputHandler.java
index 0e6a26e..ab038c6 100644
--- a/src/main/java/com/palantir/stash/codesearch/updater/StringOutputHandler.java
+++ b/src/main/java/com/palantir/stash/codesearch/updater/StringOutputHandler.java
@@ -8,9 +8,9 @@
 
 import org.slf4j.Logger;
 
-import com.atlassian.stash.io.LineReader;
-import com.atlassian.stash.io.LineReaderOutputHandler;
-import com.atlassian.stash.scm.CommandOutputHandler;
+import com.atlassian.bitbucket.io.LineReader;
+import com.atlassian.bitbucket.io.LineReaderOutputHandler;
+import com.atlassian.bitbucket.scm.CommandOutputHandler;
 import com.atlassian.utils.process.Watchdog;
 import com.palantir.stash.codesearch.logger.PluginLoggerFactory;
 
diff --git a/src/main/java/com/palantir/stash/codesearch/validator/GitVersionValidator.java b/src/main/java/com/palantir/stash/codesearch/validator/GitVersionValidator.java
index c99bd2e..7b9c6ce 100644
--- a/src/main/java/com/palantir/stash/codesearch/validator/GitVersionValidator.java
+++ b/src/main/java/com/palantir/stash/codesearch/validator/GitVersionValidator.java
@@ -6,10 +6,10 @@
 
 import org.slf4j.Logger;
 
-import com.atlassian.stash.scm.Command;
-import com.atlassian.stash.scm.CommandOutputHandler;
-import com.atlassian.stash.scm.git.GitCommandBuilderFactory;
-import com.atlassian.stash.scm.git.GitScm;
+import com.atlassian.bitbucket.scm.Command;
+import com.atlassian.bitbucket.scm.CommandOutputHandler;
+import com.atlassian.bitbucket.scm.git.command.GitCommandBuilderFactory;
+import com.atlassian.bitbucket.scm.git.GitScm;
 import com.atlassian.utils.process.ProcessException;
 import com.atlassian.utils.process.Watchdog;
 import com.google.common.io.LineReader;
@@ -18,9 +18,9 @@
 /**
  * This component should be instantiated when the plugin is started up, allowing us to fail the plugin activation of the
  * version of git is detected to be incompatible.
- * 
+ *
  * @author cmyers
- * 
+ *
  */
 public class GitVersionValidator {
 
diff --git a/src/main/resources/atlassian-plugin.xml b/src/main/resources/atlassian-plugin.xml
index 5487e09..8973e9c 100644
--- a/src/main/resources/atlassian-plugin.xml
+++ b/src/main/resources/atlassian-plugin.xml
@@ -10,13 +10,13 @@
 
     <component-import key="activeObjects" interface="com.atlassian.activeobjects.external.ActiveObjects"/>
     <component-import key="applicationProperties" interface="com.atlassian.sal.api.ApplicationProperties"/>
-    <component-import key="gitScm" interface="com.atlassian.stash.scm.git.GitScm"/>
+    <component-import key="gitScm" interface="com.atlassian.bitbucket.scm.git.GitScm"/>
     <component-import key="soyTemplateRenderer" interface="com.atlassian.soy.renderer.SoyTemplateRenderer" filter=""/>
     <component-import key="userManager" interface="com.atlassian.sal.api.user.UserManager" filter=""/>
 
     <stash-resource key="codesearch-soy" name="Codesearch Soy Templates">
         <directory location="/templates/"/>
-        <dependency>com.atlassian.stash.stash-web-plugin:global</dependency>
+        <dependency>com.atlassian.bitbucket.stash-web-plugin:global</dependency>
     </stash-resource>
 
     <web-resource key="scs-resources" name="SCS Resources">
@@ -59,7 +59,7 @@
     <web-item key="search-servlet-global-link" name="Codesearch" section="header.global.primary" weight="200">
         <label>Codesearch</label>
         <link>/plugins/servlet/codesearch/search</link>
-        <condition class="com.atlassian.stash.web.conditions.IsLoggedInCondition"/>
+        <condition class="com.atlassian.bitbucket.web.conditions.IsLoggedInCondition"/>
     </web-item>
 
     <web-item key="search-servlet-projectpage-link" name="Codesearch" section="stash.project.overview.actions" weight="200">
diff --git a/src/main/resources/logback.xml b/src/main/resources/logback.xml
index 0a43514..7f32758 100644
--- a/src/main/resources/logback.xml
+++ b/src/main/resources/logback.xml
@@ -7,14 +7,14 @@
         <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
             <level>INFO</level>
         </filter>
-        <file>${stash.home}/logs/scs-plugin.log</file>
+        <file>${bitbucket.home}/log/scs-plugin.log</file>
         <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
             <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
         </encoder>
     </appender>
 
     <appender name="scs-plugin-debug" class="ch.qos.logback.core.FileAppender">
-        <file>${stash.home}/logs/scs-plugin-debug.log</file>
+        <file>${bitbucket.home}/log/scs-plugin-debug.log</file>
         <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
             <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
         </encoder>
@@ -28,7 +28,7 @@
         </encoder>
     </appender>
 
-    <logger name="com.palantir.stash.codesearch" level="DEBUG">
+    <logger name="com.palantir.bitbucket.codesearch" level="DEBUG">
         <appender-ref ref="scs-plugin" />
         <appender-ref ref="scs-plugin-debug" />
         <appender-ref ref="scs-plugin-console" />
diff --git a/src/main/resources/templates/searchPage.soy b/src/main/resources/templates/searchPage.soy
index 891dc12..1a4ddc6 100644
--- a/src/main/resources/templates/searchPage.soy
+++ b/src/main/resources/templates/searchPage.soy
@@ -97,6 +97,11 @@
                                     <input class="checkbox" type="checkbox" name="searchCommits" id="searchCommits"
                                         {if $prevParams.searchCommits == null or $prevParams.searchCommits}checked{/if}>
                                 </div>
+                                <div class="checkbox">
+                                    <label for="noPersonal">Exclude user projects</label>
+                                    <input class="checkbox" type="checkbox" name="noPersonal" id="noPersonal"
+                                        {if $prevParams.noPersonal == null or $prevParams.noPersonal}checked{/if}>
+                                </div>
                                 <div class="field-group">
                                     <label for="projectKeys">Project keys</label>
                                     <input class="text medium-field" type="text" name="projectKeys" id="projectKeys"
diff --git a/src/test/java/com/palantir/stash/codesearch/admin/GlobalSettingsServletTest.java b/src/test/java/com/palantir/stash/codesearch/admin/GlobalSettingsServletTest.java
index 86324da..378deb8 100644
--- a/src/test/java/com/palantir/stash/codesearch/admin/GlobalSettingsServletTest.java
+++ b/src/test/java/com/palantir/stash/codesearch/admin/GlobalSettingsServletTest.java
@@ -17,12 +17,12 @@
 import org.mockito.MockitoAnnotations;
 
 import com.atlassian.soy.renderer.SoyTemplateRenderer;
-import com.atlassian.stash.exception.AuthorisationException;
-import com.atlassian.stash.i18n.KeyedMessage;
-import com.atlassian.stash.server.ApplicationPropertiesService;
-import com.atlassian.stash.user.Permission;
-import com.atlassian.stash.user.PermissionValidationService;
-import com.atlassian.stash.user.SecurityService;
+import com.atlassian.bitbucket.AuthorisationException;
+import com.atlassian.bitbucket.i18n.KeyedMessage;
+import com.atlassian.bitbucket.server.ApplicationPropertiesService;
+import com.atlassian.bitbucket.permission.Permission;
+import com.atlassian.bitbucket.permission.PermissionValidationService;
+import com.atlassian.bitbucket.user.SecurityService;
 import com.palantir.stash.codesearch.updater.SearchUpdater;
 
 public class GlobalSettingsServletTest {
@@ -67,7 +67,7 @@ public void setUp() throws Exception {
     @Test
     public void getTestWhenNotLoggedIn() throws Exception {
         Mockito.doThrow(
-            new AuthorisationException(new KeyedMessage("testException", "testException", "testException")))
+            new import com.atlassian.bitbucket.AuthorisationException(new KeyedMessage("testException", "testException", "testException")))
             .when(pvs).validateAuthenticated();
 
         servlet.doGet(req, res);
@@ -79,7 +79,7 @@ public void getTestWhenNotLoggedIn() throws Exception {
     @Test
     public void getTestWhenNotSysAdmin() throws Exception {
         Mockito.doThrow(
-            new AuthorisationException(new KeyedMessage("testException", "testException", "testException")))
+            new import com.atlassian.bitbucket.AuthorisationException(new KeyedMessage("testException", "testException", "testException")))
             .when(pvs).validateForGlobal(Permission.SYS_ADMIN);
 
         servlet.doGet(req, res);