diff --git a/BUCK b/BUCK
index 4f0b3c1..551de44 100644
--- a/BUCK
+++ b/BUCK
@@ -4,8 +4,8 @@
   resources = glob(['src/main/resources/**/*']),
   manifest_entries = [
     'Gerrit-PluginName: its-rtc',
-    'Gerrit-Module: com.googlesource.gerrit.plugins.hooks.rtc.RTCModule',
-    'Gerrit-InitStep: com.googlesource.gerrit.plugins.hooks.rtc.InitRTC',
+    'Gerrit-Module: com.googlesource.gerrit.plugins.its.rtc.RTCModule',
+    'Gerrit-InitStep: com.googlesource.gerrit.plugins.its.rtc.InitRTC',
     'Gerrit-ReloadMode: reload',
     'Implementation-Title: Plugin its-rtc',
     'Implementation-URL: http://www.gerritforge.com',
diff --git a/src/main/java/com/googlesource/gerrit/plugins/hooks/rtc/InitRTC.java b/src/main/java/com/googlesource/gerrit/plugins/its/rtc/InitRTC.java
similarity index 97%
rename from src/main/java/com/googlesource/gerrit/plugins/hooks/rtc/InitRTC.java
rename to src/main/java/com/googlesource/gerrit/plugins/its/rtc/InitRTC.java
index f4647a7..993391b 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/hooks/rtc/InitRTC.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/its/rtc/InitRTC.java
@@ -11,7 +11,7 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-package com.googlesource.gerrit.plugins.hooks.rtc;
+package com.googlesource.gerrit.plugins.its.rtc;
 
 import com.google.gerrit.extensions.annotations.PluginName;
 import com.google.gerrit.pgm.init.api.AllProjectsConfig;
@@ -23,8 +23,8 @@
 import com.google.inject.Singleton;
 
 import com.googlesource.gerrit.plugins.hooks.its.InitIts;
-import com.googlesource.gerrit.plugins.hooks.rtc.network.RTCClient;
 import com.googlesource.gerrit.plugins.hooks.validation.ItsAssociationPolicy;
+import com.googlesource.gerrit.plugins.its.rtc.network.RTCClient;
 
 import org.eclipse.jgit.errors.ConfigInvalidException;
 
diff --git a/src/main/java/com/googlesource/gerrit/plugins/hooks/rtc/RTCItsFacade.java b/src/main/java/com/googlesource/gerrit/plugins/its/rtc/RTCItsFacade.java
similarity index 92%
rename from src/main/java/com/googlesource/gerrit/plugins/hooks/rtc/RTCItsFacade.java
rename to src/main/java/com/googlesource/gerrit/plugins/its/rtc/RTCItsFacade.java
index dd75fed..7540c89 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/hooks/rtc/RTCItsFacade.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/its/rtc/RTCItsFacade.java
@@ -11,7 +11,7 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-package com.googlesource.gerrit.plugins.hooks.rtc;
+package com.googlesource.gerrit.plugins.its.rtc;
 
 import java.io.IOException;
 import java.net.URL;
@@ -24,11 +24,12 @@
 import com.google.gerrit.server.config.GerritServerConfig;
 import com.google.inject.Inject;
 import com.google.inject.Injector;
+
 import com.googlesource.gerrit.plugins.hooks.its.ItsFacade;
-import com.googlesource.gerrit.plugins.hooks.rtc.network.RTCClient;
-import com.googlesource.gerrit.plugins.hooks.rtc.workitems.RtcComment;
-import com.googlesource.gerrit.plugins.hooks.rtc.workitems.RtcRelatedLink;
-import com.googlesource.gerrit.plugins.hooks.rtc.workitems.RtcWorkItem;
+import com.googlesource.gerrit.plugins.its.rtc.network.RTCClient;
+import com.googlesource.gerrit.plugins.its.rtc.workitems.RtcComment;
+import com.googlesource.gerrit.plugins.its.rtc.workitems.RtcRelatedLink;
+import com.googlesource.gerrit.plugins.its.rtc.workitems.RtcWorkItem;
 
 public class RTCItsFacade implements ItsFacade {
 
diff --git a/src/main/java/com/googlesource/gerrit/plugins/hooks/rtc/RTCModule.java b/src/main/java/com/googlesource/gerrit/plugins/its/rtc/RTCModule.java
similarity index 97%
rename from src/main/java/com/googlesource/gerrit/plugins/hooks/rtc/RTCModule.java
rename to src/main/java/com/googlesource/gerrit/plugins/its/rtc/RTCModule.java
index 05737ab..14f9b22 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/hooks/rtc/RTCModule.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/its/rtc/RTCModule.java
@@ -11,7 +11,7 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-package com.googlesource.gerrit.plugins.hooks.rtc;
+package com.googlesource.gerrit.plugins.its.rtc;
 
 import java.util.Set;
 import java.util.concurrent.ExecutorService;
diff --git a/src/main/java/com/googlesource/gerrit/plugins/hooks/rtc/api/AbstractDeserializer.java b/src/main/java/com/googlesource/gerrit/plugins/its/rtc/api/AbstractDeserializer.java
similarity index 96%
rename from src/main/java/com/googlesource/gerrit/plugins/hooks/rtc/api/AbstractDeserializer.java
rename to src/main/java/com/googlesource/gerrit/plugins/its/rtc/api/AbstractDeserializer.java
index 8b04a16..e5d340a 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/hooks/rtc/api/AbstractDeserializer.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/its/rtc/api/AbstractDeserializer.java
@@ -11,7 +11,7 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-package com.googlesource.gerrit.plugins.hooks.rtc.api;
+package com.googlesource.gerrit.plugins.its.rtc.api;
 
 import java.util.Calendar;
 
diff --git a/src/main/java/com/googlesource/gerrit/plugins/hooks/rtc/api/ResourceInvalidException.java b/src/main/java/com/googlesource/gerrit/plugins/its/rtc/api/ResourceInvalidException.java
similarity index 93%
rename from src/main/java/com/googlesource/gerrit/plugins/hooks/rtc/api/ResourceInvalidException.java
rename to src/main/java/com/googlesource/gerrit/plugins/its/rtc/api/ResourceInvalidException.java
index 5816206..958fdaa 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/hooks/rtc/api/ResourceInvalidException.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/its/rtc/api/ResourceInvalidException.java
@@ -11,7 +11,7 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-package com.googlesource.gerrit.plugins.hooks.rtc.api;
+package com.googlesource.gerrit.plugins.its.rtc.api;
 
 import java.io.IOException;
 
diff --git a/src/main/java/com/googlesource/gerrit/plugins/hooks/rtc/api/ResourceModifiedException.java b/src/main/java/com/googlesource/gerrit/plugins/its/rtc/api/ResourceModifiedException.java
similarity index 94%
rename from src/main/java/com/googlesource/gerrit/plugins/hooks/rtc/api/ResourceModifiedException.java
rename to src/main/java/com/googlesource/gerrit/plugins/its/rtc/api/ResourceModifiedException.java
index 65da3ce..1c43c94 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/hooks/rtc/api/ResourceModifiedException.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/its/rtc/api/ResourceModifiedException.java
@@ -11,7 +11,7 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-package com.googlesource.gerrit.plugins.hooks.rtc.api;
+package com.googlesource.gerrit.plugins.its.rtc.api;
 
 import java.io.IOException;
 import java.net.URI;
diff --git a/src/main/java/com/googlesource/gerrit/plugins/hooks/rtc/api/ResourceNotFoundException.java b/src/main/java/com/googlesource/gerrit/plugins/its/rtc/api/ResourceNotFoundException.java
similarity index 93%
rename from src/main/java/com/googlesource/gerrit/plugins/hooks/rtc/api/ResourceNotFoundException.java
rename to src/main/java/com/googlesource/gerrit/plugins/its/rtc/api/ResourceNotFoundException.java
index faa3d67..7463cd8 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/hooks/rtc/api/ResourceNotFoundException.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/its/rtc/api/ResourceNotFoundException.java
@@ -11,7 +11,7 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-package com.googlesource.gerrit.plugins.hooks.rtc.api;
+package com.googlesource.gerrit.plugins.its.rtc.api;
 
 import java.io.IOException;
 import java.net.URI;
diff --git a/src/main/java/com/googlesource/gerrit/plugins/hooks/rtc/api/RtcEntity.java b/src/main/java/com/googlesource/gerrit/plugins/its/rtc/api/RtcEntity.java
similarity index 94%
rename from src/main/java/com/googlesource/gerrit/plugins/hooks/rtc/api/RtcEntity.java
rename to src/main/java/com/googlesource/gerrit/plugins/its/rtc/api/RtcEntity.java
index 684c7e0..6bc1c14 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/hooks/rtc/api/RtcEntity.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/its/rtc/api/RtcEntity.java
@@ -11,7 +11,7 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-package com.googlesource.gerrit.plugins.hooks.rtc.api;
+package com.googlesource.gerrit.plugins.its.rtc.api;
 
 
 public class RtcEntity extends RtcObject {
diff --git a/src/main/java/com/googlesource/gerrit/plugins/hooks/rtc/api/RtcEntityDeserializer.java b/src/main/java/com/googlesource/gerrit/plugins/its/rtc/api/RtcEntityDeserializer.java
similarity index 90%
rename from src/main/java/com/googlesource/gerrit/plugins/hooks/rtc/api/RtcEntityDeserializer.java
rename to src/main/java/com/googlesource/gerrit/plugins/its/rtc/api/RtcEntityDeserializer.java
index d22f886..da73add 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/hooks/rtc/api/RtcEntityDeserializer.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/its/rtc/api/RtcEntityDeserializer.java
@@ -11,7 +11,7 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-package com.googlesource.gerrit.plugins.hooks.rtc.api;
+package com.googlesource.gerrit.plugins.its.rtc.api;
 
 import java.lang.reflect.Type;
 
@@ -20,7 +20,8 @@
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParseException;
-import com.googlesource.gerrit.plugins.hooks.rtc.api.AbstractDeserializer;
+
+import com.googlesource.gerrit.plugins.its.rtc.api.AbstractDeserializer;
 
 public class RtcEntityDeserializer extends AbstractDeserializer implements JsonDeserializer<RtcEntity> {
 
diff --git a/src/main/java/com/googlesource/gerrit/plugins/hooks/rtc/api/RtcObject.java b/src/main/java/com/googlesource/gerrit/plugins/its/rtc/api/RtcObject.java
similarity index 89%
rename from src/main/java/com/googlesource/gerrit/plugins/hooks/rtc/api/RtcObject.java
rename to src/main/java/com/googlesource/gerrit/plugins/its/rtc/api/RtcObject.java
index 1b37760..83f8386 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/hooks/rtc/api/RtcObject.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/its/rtc/api/RtcObject.java
@@ -11,10 +11,11 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-package com.googlesource.gerrit.plugins.hooks.rtc.api;
+package com.googlesource.gerrit.plugins.its.rtc.api;
 
 import com.google.gson.Gson;
-import com.googlesource.gerrit.plugins.hooks.rtc.network.Transport;
+
+import com.googlesource.gerrit.plugins.its.rtc.network.Transport;
 
 public class RtcObject {
   private String rdf;
diff --git a/src/main/java/com/googlesource/gerrit/plugins/hooks/rtc/network/AuthenticationException.java b/src/main/java/com/googlesource/gerrit/plugins/its/rtc/network/AuthenticationException.java
similarity index 93%
rename from src/main/java/com/googlesource/gerrit/plugins/hooks/rtc/network/AuthenticationException.java
rename to src/main/java/com/googlesource/gerrit/plugins/its/rtc/network/AuthenticationException.java
index 99361c9..e6e74c4 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/hooks/rtc/network/AuthenticationException.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/its/rtc/network/AuthenticationException.java
@@ -11,7 +11,7 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-package com.googlesource.gerrit.plugins.hooks.rtc.network;
+package com.googlesource.gerrit.plugins.its.rtc.network;
 
 import java.io.IOException;
 
diff --git a/src/main/java/com/googlesource/gerrit/plugins/hooks/rtc/network/CachableResourcesFactory.java b/src/main/java/com/googlesource/gerrit/plugins/its/rtc/network/CachableResourcesFactory.java
similarity index 97%
rename from src/main/java/com/googlesource/gerrit/plugins/hooks/rtc/network/CachableResourcesFactory.java
rename to src/main/java/com/googlesource/gerrit/plugins/its/rtc/network/CachableResourcesFactory.java
index 3d0a5c5..fa4a897 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/hooks/rtc/network/CachableResourcesFactory.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/its/rtc/network/CachableResourcesFactory.java
@@ -11,7 +11,7 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-package com.googlesource.gerrit.plugins.hooks.rtc.network;
+package com.googlesource.gerrit.plugins.its.rtc.network;
 
 import java.io.IOException;
 import java.util.Map;
diff --git a/src/main/java/com/googlesource/gerrit/plugins/hooks/rtc/network/HttpPatch.java b/src/main/java/com/googlesource/gerrit/plugins/its/rtc/network/HttpPatch.java
similarity index 93%
rename from src/main/java/com/googlesource/gerrit/plugins/hooks/rtc/network/HttpPatch.java
rename to src/main/java/com/googlesource/gerrit/plugins/its/rtc/network/HttpPatch.java
index 03b6ec5..4f35b3c 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/hooks/rtc/network/HttpPatch.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/its/rtc/network/HttpPatch.java
@@ -11,7 +11,7 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-package com.googlesource.gerrit.plugins.hooks.rtc.network;
+package com.googlesource.gerrit.plugins.its.rtc.network;
 
 import java.net.URI;
 
diff --git a/src/main/java/com/googlesource/gerrit/plugins/hooks/rtc/network/InvalidContentTypeException.java b/src/main/java/com/googlesource/gerrit/plugins/its/rtc/network/InvalidContentTypeException.java
similarity index 93%
rename from src/main/java/com/googlesource/gerrit/plugins/hooks/rtc/network/InvalidContentTypeException.java
rename to src/main/java/com/googlesource/gerrit/plugins/its/rtc/network/InvalidContentTypeException.java
index 67bc7cd..1a5983b 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/hooks/rtc/network/InvalidContentTypeException.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/its/rtc/network/InvalidContentTypeException.java
@@ -11,7 +11,7 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-package com.googlesource.gerrit.plugins.hooks.rtc.network;
+package com.googlesource.gerrit.plugins.its.rtc.network;
 
 import java.io.IOException;
 
diff --git a/src/main/java/com/googlesource/gerrit/plugins/hooks/rtc/network/RTCClient.java b/src/main/java/com/googlesource/gerrit/plugins/its/rtc/network/RTCClient.java
similarity index 85%
rename from src/main/java/com/googlesource/gerrit/plugins/hooks/rtc/network/RTCClient.java
rename to src/main/java/com/googlesource/gerrit/plugins/its/rtc/network/RTCClient.java
index b48fc36..cf21e55 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/hooks/rtc/network/RTCClient.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/its/rtc/network/RTCClient.java
@@ -11,7 +11,7 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-package com.googlesource.gerrit.plugins.hooks.rtc.network;
+package com.googlesource.gerrit.plugins.its.rtc.network;
 
 import java.io.IOException;
 import java.security.SecureRandom;
@@ -43,20 +43,21 @@
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.inject.Inject;
-import com.googlesource.gerrit.plugins.hooks.rtc.api.RtcEntity;
-import com.googlesource.gerrit.plugins.hooks.rtc.api.RtcEntityDeserializer;
-import com.googlesource.gerrit.plugins.hooks.rtc.session.SessionApi;
-import com.googlesource.gerrit.plugins.hooks.rtc.session.SessionApiImpl;
-import com.googlesource.gerrit.plugins.hooks.rtc.workitems.RtcComment;
-import com.googlesource.gerrit.plugins.hooks.rtc.workitems.RtcCommentDeserializer;
-import com.googlesource.gerrit.plugins.hooks.rtc.workitems.RtcRelatedLink;
-import com.googlesource.gerrit.plugins.hooks.rtc.workitems.RtcRelatedLinkDeserializer;
-import com.googlesource.gerrit.plugins.hooks.rtc.workitems.RtcWorkItem;
-import com.googlesource.gerrit.plugins.hooks.rtc.workitems.RtcWorkItemDeserializer;
-import com.googlesource.gerrit.plugins.hooks.rtc.workitems.RtcWorkflowAction;
-import com.googlesource.gerrit.plugins.hooks.rtc.workitems.RtcWorkflowActionDeserializer;
-import com.googlesource.gerrit.plugins.hooks.rtc.workitems.WorkItemsApi;
-import com.googlesource.gerrit.plugins.hooks.rtc.workitems.WorkItemsApiImpl;
+
+import com.googlesource.gerrit.plugins.its.rtc.api.RtcEntity;
+import com.googlesource.gerrit.plugins.its.rtc.api.RtcEntityDeserializer;
+import com.googlesource.gerrit.plugins.its.rtc.session.SessionApi;
+import com.googlesource.gerrit.plugins.its.rtc.session.SessionApiImpl;
+import com.googlesource.gerrit.plugins.its.rtc.workitems.RtcComment;
+import com.googlesource.gerrit.plugins.its.rtc.workitems.RtcCommentDeserializer;
+import com.googlesource.gerrit.plugins.its.rtc.workitems.RtcRelatedLink;
+import com.googlesource.gerrit.plugins.its.rtc.workitems.RtcRelatedLinkDeserializer;
+import com.googlesource.gerrit.plugins.its.rtc.workitems.RtcWorkItem;
+import com.googlesource.gerrit.plugins.its.rtc.workitems.RtcWorkItemDeserializer;
+import com.googlesource.gerrit.plugins.its.rtc.workitems.RtcWorkflowAction;
+import com.googlesource.gerrit.plugins.its.rtc.workitems.RtcWorkflowActionDeserializer;
+import com.googlesource.gerrit.plugins.its.rtc.workitems.WorkItemsApi;
+import com.googlesource.gerrit.plugins.its.rtc.workitems.WorkItemsApiImpl;
 
 public class RTCClient {
 
diff --git a/src/main/java/com/googlesource/gerrit/plugins/hooks/rtc/network/RTCHttpParams.java b/src/main/java/com/googlesource/gerrit/plugins/its/rtc/network/RTCHttpParams.java
similarity index 98%
rename from src/main/java/com/googlesource/gerrit/plugins/hooks/rtc/network/RTCHttpParams.java
rename to src/main/java/com/googlesource/gerrit/plugins/its/rtc/network/RTCHttpParams.java
index 6b885a0..c39b56d 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/hooks/rtc/network/RTCHttpParams.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/its/rtc/network/RTCHttpParams.java
@@ -11,7 +11,7 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-package com.googlesource.gerrit.plugins.hooks.rtc.network;
+package com.googlesource.gerrit.plugins.its.rtc.network;
 
 import java.util.HashMap;
 
diff --git a/src/main/java/com/googlesource/gerrit/plugins/hooks/rtc/network/Transport.java b/src/main/java/com/googlesource/gerrit/plugins/its/rtc/network/Transport.java
similarity index 98%
rename from src/main/java/com/googlesource/gerrit/plugins/hooks/rtc/network/Transport.java
rename to src/main/java/com/googlesource/gerrit/plugins/its/rtc/network/Transport.java
index e9ab550..58d0e5b 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/hooks/rtc/network/Transport.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/its/rtc/network/Transport.java
@@ -11,7 +11,7 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-package com.googlesource.gerrit.plugins.hooks.rtc.network;
+package com.googlesource.gerrit.plugins.its.rtc.network;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -44,7 +44,8 @@
 
 import com.google.gson.Gson;
 import com.google.gson.JsonObject;
-import com.googlesource.gerrit.plugins.hooks.rtc.api.ResourceNotFoundException;
+
+import com.googlesource.gerrit.plugins.its.rtc.api.ResourceNotFoundException;
 
 public class Transport {
 
diff --git a/src/main/java/com/googlesource/gerrit/plugins/hooks/rtc/session/RtcSession.java b/src/main/java/com/googlesource/gerrit/plugins/its/rtc/session/RtcSession.java
similarity index 89%
rename from src/main/java/com/googlesource/gerrit/plugins/hooks/rtc/session/RtcSession.java
rename to src/main/java/com/googlesource/gerrit/plugins/its/rtc/session/RtcSession.java
index 3648d5e..53fa529 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/hooks/rtc/session/RtcSession.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/its/rtc/session/RtcSession.java
@@ -11,12 +11,12 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-package com.googlesource.gerrit.plugins.hooks.rtc.session;
+package com.googlesource.gerrit.plugins.its.rtc.session;
 
 import java.util.Arrays;
 import java.util.List;
 
-import com.googlesource.gerrit.plugins.hooks.rtc.api.RtcObject;
+import com.googlesource.gerrit.plugins.its.rtc.api.RtcObject;
 
 
 public class RtcSession extends RtcObject {
diff --git a/src/main/java/com/googlesource/gerrit/plugins/hooks/rtc/session/SessionApi.java b/src/main/java/com/googlesource/gerrit/plugins/its/rtc/session/SessionApi.java
similarity index 92%
rename from src/main/java/com/googlesource/gerrit/plugins/hooks/rtc/session/SessionApi.java
rename to src/main/java/com/googlesource/gerrit/plugins/its/rtc/session/SessionApi.java
index 3d464ab..9a87fea 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/hooks/rtc/session/SessionApi.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/its/rtc/session/SessionApi.java
@@ -11,7 +11,7 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-package com.googlesource.gerrit.plugins.hooks.rtc.session;
+package com.googlesource.gerrit.plugins.its.rtc.session;
 
 import java.io.IOException;
 
diff --git a/src/main/java/com/googlesource/gerrit/plugins/hooks/rtc/session/SessionApiImpl.java b/src/main/java/com/googlesource/gerrit/plugins/its/rtc/session/SessionApiImpl.java
similarity index 81%
rename from src/main/java/com/googlesource/gerrit/plugins/hooks/rtc/session/SessionApiImpl.java
rename to src/main/java/com/googlesource/gerrit/plugins/its/rtc/session/SessionApiImpl.java
index 6362c48..ee61be9 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/hooks/rtc/session/SessionApiImpl.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/its/rtc/session/SessionApiImpl.java
@@ -11,16 +11,16 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-package com.googlesource.gerrit.plugins.hooks.rtc.session;
+package com.googlesource.gerrit.plugins.its.rtc.session;
 
 import java.io.IOException;
 
 import org.apache.http.message.BasicNameValuePair;
 
-import com.googlesource.gerrit.plugins.hooks.rtc.network.AuthenticationException;
-import com.googlesource.gerrit.plugins.hooks.rtc.network.RTCClient;
-import com.googlesource.gerrit.plugins.hooks.rtc.network.Transport;
-import com.googlesource.gerrit.plugins.hooks.rtc.workitems.AbstractApiImpl;
+import com.googlesource.gerrit.plugins.its.rtc.network.AuthenticationException;
+import com.googlesource.gerrit.plugins.its.rtc.network.RTCClient;
+import com.googlesource.gerrit.plugins.its.rtc.network.Transport;
+import com.googlesource.gerrit.plugins.its.rtc.workitems.AbstractApiImpl;
 
 public class SessionApiImpl extends AbstractApiImpl implements SessionApi {
 
diff --git a/src/main/java/com/googlesource/gerrit/plugins/hooks/rtc/workitems/AbstractApiImpl.java b/src/main/java/com/googlesource/gerrit/plugins/its/rtc/workitems/AbstractApiImpl.java
similarity index 87%
rename from src/main/java/com/googlesource/gerrit/plugins/hooks/rtc/workitems/AbstractApiImpl.java
rename to src/main/java/com/googlesource/gerrit/plugins/its/rtc/workitems/AbstractApiImpl.java
index 8fa6d93..df65d19 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/hooks/rtc/workitems/AbstractApiImpl.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/its/rtc/workitems/AbstractApiImpl.java
@@ -11,11 +11,11 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-package com.googlesource.gerrit.plugins.hooks.rtc.workitems;
+package com.googlesource.gerrit.plugins.its.rtc.workitems;
 
 import java.io.IOException;
 
-import com.googlesource.gerrit.plugins.hooks.rtc.network.RTCClient;
+import com.googlesource.gerrit.plugins.its.rtc.network.RTCClient;
 
 public class AbstractApiImpl {
   protected RTCClient client;
diff --git a/src/main/java/com/googlesource/gerrit/plugins/hooks/rtc/workitems/RtcComment.java b/src/main/java/com/googlesource/gerrit/plugins/its/rtc/workitems/RtcComment.java
similarity index 89%
rename from src/main/java/com/googlesource/gerrit/plugins/hooks/rtc/workitems/RtcComment.java
rename to src/main/java/com/googlesource/gerrit/plugins/its/rtc/workitems/RtcComment.java
index cc8b779..821cd48 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/hooks/rtc/workitems/RtcComment.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/its/rtc/workitems/RtcComment.java
@@ -11,11 +11,11 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-package com.googlesource.gerrit.plugins.hooks.rtc.workitems;
+package com.googlesource.gerrit.plugins.its.rtc.workitems;
 
 import java.util.Calendar;
 
-import com.googlesource.gerrit.plugins.hooks.rtc.api.RtcObject;
+import com.googlesource.gerrit.plugins.its.rtc.api.RtcObject;
 
 public class RtcComment extends RtcObject {
 
diff --git a/src/main/java/com/googlesource/gerrit/plugins/hooks/rtc/workitems/RtcCommentDeserializer.java b/src/main/java/com/googlesource/gerrit/plugins/its/rtc/workitems/RtcCommentDeserializer.java
similarity index 90%
rename from src/main/java/com/googlesource/gerrit/plugins/hooks/rtc/workitems/RtcCommentDeserializer.java
rename to src/main/java/com/googlesource/gerrit/plugins/its/rtc/workitems/RtcCommentDeserializer.java
index b088c77..aeba152 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/hooks/rtc/workitems/RtcCommentDeserializer.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/its/rtc/workitems/RtcCommentDeserializer.java
@@ -11,7 +11,7 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-package com.googlesource.gerrit.plugins.hooks.rtc.workitems;
+package com.googlesource.gerrit.plugins.its.rtc.workitems;
 
 import java.lang.reflect.Type;
 
@@ -20,7 +20,8 @@
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParseException;
-import com.googlesource.gerrit.plugins.hooks.rtc.api.AbstractDeserializer;
+
+import com.googlesource.gerrit.plugins.its.rtc.api.AbstractDeserializer;
 
 public class RtcCommentDeserializer extends AbstractDeserializer implements JsonDeserializer<RtcComment> {
 
diff --git a/src/main/java/com/googlesource/gerrit/plugins/hooks/rtc/workitems/RtcRelatedLink.java b/src/main/java/com/googlesource/gerrit/plugins/its/rtc/workitems/RtcRelatedLink.java
similarity index 87%
rename from src/main/java/com/googlesource/gerrit/plugins/hooks/rtc/workitems/RtcRelatedLink.java
rename to src/main/java/com/googlesource/gerrit/plugins/its/rtc/workitems/RtcRelatedLink.java
index 0016f3f..855f2b9 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/hooks/rtc/workitems/RtcRelatedLink.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/its/rtc/workitems/RtcRelatedLink.java
@@ -11,11 +11,11 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-package com.googlesource.gerrit.plugins.hooks.rtc.workitems;
+package com.googlesource.gerrit.plugins.its.rtc.workitems;
 
 import java.net.URL;
 
-import com.googlesource.gerrit.plugins.hooks.rtc.api.RtcObject;
+import com.googlesource.gerrit.plugins.its.rtc.api.RtcObject;
 
 public class RtcRelatedLink extends RtcObject {
 
diff --git a/src/main/java/com/googlesource/gerrit/plugins/hooks/rtc/workitems/RtcRelatedLinkDeserializer.java b/src/main/java/com/googlesource/gerrit/plugins/its/rtc/workitems/RtcRelatedLinkDeserializer.java
similarity index 92%
rename from src/main/java/com/googlesource/gerrit/plugins/hooks/rtc/workitems/RtcRelatedLinkDeserializer.java
rename to src/main/java/com/googlesource/gerrit/plugins/its/rtc/workitems/RtcRelatedLinkDeserializer.java
index 9f542d0..40d8b4f 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/hooks/rtc/workitems/RtcRelatedLinkDeserializer.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/its/rtc/workitems/RtcRelatedLinkDeserializer.java
@@ -11,7 +11,7 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-package com.googlesource.gerrit.plugins.hooks.rtc.workitems;
+package com.googlesource.gerrit.plugins.its.rtc.workitems;
 
 import java.lang.reflect.Type;
 import java.net.MalformedURLException;
@@ -22,7 +22,8 @@
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParseException;
-import com.googlesource.gerrit.plugins.hooks.rtc.api.AbstractDeserializer;
+
+import com.googlesource.gerrit.plugins.its.rtc.api.AbstractDeserializer;
 
 public class RtcRelatedLinkDeserializer extends AbstractDeserializer
     implements JsonDeserializer<RtcRelatedLink> {
diff --git a/src/main/java/com/googlesource/gerrit/plugins/hooks/rtc/workitems/RtcWorkItem.java b/src/main/java/com/googlesource/gerrit/plugins/its/rtc/workitems/RtcWorkItem.java
similarity index 89%
rename from src/main/java/com/googlesource/gerrit/plugins/hooks/rtc/workitems/RtcWorkItem.java
rename to src/main/java/com/googlesource/gerrit/plugins/its/rtc/workitems/RtcWorkItem.java
index 0963dc5..d9ada02 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/hooks/rtc/workitems/RtcWorkItem.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/its/rtc/workitems/RtcWorkItem.java
@@ -11,12 +11,12 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-package com.googlesource.gerrit.plugins.hooks.rtc.workitems;
+package com.googlesource.gerrit.plugins.its.rtc.workitems;
 
 import java.util.Calendar;
 
-import com.googlesource.gerrit.plugins.hooks.rtc.api.RtcEntity;
-import com.googlesource.gerrit.plugins.hooks.rtc.api.RtcObject;
+import com.googlesource.gerrit.plugins.its.rtc.api.RtcEntity;
+import com.googlesource.gerrit.plugins.its.rtc.api.RtcObject;
 
 
 public class RtcWorkItem extends RtcObject {
diff --git a/src/main/java/com/googlesource/gerrit/plugins/hooks/rtc/workitems/RtcWorkItemDeserializer.java b/src/main/java/com/googlesource/gerrit/plugins/its/rtc/workitems/RtcWorkItemDeserializer.java
similarity index 89%
rename from src/main/java/com/googlesource/gerrit/plugins/hooks/rtc/workitems/RtcWorkItemDeserializer.java
rename to src/main/java/com/googlesource/gerrit/plugins/its/rtc/workitems/RtcWorkItemDeserializer.java
index c7123e2..cc7e84f 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/hooks/rtc/workitems/RtcWorkItemDeserializer.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/its/rtc/workitems/RtcWorkItemDeserializer.java
@@ -11,7 +11,7 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-package com.googlesource.gerrit.plugins.hooks.rtc.workitems;
+package com.googlesource.gerrit.plugins.its.rtc.workitems;
 
 import java.io.IOException;
 import java.lang.reflect.Type;
@@ -21,9 +21,10 @@
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParseException;
-import com.googlesource.gerrit.plugins.hooks.rtc.api.AbstractDeserializer;
-import com.googlesource.gerrit.plugins.hooks.rtc.api.RtcEntity;
-import com.googlesource.gerrit.plugins.hooks.rtc.network.CachableResourcesFactory;
+
+import com.googlesource.gerrit.plugins.its.rtc.api.AbstractDeserializer;
+import com.googlesource.gerrit.plugins.its.rtc.api.RtcEntity;
+import com.googlesource.gerrit.plugins.its.rtc.network.CachableResourcesFactory;
 
 public class RtcWorkItemDeserializer extends AbstractDeserializer implements JsonDeserializer<RtcWorkItem> {
 
diff --git a/src/main/java/com/googlesource/gerrit/plugins/hooks/rtc/workitems/RtcWorkflowAction.java b/src/main/java/com/googlesource/gerrit/plugins/its/rtc/workitems/RtcWorkflowAction.java
similarity index 88%
rename from src/main/java/com/googlesource/gerrit/plugins/hooks/rtc/workitems/RtcWorkflowAction.java
rename to src/main/java/com/googlesource/gerrit/plugins/its/rtc/workitems/RtcWorkflowAction.java
index e322a3f..bf2403a 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/hooks/rtc/workitems/RtcWorkflowAction.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/its/rtc/workitems/RtcWorkflowAction.java
@@ -11,9 +11,9 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-package com.googlesource.gerrit.plugins.hooks.rtc.workitems;
+package com.googlesource.gerrit.plugins.its.rtc.workitems;
 
-import com.googlesource.gerrit.plugins.hooks.rtc.api.RtcEntity;
+import com.googlesource.gerrit.plugins.its.rtc.api.RtcEntity;
 
 public class RtcWorkflowAction extends RtcEntity {
 
diff --git a/src/main/java/com/googlesource/gerrit/plugins/hooks/rtc/workitems/RtcWorkflowActionDeserializer.java b/src/main/java/com/googlesource/gerrit/plugins/its/rtc/workitems/RtcWorkflowActionDeserializer.java
similarity index 91%
rename from src/main/java/com/googlesource/gerrit/plugins/hooks/rtc/workitems/RtcWorkflowActionDeserializer.java
rename to src/main/java/com/googlesource/gerrit/plugins/its/rtc/workitems/RtcWorkflowActionDeserializer.java
index 3fcc10f..79f9f5f 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/hooks/rtc/workitems/RtcWorkflowActionDeserializer.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/its/rtc/workitems/RtcWorkflowActionDeserializer.java
@@ -11,7 +11,7 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-package com.googlesource.gerrit.plugins.hooks.rtc.workitems;
+package com.googlesource.gerrit.plugins.its.rtc.workitems;
 
 import java.lang.reflect.Type;
 
@@ -20,7 +20,8 @@
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParseException;
-import com.googlesource.gerrit.plugins.hooks.rtc.api.AbstractDeserializer;
+
+import com.googlesource.gerrit.plugins.its.rtc.api.AbstractDeserializer;
 
 public class RtcWorkflowActionDeserializer extends AbstractDeserializer implements JsonDeserializer<RtcWorkflowAction> {
 
diff --git a/src/main/java/com/googlesource/gerrit/plugins/hooks/rtc/workitems/WorkItemsApi.java b/src/main/java/com/googlesource/gerrit/plugins/its/rtc/workitems/WorkItemsApi.java
similarity index 90%
rename from src/main/java/com/googlesource/gerrit/plugins/hooks/rtc/workitems/WorkItemsApi.java
rename to src/main/java/com/googlesource/gerrit/plugins/its/rtc/workitems/WorkItemsApi.java
index 9706341..c051a8e 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/hooks/rtc/workitems/WorkItemsApi.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/its/rtc/workitems/WorkItemsApi.java
@@ -11,13 +11,13 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-package com.googlesource.gerrit.plugins.hooks.rtc.workitems;
+package com.googlesource.gerrit.plugins.its.rtc.workitems;
 
 import java.io.IOException;
 import java.net.URL;
 import java.util.List;
 
-import com.googlesource.gerrit.plugins.hooks.rtc.api.RtcEntity;
+import com.googlesource.gerrit.plugins.its.rtc.api.RtcEntity;
 
 public interface WorkItemsApi {
 
diff --git a/src/main/java/com/googlesource/gerrit/plugins/hooks/rtc/workitems/WorkItemsApiImpl.java b/src/main/java/com/googlesource/gerrit/plugins/its/rtc/workitems/WorkItemsApiImpl.java
similarity index 92%
rename from src/main/java/com/googlesource/gerrit/plugins/hooks/rtc/workitems/WorkItemsApiImpl.java
rename to src/main/java/com/googlesource/gerrit/plugins/its/rtc/workitems/WorkItemsApiImpl.java
index 7e7af5b..cb8ae2a 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/hooks/rtc/workitems/WorkItemsApiImpl.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/its/rtc/workitems/WorkItemsApiImpl.java
@@ -11,7 +11,7 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-package com.googlesource.gerrit.plugins.hooks.rtc.workitems;
+package com.googlesource.gerrit.plugins.its.rtc.workitems;
 
 import java.io.IOException;
 import java.lang.reflect.Type;
@@ -23,10 +23,11 @@
 
 import com.google.gson.JsonObject;
 import com.google.gson.reflect.TypeToken;
-import com.googlesource.gerrit.plugins.hooks.rtc.api.ResourceInvalidException;
-import com.googlesource.gerrit.plugins.hooks.rtc.api.RtcEntity;
-import com.googlesource.gerrit.plugins.hooks.rtc.network.RTCClient;
-import com.googlesource.gerrit.plugins.hooks.rtc.network.Transport;
+
+import com.googlesource.gerrit.plugins.its.rtc.api.ResourceInvalidException;
+import com.googlesource.gerrit.plugins.its.rtc.api.RtcEntity;
+import com.googlesource.gerrit.plugins.its.rtc.network.RTCClient;
+import com.googlesource.gerrit.plugins.its.rtc.network.Transport;
 
 public class WorkItemsApiImpl extends AbstractApiImpl implements WorkItemsApi {