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/main/java/org/onosproject/app/ApplicationIdStoreAdapter.java b/core/api/src/main/java/org/onosproject/app/ApplicationIdStoreAdapter.java
new file mode 100644
index 0000000..324a7b4
--- /dev/null
+++ b/core/api/src/main/java/org/onosproject/app/ApplicationIdStoreAdapter.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2015-present 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.
+ */
+package org.onosproject.app;
+
+import org.onosproject.core.ApplicationId;
+
+import java.util.Set;
+
+/**
+ * Adapter for testing against app id store.
+ */
+public class ApplicationIdStoreAdapter implements ApplicationIdStore {
+    @Override
+    public Set<ApplicationId> getAppIds() {
+        return null;
+    }
+
+    @Override
+    public ApplicationId getAppId(Short id) {
+        return null;
+    }
+
+    @Override
+    public ApplicationId getAppId(String name) {
+        return null;
+    }
+
+    @Override
+    public ApplicationId registerApplication(String identifier) {
+        return null;
+    }
+}