diff --git a/core/net/src/main/java/org/onosproject/net/intent/impl/LinkCollectionIntentInstaller.java b/core/net/src/main/java/org/onosproject/net/intent/impl/installer/LinkCollectionIntentInstaller.java
similarity index 99%
rename from core/net/src/main/java/org/onosproject/net/intent/impl/LinkCollectionIntentInstaller.java
rename to core/net/src/main/java/org/onosproject/net/intent/impl/installer/LinkCollectionIntentInstaller.java
index 0d788e5..54ff5fc 100644
--- a/core/net/src/main/java/org/onosproject/net/intent/impl/LinkCollectionIntentInstaller.java
+++ b/core/net/src/main/java/org/onosproject/net/intent/impl/installer/LinkCollectionIntentInstaller.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onosproject.net.intent.impl;
+package org.onosproject.net.intent.impl.installer;
 
 import com.google.common.collect.HashMultimap;
 import com.google.common.collect.ImmutableSet;
diff --git a/core/net/src/main/java/org/onosproject/net/intent/impl/MplsPathIntentInstaller.java b/core/net/src/main/java/org/onosproject/net/intent/impl/installer/MplsPathIntentInstaller.java
similarity index 99%
rename from core/net/src/main/java/org/onosproject/net/intent/impl/MplsPathIntentInstaller.java
rename to core/net/src/main/java/org/onosproject/net/intent/impl/installer/MplsPathIntentInstaller.java
index 5b7ef1a..dbe9233 100644
--- a/core/net/src/main/java/org/onosproject/net/intent/impl/MplsPathIntentInstaller.java
+++ b/core/net/src/main/java/org/onosproject/net/intent/impl/installer/MplsPathIntentInstaller.java
@@ -1,4 +1,4 @@
-package org.onosproject.net.intent.impl;
+package org.onosproject.net.intent.impl.installer;
 
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Lists;
diff --git a/core/net/src/main/java/org/onosproject/net/intent/impl/OpticalPathIntentInstaller.java b/core/net/src/main/java/org/onosproject/net/intent/impl/installer/OpticalPathIntentInstaller.java
similarity index 99%
rename from core/net/src/main/java/org/onosproject/net/intent/impl/OpticalPathIntentInstaller.java
rename to core/net/src/main/java/org/onosproject/net/intent/impl/installer/OpticalPathIntentInstaller.java
index 9dea575..5fa4d49 100644
--- a/core/net/src/main/java/org/onosproject/net/intent/impl/OpticalPathIntentInstaller.java
+++ b/core/net/src/main/java/org/onosproject/net/intent/impl/installer/OpticalPathIntentInstaller.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onosproject.net.intent.impl;
+package org.onosproject.net.intent.impl.installer;
 
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Lists;
diff --git a/core/net/src/main/java/org/onosproject/net/intent/impl/PathIntentInstaller.java b/core/net/src/main/java/org/onosproject/net/intent/impl/installer/PathIntentInstaller.java
similarity index 99%
rename from core/net/src/main/java/org/onosproject/net/intent/impl/PathIntentInstaller.java
rename to core/net/src/main/java/org/onosproject/net/intent/impl/installer/PathIntentInstaller.java
index 47ffabe..5230736 100644
--- a/core/net/src/main/java/org/onosproject/net/intent/impl/PathIntentInstaller.java
+++ b/core/net/src/main/java/org/onosproject/net/intent/impl/installer/PathIntentInstaller.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onosproject.net.intent.impl;
+package org.onosproject.net.intent.impl.installer;
 
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Lists;
diff --git a/core/net/src/test/java/org/onosproject/net/intent/impl/IntentInstallerTest.java b/core/net/src/test/java/org/onosproject/net/intent/impl/installer/IntentInstallerTest.java
similarity index 98%
rename from core/net/src/test/java/org/onosproject/net/intent/impl/IntentInstallerTest.java
rename to core/net/src/test/java/org/onosproject/net/intent/impl/installer/IntentInstallerTest.java
index b80ef2f..e6c723c 100644
--- a/core/net/src/test/java/org/onosproject/net/intent/impl/IntentInstallerTest.java
+++ b/core/net/src/test/java/org/onosproject/net/intent/impl/installer/IntentInstallerTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onosproject.net.intent.impl;
+package org.onosproject.net.intent.impl.installer;
 
 import org.junit.After;
 import org.junit.Before;
