diff --git a/web/api/src/test/java/org/onosproject/rest/ApplicationsResourceTest.java b/web/api/src/test/java/org/onosproject/rest/resources/ApplicationsResourceTest.java
similarity index 99%
rename from web/api/src/test/java/org/onosproject/rest/ApplicationsResourceTest.java
rename to web/api/src/test/java/org/onosproject/rest/resources/ApplicationsResourceTest.java
index 762a126..29d74ab 100644
--- a/web/api/src/test/java/org/onosproject/rest/ApplicationsResourceTest.java
+++ b/web/api/src/test/java/org/onosproject/rest/resources/ApplicationsResourceTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onosproject.rest;
+package org.onosproject.rest.resources;
 
 import com.eclipsesource.json.Json;
 import com.eclipsesource.json.JsonArray;
diff --git a/web/api/src/test/java/org/onosproject/rest/BadRequestTest.java b/web/api/src/test/java/org/onosproject/rest/resources/BadRequestTest.java
similarity index 97%
rename from web/api/src/test/java/org/onosproject/rest/BadRequestTest.java
rename to web/api/src/test/java/org/onosproject/rest/resources/BadRequestTest.java
index faf483a..e1ae84c 100644
--- a/web/api/src/test/java/org/onosproject/rest/BadRequestTest.java
+++ b/web/api/src/test/java/org/onosproject/rest/resources/BadRequestTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onosproject.rest;
+package org.onosproject.rest.resources;
 
 import org.junit.Test;
 
diff --git a/web/api/src/test/java/org/onosproject/rest/ComponentConfigWebResourceTest.java b/web/api/src/test/java/org/onosproject/rest/resources/ComponentConfigWebResourceTest.java
similarity index 98%
rename from web/api/src/test/java/org/onosproject/rest/ComponentConfigWebResourceTest.java
rename to web/api/src/test/java/org/onosproject/rest/resources/ComponentConfigWebResourceTest.java
index 29353a5..49ec313 100644
--- a/web/api/src/test/java/org/onosproject/rest/ComponentConfigWebResourceTest.java
+++ b/web/api/src/test/java/org/onosproject/rest/resources/ComponentConfigWebResourceTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onosproject.rest;
+package org.onosproject.rest.resources;
 
 import com.google.common.collect.ImmutableSet;
 import org.junit.Before;
diff --git a/web/api/src/test/java/org/onosproject/rest/DeviceKeyWebResourceTest.java b/web/api/src/test/java/org/onosproject/rest/resources/DeviceKeyWebResourceTest.java
similarity index 99%
rename from web/api/src/test/java/org/onosproject/rest/DeviceKeyWebResourceTest.java
rename to web/api/src/test/java/org/onosproject/rest/resources/DeviceKeyWebResourceTest.java
index 20528b6..bc9c1ad 100644
--- a/web/api/src/test/java/org/onosproject/rest/DeviceKeyWebResourceTest.java
+++ b/web/api/src/test/java/org/onosproject/rest/resources/DeviceKeyWebResourceTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.onosproject.rest;
+package org.onosproject.rest.resources;
 
 import com.eclipsesource.json.Json;
 import com.eclipsesource.json.JsonArray;
diff --git a/web/api/src/test/java/org/onosproject/rest/DevicesResourceTest.java b/web/api/src/test/java/org/onosproject/rest/resources/DevicesResourceTest.java
similarity index 99%
rename from web/api/src/test/java/org/onosproject/rest/DevicesResourceTest.java
rename to web/api/src/test/java/org/onosproject/rest/resources/DevicesResourceTest.java
index 16e6cc0..6f3af09 100644
--- a/web/api/src/test/java/org/onosproject/rest/DevicesResourceTest.java
+++ b/web/api/src/test/java/org/onosproject/rest/resources/DevicesResourceTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onosproject.rest;
+package org.onosproject.rest.resources;
 
 import com.eclipsesource.json.Json;
 import com.eclipsesource.json.JsonArray;
