diff --git a/src/main/java/net/onrc/onos/api/newintent/IntentFloodlightService.java b/src/main/java/net/onrc/onos/api/newintent/IntentFloodlightService.java
index eea36ef..dae4d53 100644
--- a/src/main/java/net/onrc/onos/api/newintent/IntentFloodlightService.java
+++ b/src/main/java/net/onrc/onos/api/newintent/IntentFloodlightService.java
@@ -6,5 +6,5 @@
  * Intent service as {@link IFloodlightService}.
  */
 public interface IntentFloodlightService
-        extends IFloodlightService, IntentService, IntentExtensionService {
+        extends IFloodlightService, IntentManager {
 }
diff --git a/src/main/java/net/onrc/onos/api/newintent/IntentManager.java b/src/main/java/net/onrc/onos/api/newintent/IntentManager.java
new file mode 100644
index 0000000..187ca1a
--- /dev/null
+++ b/src/main/java/net/onrc/onos/api/newintent/IntentManager.java
@@ -0,0 +1,7 @@
+package net.onrc.onos.api.newintent;
+
+/**
+ * An interface, which mixes Intent Service and Intent Extension Service.
+ */
+public interface IntentManager extends IntentService, IntentExtensionService {
+}
diff --git a/src/main/java/net/onrc/onos/core/newintent/IntentManager.java b/src/main/java/net/onrc/onos/core/newintent/IntentManager.java
deleted file mode 100644
index c272dc2..0000000
--- a/src/main/java/net/onrc/onos/core/newintent/IntentManager.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package net.onrc.onos.core.newintent;
-
-import net.onrc.onos.api.newintent.IntentExtensionService;
-import net.onrc.onos.api.newintent.IntentService;
-
-/**
- * An interface, which mixes Intent Service and Intent Extension Service.
- */
-public interface IntentManager extends IntentService, IntentExtensionService {
-}
diff --git a/src/main/java/net/onrc/onos/core/newintent/IntentManagerRuntime.java b/src/main/java/net/onrc/onos/core/newintent/IntentManagerRuntime.java
index b4f7313..f4ea1e3 100644
--- a/src/main/java/net/onrc/onos/core/newintent/IntentManagerRuntime.java
+++ b/src/main/java/net/onrc/onos/core/newintent/IntentManagerRuntime.java
@@ -11,6 +11,7 @@
 import net.onrc.onos.api.newintent.IntentException;
 import net.onrc.onos.api.newintent.IntentId;
 import net.onrc.onos.api.newintent.IntentInstaller;
+import net.onrc.onos.api.newintent.IntentManager;
 import net.onrc.onos.api.newintent.IntentOperations;
 import net.onrc.onos.api.newintent.IntentState;
 import net.onrc.onos.core.datagrid.ISharedCollectionsService;
diff --git a/src/test/java/net/onrc/onos/api/newintent/TestableIntentService.java b/src/test/java/net/onrc/onos/api/newintent/TestableIntentService.java
index ea1b187..8e601ec 100644
--- a/src/test/java/net/onrc/onos/api/newintent/TestableIntentService.java
+++ b/src/test/java/net/onrc/onos/api/newintent/TestableIntentService.java
@@ -1,7 +1,5 @@
 package net.onrc.onos.api.newintent;
 
-import net.onrc.onos.core.newintent.IntentManager;
-
 import java.util.List;
 
 /**