diff --git a/core/api/src/main/java/org/onosproject/core/ApplicationIdStore.java b/core/api/src/main/java/org/onosproject/app/ApplicationIdStore.java
similarity index 95%
rename from core/api/src/main/java/org/onosproject/core/ApplicationIdStore.java
rename to core/api/src/main/java/org/onosproject/app/ApplicationIdStore.java
index 6c62368..15595dd 100644
--- a/core/api/src/main/java/org/onosproject/core/ApplicationIdStore.java
+++ b/core/api/src/main/java/org/onosproject/app/ApplicationIdStore.java
@@ -13,8 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onosproject.core;
-// FIXME: Move to org.onosproject.app package
+package org.onosproject.app;
+
+import org.onosproject.core.ApplicationId;
 
 import java.util.Set;
 
@@ -55,5 +56,4 @@
      * @return the application id
      */
     ApplicationId registerApplication(String identifier);
-
 }
diff --git a/core/api/src/test/java/org/onosproject/core/ApplicationIdStoreAdapter.java b/core/api/src/main/java/org/onosproject/app/ApplicationIdStoreAdapter.java
similarity index 93%
rename from core/api/src/test/java/org/onosproject/core/ApplicationIdStoreAdapter.java
rename to core/api/src/main/java/org/onosproject/app/ApplicationIdStoreAdapter.java
index 6d8fd9c..324a7b4 100644
--- a/core/api/src/test/java/org/onosproject/core/ApplicationIdStoreAdapter.java
+++ b/core/api/src/main/java/org/onosproject/app/ApplicationIdStoreAdapter.java
@@ -13,7 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onosproject.core;
+package org.onosproject.app;
+
+import org.onosproject.core.ApplicationId;
 
 import java.util.Set;