diff --git a/web/api/src/test/java/org/onosproject/rest/FlowObjectiveResourceTest.java b/web/api/src/test/java/org/onosproject/rest/resources/FlowObjectiveResourceTest.java
similarity index 99%
rename from web/api/src/test/java/org/onosproject/rest/FlowObjectiveResourceTest.java
rename to web/api/src/test/java/org/onosproject/rest/resources/FlowObjectiveResourceTest.java
index 4ea3cd3..8cc8b12 100644
--- a/web/api/src/test/java/org/onosproject/rest/FlowObjectiveResourceTest.java
+++ b/web/api/src/test/java/org/onosproject/rest/resources/FlowObjectiveResourceTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onosproject.rest;
+package org.onosproject.rest.resources;
 
 import com.eclipsesource.json.Json;
 import com.eclipsesource.json.JsonObject;
diff --git a/web/api/src/test/java/org/onosproject/rest/FlowsResourceTest.java b/web/api/src/test/java/org/onosproject/rest/resources/FlowsResourceTest.java
similarity index 99%
rename from web/api/src/test/java/org/onosproject/rest/FlowsResourceTest.java
rename to web/api/src/test/java/org/onosproject/rest/resources/FlowsResourceTest.java
index 86cd447..5d9231d 100644
--- a/web/api/src/test/java/org/onosproject/rest/FlowsResourceTest.java
+++ b/web/api/src/test/java/org/onosproject/rest/resources/FlowsResourceTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onosproject.rest;
+package org.onosproject.rest.resources;
 
 import com.eclipsesource.json.Json;
 import com.eclipsesource.json.JsonArray;
diff --git a/web/api/src/test/java/org/onosproject/rest/GroupsResourceTest.java b/web/api/src/test/java/org/onosproject/rest/resources/GroupsResourceTest.java
similarity index 99%
rename from web/api/src/test/java/org/onosproject/rest/GroupsResourceTest.java
rename to web/api/src/test/java/org/onosproject/rest/resources/GroupsResourceTest.java
index 0022f60..1321893 100644
--- a/web/api/src/test/java/org/onosproject/rest/GroupsResourceTest.java
+++ b/web/api/src/test/java/org/onosproject/rest/resources/GroupsResourceTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.onosproject.rest;
+package org.onosproject.rest.resources;
 
 import com.eclipsesource.json.Json;
 import com.eclipsesource.json.JsonArray;
diff --git a/web/api/src/test/java/org/onosproject/rest/HostResourceTest.java b/web/api/src/test/java/org/onosproject/rest/resources/HostResourceTest.java
similarity index 99%
rename from web/api/src/test/java/org/onosproject/rest/HostResourceTest.java
rename to web/api/src/test/java/org/onosproject/rest/resources/HostResourceTest.java
index 85b7452..82bff4d 100644
--- a/web/api/src/test/java/org/onosproject/rest/HostResourceTest.java
+++ b/web/api/src/test/java/org/onosproject/rest/resources/HostResourceTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onosproject.rest;
+package org.onosproject.rest.resources;
 
 
 import com.eclipsesource.json.Json;
diff --git a/web/api/src/test/java/org/onosproject/rest/IntentsResourceTest.java b/web/api/src/test/java/org/onosproject/rest/resources/IntentsResourceTest.java
similarity index 99%
rename from web/api/src/test/java/org/onosproject/rest/IntentsResourceTest.java
rename to web/api/src/test/java/org/onosproject/rest/resources/IntentsResourceTest.java
index c3b7069..16abe70 100644
--- a/web/api/src/test/java/org/onosproject/rest/IntentsResourceTest.java
+++ b/web/api/src/test/java/org/onosproject/rest/resources/IntentsResourceTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onosproject.rest;
+package org.onosproject.rest.resources;
 
 import com.eclipsesource.json.Json;
 import com.eclipsesource.json.JsonArray;