diff --git a/core/net/src/test/java/org/onosproject/net/intent/impl/LinkCollectionIntentInstallerTest.java b/core/net/src/test/java/org/onosproject/net/intent/impl/installer/LinkCollectionIntentInstallerTest.java
similarity index 98%
rename from core/net/src/test/java/org/onosproject/net/intent/impl/LinkCollectionIntentInstallerTest.java
rename to core/net/src/test/java/org/onosproject/net/intent/impl/installer/LinkCollectionIntentInstallerTest.java
index e8e7c71..9f88fa6 100644
--- a/core/net/src/test/java/org/onosproject/net/intent/impl/LinkCollectionIntentInstallerTest.java
+++ b/core/net/src/test/java/org/onosproject/net/intent/impl/installer/LinkCollectionIntentInstallerTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onosproject.net.intent.impl;
+package org.onosproject.net.intent.impl.installer;
 
 import java.util.Collection;
 import java.util.List;
diff --git a/core/net/src/test/java/org/onosproject/net/intent/impl/MplsPathIntentInstallerTest.java b/core/net/src/test/java/org/onosproject/net/intent/impl/installer/MplsPathIntentInstallerTest.java
similarity index 98%
rename from core/net/src/test/java/org/onosproject/net/intent/impl/MplsPathIntentInstallerTest.java
rename to core/net/src/test/java/org/onosproject/net/intent/impl/installer/MplsPathIntentInstallerTest.java
index d091b9a..a0e635f 100644
--- a/core/net/src/test/java/org/onosproject/net/intent/impl/MplsPathIntentInstallerTest.java
+++ b/core/net/src/test/java/org/onosproject/net/intent/impl/installer/MplsPathIntentInstallerTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onosproject.net.intent.impl;
+package org.onosproject.net.intent.impl.installer;
 
 import java.util.Arrays;
 import java.util.Collection;
diff --git a/core/net/src/test/java/org/onosproject/net/intent/impl/PathConstraintCalculationTest.java b/core/net/src/test/java/org/onosproject/net/intent/impl/installer/PathConstraintCalculationTest.java
similarity index 99%
rename from core/net/src/test/java/org/onosproject/net/intent/impl/PathConstraintCalculationTest.java
rename to core/net/src/test/java/org/onosproject/net/intent/impl/installer/PathConstraintCalculationTest.java
index f69bf27..0ae5903 100644
--- a/core/net/src/test/java/org/onosproject/net/intent/impl/PathConstraintCalculationTest.java
+++ b/core/net/src/test/java/org/onosproject/net/intent/impl/installer/PathConstraintCalculationTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onosproject.net.intent.impl;
+package org.onosproject.net.intent.impl.installer;
 
 import org.junit.Before;
 import org.junit.Test;
diff --git a/core/net/src/test/java/org/onosproject/net/intent/impl/PathIntentInstallerTest.java b/core/net/src/test/java/org/onosproject/net/intent/impl/installer/PathIntentInstallerTest.java
similarity index 98%
rename from core/net/src/test/java/org/onosproject/net/intent/impl/PathIntentInstallerTest.java
rename to core/net/src/test/java/org/onosproject/net/intent/impl/installer/PathIntentInstallerTest.java
index ecdee64..39febcc 100644
--- a/core/net/src/test/java/org/onosproject/net/intent/impl/PathIntentInstallerTest.java
+++ b/core/net/src/test/java/org/onosproject/net/intent/impl/installer/PathIntentInstallerTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onosproject.net.intent.impl;
+package org.onosproject.net.intent.impl.installer;
 
 import java.util.Arrays;
 import java.util.Collection;