diff --git a/src/main/java/com/googlesource/gerrit/plugins/its/bugzilla/BugzillaClient.java b/src/main/java/com/googlesource/gerrit/plugins/its/bugzilla/BugzillaClient.java
index f3f6d18..bf2ba68 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/its/bugzilla/BugzillaClient.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/its/bugzilla/BugzillaClient.java
@@ -17,7 +17,7 @@
 import java.util.HashMap;
 import java.util.Set;
 
-import com.googlesource.gerrit.plugins.hooks.its.InvalidTransitionException;
+import com.googlesource.gerrit.plugins.its.base.its.InvalidTransitionException;
 import com.j2bugzilla.base.Bug;
 import com.j2bugzilla.base.BugzillaConnector;
 import com.j2bugzilla.base.BugzillaException;
diff --git a/src/main/java/com/googlesource/gerrit/plugins/its/bugzilla/BugzillaItsFacade.java b/src/main/java/com/googlesource/gerrit/plugins/its/bugzilla/BugzillaItsFacade.java
index 2a2006a..5af8a56 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/its/bugzilla/BugzillaItsFacade.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/its/bugzilla/BugzillaItsFacade.java
@@ -26,7 +26,7 @@
 import com.google.gerrit.server.config.GerritServerConfig;
 import com.google.inject.Inject;
 
-import com.googlesource.gerrit.plugins.hooks.its.ItsFacade;
+import com.googlesource.gerrit.plugins.its.base.its.ItsFacade;
 import com.j2bugzilla.base.BugzillaException;
 import com.j2bugzilla.base.ConnectionException;
 
diff --git a/src/main/java/com/googlesource/gerrit/plugins/its/bugzilla/BugzillaModule.java b/src/main/java/com/googlesource/gerrit/plugins/its/bugzilla/BugzillaModule.java
index 3558ff8..6d863c9 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/its/bugzilla/BugzillaModule.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/its/bugzilla/BugzillaModule.java
@@ -24,8 +24,8 @@
 import com.google.inject.AbstractModule;
 import com.google.inject.Inject;
 
-import com.googlesource.gerrit.plugins.hooks.ItsHookModule;
-import com.googlesource.gerrit.plugins.hooks.its.ItsFacade;
+import com.googlesource.gerrit.plugins.its.base.ItsHookModule;
+import com.googlesource.gerrit.plugins.its.base.its.ItsFacade;
 
 public class BugzillaModule extends AbstractModule {
 
diff --git a/src/main/java/com/googlesource/gerrit/plugins/its/bugzilla/InitBugzilla.java b/src/main/java/com/googlesource/gerrit/plugins/its/bugzilla/InitBugzilla.java
index 12c9cf5..97fd212 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/its/bugzilla/InitBugzilla.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/its/bugzilla/InitBugzilla.java
@@ -23,8 +23,8 @@
 import com.google.inject.Inject;
 import com.google.inject.Singleton;
 
-import com.googlesource.gerrit.plugins.hooks.its.InitIts;
-import com.googlesource.gerrit.plugins.hooks.validation.ItsAssociationPolicy;
+import com.googlesource.gerrit.plugins.its.base.its.InitIts;
+import com.googlesource.gerrit.plugins.its.base.validation.ItsAssociationPolicy;
 import com.j2bugzilla.base.BugzillaException;
 import com.j2bugzilla.base.ConnectionException;
 
diff --git a/src/test/java/com/googlesource/gerrit/plugins/its/bugzilla/BugzillaItsFacadeTest.java b/src/test/java/com/googlesource/gerrit/plugins/its/bugzilla/BugzillaItsFacadeTest.java
index 15d2493..4ed6785 100644
--- a/src/test/java/com/googlesource/gerrit/plugins/its/bugzilla/BugzillaItsFacadeTest.java
+++ b/src/test/java/com/googlesource/gerrit/plugins/its/bugzilla/BugzillaItsFacadeTest.java
@@ -23,7 +23,7 @@
 import com.google.inject.Guice;
 import com.google.inject.Injector;
 
-import com.googlesource.gerrit.plugins.hooks.testutil.LoggingMockingTestCase;
+import com.googlesource.gerrit.plugins.its.base.testutil.LoggingMockingTestCase;
 import com.googlesource.gerrit.plugins.its.bugzilla.BugzillaItsFacade;
 
 public class BugzillaItsFacadeTest extends LoggingMockingTestCase {