diff --git a/web/api/src/test/java/org/onosproject/rest/LinksResourceTest.java b/web/api/src/test/java/org/onosproject/rest/resources/LinksResourceTest.java
similarity index 99%
rename from web/api/src/test/java/org/onosproject/rest/LinksResourceTest.java
rename to web/api/src/test/java/org/onosproject/rest/resources/LinksResourceTest.java
index ec9c4c0..7fbee73 100644
--- a/web/api/src/test/java/org/onosproject/rest/LinksResourceTest.java
+++ b/web/api/src/test/java/org/onosproject/rest/resources/LinksResourceTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onosproject.rest;
+package org.onosproject.rest.resources;
 
 import com.eclipsesource.json.Json;
 import com.eclipsesource.json.JsonArray;
diff --git a/web/api/src/test/java/org/onosproject/rest/MetersResourceTest.java b/web/api/src/test/java/org/onosproject/rest/resources/MetersResourceTest.java
similarity index 99%
rename from web/api/src/test/java/org/onosproject/rest/MetersResourceTest.java
rename to web/api/src/test/java/org/onosproject/rest/resources/MetersResourceTest.java
index 3fcf8ab..a13d0f9 100644
--- a/web/api/src/test/java/org/onosproject/rest/MetersResourceTest.java
+++ b/web/api/src/test/java/org/onosproject/rest/resources/MetersResourceTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.onosproject.rest;
+package org.onosproject.rest.resources;
 
 import com.eclipsesource.json.Json;
 import com.eclipsesource.json.JsonArray;
diff --git a/web/api/src/test/java/org/onosproject/rest/MetricsResourceTest.java b/web/api/src/test/java/org/onosproject/rest/resources/MetricsResourceTest.java
similarity index 99%
rename from web/api/src/test/java/org/onosproject/rest/MetricsResourceTest.java
rename to web/api/src/test/java/org/onosproject/rest/resources/MetricsResourceTest.java
index e445544..aff8148 100644
--- a/web/api/src/test/java/org/onosproject/rest/MetricsResourceTest.java
+++ b/web/api/src/test/java/org/onosproject/rest/resources/MetricsResourceTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onosproject.rest;
+package org.onosproject.rest.resources;
 
 import com.codahale.metrics.Counter;
 import com.codahale.metrics.Meter;
diff --git a/web/api/src/test/java/org/onosproject/rest/MulticastRouteResourceTest.java b/web/api/src/test/java/org/onosproject/rest/resources/MulticastRouteResourceTest.java
similarity index 99%
rename from web/api/src/test/java/org/onosproject/rest/MulticastRouteResourceTest.java
rename to web/api/src/test/java/org/onosproject/rest/resources/MulticastRouteResourceTest.java
index 40d380b..efb612d 100644
--- a/web/api/src/test/java/org/onosproject/rest/MulticastRouteResourceTest.java
+++ b/web/api/src/test/java/org/onosproject/rest/resources/MulticastRouteResourceTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onosproject.rest;
+package org.onosproject.rest.resources;
 
 import com.eclipsesource.json.Json;
 import com.eclipsesource.json.JsonArray;
diff --git a/web/api/src/test/java/org/onosproject/rest/resources/NetworkConfigWebResourceTest.java b/web/api/src/test/java/org/onosproject/rest/resources/NetworkConfigWebResourceTest.java
index d214ede..11da16b 100644
--- a/web/api/src/test/java/org/onosproject/rest/resources/NetworkConfigWebResourceTest.java
+++ b/web/api/src/test/java/org/onosproject/rest/resources/NetworkConfigWebResourceTest.java
@@ -34,7 +34,6 @@
 import org.onosproject.net.config.NetworkConfigService;
 import org.onosproject.net.config.NetworkConfigServiceAdapter;
 import org.onosproject.net.config.SubjectFactory;
-import org.onosproject.rest.ResourceTest;
 
 import javax.ws.rs.NotFoundException;
 import javax.ws.rs.client.WebTarget;
diff --git a/web/api/src/test/java/org/onosproject/rest/PathsResourceTest.java b/web/api/src/test/java/org/onosproject/rest/resources/PathsResourceTest.java
similarity index 99%
rename from web/api/src/test/java/org/onosproject/rest/PathsResourceTest.java
rename to web/api/src/test/java/org/onosproject/rest/resources/PathsResourceTest.java
index bf05656..473cc21 100644
--- a/web/api/src/test/java/org/onosproject/rest/PathsResourceTest.java
+++ b/web/api/src/test/java/org/onosproject/rest/resources/PathsResourceTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onosproject.rest;
+package org.onosproject.rest.resources;
 
 import com.eclipsesource.json.Json;
 import com.eclipsesource.json.JsonArray;
