diff --git a/core/api/src/main/java/org/onosproject/net/resource/device/IntentSetMultimap.java b/core/api/src/main/java/org/onosproject/net/intent/IntentSetMultimap.java
similarity index 90%
rename from core/api/src/main/java/org/onosproject/net/resource/device/IntentSetMultimap.java
rename to core/api/src/main/java/org/onosproject/net/intent/IntentSetMultimap.java
index f17bfb8..dcbad96 100644
--- a/core/api/src/main/java/org/onosproject/net/resource/device/IntentSetMultimap.java
+++ b/core/api/src/main/java/org/onosproject/net/intent/IntentSetMultimap.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Open Networking Laboratory
+ * Copyright 2015-2016 Open Networking Laboratory
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,10 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onosproject.net.resource.device;
+package org.onosproject.net.intent;
 
 import com.google.common.annotations.Beta;
-import org.onosproject.net.intent.IntentId;
 
 import java.util.Set;
 
diff --git a/core/api/src/main/java/org/onosproject/net/resource/device/package-info.java b/core/api/src/main/java/org/onosproject/net/resource/device/package-info.java
deleted file mode 100644
index 3ced37d..0000000
--- a/core/api/src/main/java/org/onosproject/net/resource/device/package-info.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Copyright 2015 Open Networking Laboratory
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * 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.
- */
-
-/**
- * Services for reserving devices as network resources.
- */
-package org.onosproject.net.resource.device;