diff --git a/web/api/src/test/java/org/onosproject/rest/RegionsResourceTest.java b/web/api/src/test/java/org/onosproject/rest/resources/RegionsResourceTest.java
similarity index 99%
rename from web/api/src/test/java/org/onosproject/rest/RegionsResourceTest.java
rename to web/api/src/test/java/org/onosproject/rest/resources/RegionsResourceTest.java
index 6f3c179..fdc69a1 100644
--- a/web/api/src/test/java/org/onosproject/rest/RegionsResourceTest.java
+++ b/web/api/src/test/java/org/onosproject/rest/resources/RegionsResourceTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onosproject.rest;
+package org.onosproject.rest.resources;
 
 import com.eclipsesource.json.Json;
 import com.eclipsesource.json.JsonArray;
diff --git a/web/api/src/test/java/org/onosproject/rest/ResourceTest.java b/web/api/src/test/java/org/onosproject/rest/resources/ResourceTest.java
similarity index 91%
rename from web/api/src/test/java/org/onosproject/rest/ResourceTest.java
rename to web/api/src/test/java/org/onosproject/rest/resources/ResourceTest.java
index e96f5bd..1d2bb12 100644
--- a/web/api/src/test/java/org/onosproject/rest/ResourceTest.java
+++ b/web/api/src/test/java/org/onosproject/rest/resources/ResourceTest.java
@@ -13,11 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onosproject.rest;
+package org.onosproject.rest.resources;
 
 import org.glassfish.jersey.server.ResourceConfig;
 import org.glassfish.jersey.test.JerseyTest;
-import org.onosproject.rest.resources.CoreWebApplication;
 
 /**
  * Base class for REST API tests.  Performs common configuration operations.
diff --git a/web/api/src/test/java/org/onosproject/rest/StatisticsResourceTest.java b/web/api/src/test/java/org/onosproject/rest/resources/StatisticsResourceTest.java
similarity index 99%
rename from web/api/src/test/java/org/onosproject/rest/StatisticsResourceTest.java
rename to web/api/src/test/java/org/onosproject/rest/resources/StatisticsResourceTest.java
index 0d682d8..328a865 100644
--- a/web/api/src/test/java/org/onosproject/rest/StatisticsResourceTest.java
+++ b/web/api/src/test/java/org/onosproject/rest/resources/StatisticsResourceTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onosproject.rest;
+package org.onosproject.rest.resources;
 
 import com.eclipsesource.json.Json;
 import com.eclipsesource.json.JsonArray;
diff --git a/web/api/src/test/java/org/onosproject/rest/TopologyResourceTest.java b/web/api/src/test/java/org/onosproject/rest/resources/TopologyResourceTest.java
similarity index 99%
rename from web/api/src/test/java/org/onosproject/rest/TopologyResourceTest.java
rename to web/api/src/test/java/org/onosproject/rest/resources/TopologyResourceTest.java
index 9d18e2d..7515d95 100644
--- a/web/api/src/test/java/org/onosproject/rest/TopologyResourceTest.java
+++ b/web/api/src/test/java/org/onosproject/rest/resources/TopologyResourceTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onosproject.rest;
+package org.onosproject.rest.resources;
 
 import com.eclipsesource.json.Json;
 import com.eclipsesource.json.JsonArray;
diff --git a/web/api/src/test/resources/org/onosproject/rest/mcastroute.json b/web/api/src/test/resources/org/onosproject/rest/resources/mcastroute.json
similarity index 100%
rename from web/api/src/test/resources/org/onosproject/rest/mcastroute.json
rename to web/api/src/test/resources/org/onosproject/rest/resources/mcastroute.json
diff --git a/web/api/src/test/resources/org/onosproject/rest/post-device-key.json b/web/api/src/test/resources/org/onosproject/rest/resources/post-device-key.json
similarity index 100%
rename from web/api/src/test/resources/org/onosproject/rest/post-device-key.json
rename to web/api/src/test/resources/org/onosproject/rest/resources/post-device-key.json
diff --git a/web/api/src/test/resources/org/onosproject/rest/post-filter-objective.json b/web/api/src/test/resources/org/onosproject/rest/resources/post-filter-objective.json
similarity index 100%
rename from web/api/src/test/resources/org/onosproject/rest/post-filter-objective.json
rename to web/api/src/test/resources/org/onosproject/rest/resources/post-filter-objective.json
diff --git a/web/api/src/test/resources/org/onosproject/rest/post-flow.json b/web/api/src/test/resources/org/onosproject/rest/resources/post-flow.json
similarity index 100%
rename from web/api/src/test/resources/org/onosproject/rest/post-flow.json
rename to web/api/src/test/resources/org/onosproject/rest/resources/post-flow.json
diff --git a/web/api/src/test/resources/org/onosproject/rest/post-forward-objective.json b/web/api/src/test/resources/org/onosproject/rest/resources/post-forward-objective.json
similarity index 100%
rename from web/api/src/test/resources/org/onosproject/rest/post-forward-objective.json
rename to web/api/src/test/resources/org/onosproject/rest/resources/post-forward-objective.json
diff --git a/web/api/src/test/resources/org/onosproject/rest/post-group.json b/web/api/src/test/resources/org/onosproject/rest/resources/post-group.json
similarity index 100%
rename from web/api/src/test/resources/org/onosproject/rest/post-group.json
rename to web/api/src/test/resources/org/onosproject/rest/resources/post-group.json
diff --git a/web/api/src/test/resources/org/onosproject/rest/post-host.json b/web/api/src/test/resources/org/onosproject/rest/resources/post-host.json
similarity index 100%
rename from web/api/src/test/resources/org/onosproject/rest/post-host.json
rename to web/api/src/test/resources/org/onosproject/rest/resources/post-host.json
diff --git a/web/api/src/test/resources/org/onosproject/rest/post-intent.json b/web/api/src/test/resources/org/onosproject/rest/resources/post-intent.json
similarity index 100%
rename from web/api/src/test/resources/org/onosproject/rest/post-intent.json
rename to web/api/src/test/resources/org/onosproject/rest/resources/post-intent.json
diff --git a/web/api/src/test/resources/org/onosproject/rest/post-meter.json b/web/api/src/test/resources/org/onosproject/rest/resources/post-meter.json
similarity index 100%
rename from web/api/src/test/resources/org/onosproject/rest/post-meter.json
rename to web/api/src/test/resources/org/onosproject/rest/resources/post-meter.json
diff --git a/web/api/src/test/resources/org/onosproject/rest/post-next-objective.json b/web/api/src/test/resources/org/onosproject/rest/resources/post-next-objective.json
similarity index 100%
rename from web/api/src/test/resources/org/onosproject/rest/post-next-objective.json
rename to web/api/src/test/resources/org/onosproject/rest/resources/post-next-objective.json
diff --git a/web/api/src/test/resources/org/onosproject/rest/post-objective-policy.json b/web/api/src/test/resources/org/onosproject/rest/resources/post-objective-policy.json
similarity index 100%
rename from web/api/src/test/resources/org/onosproject/rest/post-objective-policy.json
rename to web/api/src/test/resources/org/onosproject/rest/resources/post-objective-policy.json
diff --git a/web/api/src/test/resources/org/onosproject/rest/post-region.json b/web/api/src/test/resources/org/onosproject/rest/resources/post-region.json
similarity index 100%
rename from web/api/src/test/resources/org/onosproject/rest/post-region.json
rename to web/api/src/test/resources/org/onosproject/rest/resources/post-region.json
diff --git a/web/api/src/test/resources/org/onosproject/rest/region-deviceIds.json b/web/api/src/test/resources/org/onosproject/rest/resources/region-deviceIds.json
similarity index 100%
rename from web/api/src/test/resources/org/onosproject/rest/region-deviceIds.json
rename to web/api/src/test/resources/org/onosproject/rest/resources/region-deviceIds.json