diff --git a/packages/core-api/src/app/FeatureFlags.test.tsx b/packages/core-api/src/apis/implementations/FeatureFlagsApi/LocalStorageFeatureFlags.test.tsx
similarity index 98%
rename from packages/core-api/src/app/FeatureFlags.test.tsx
rename to packages/core-api/src/apis/implementations/FeatureFlagsApi/LocalStorageFeatureFlags.test.tsx
index 02641d6d18..2902e399c9 100644
--- a/packages/core-api/src/app/FeatureFlags.test.tsx
+++ b/packages/core-api/src/apis/implementations/FeatureFlagsApi/LocalStorageFeatureFlags.test.tsx
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-import { LocalStorageFeatureFlags } from './FeatureFlags';
-import { FeatureFlagState, FeatureFlagsApi } from '../apis/definitions';
+import { LocalStorageFeatureFlags } from './LocalStorageFeatureFlags';
+import { FeatureFlagState, FeatureFlagsApi } from '../../definitions';
 
 describe('FeatureFlags', () => {
   beforeEach(() => {
diff --git a/packages/core-api/src/app/FeatureFlags.tsx b/packages/core-api/src/apis/implementations/FeatureFlagsApi/LocalStorageFeatureFlags.tsx
similarity index 99%
rename from packages/core-api/src/app/FeatureFlags.tsx
rename to packages/core-api/src/apis/implementations/FeatureFlagsApi/LocalStorageFeatureFlags.tsx
index 73215481b7..00b3eff906 100644
--- a/packages/core-api/src/app/FeatureFlags.tsx
+++ b/packages/core-api/src/apis/implementations/FeatureFlagsApi/LocalStorageFeatureFlags.tsx
@@ -19,7 +19,7 @@ import {
   FeatureFlagsApi,
   FeatureFlag,
   FeatureFlagsSaveOptions,
-} from '../apis/definitions';
+} from '../../definitions';
 
 export function validateFlagName(name: string): void {
   if (name.length < 3) {
diff --git a/packages/core-api/src/apis/implementations/FeatureFlagsApi/index.ts b/packages/core-api/src/apis/implementations/FeatureFlagsApi/index.ts
new file mode 100644
index 0000000000..33990584f3
--- /dev/null
+++ b/packages/core-api/src/apis/implementations/FeatureFlagsApi/index.ts
@@ -0,0 +1,17 @@
+/*
+ * Copyright 2020 Spotify AB
+ *
+ * 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.
+ */
+
+export { LocalStorageFeatureFlags } from './LocalStorageFeatureFlags';
diff --git a/packages/core-api/src/apis/implementations/index.ts b/packages/core-api/src/apis/implementations/index.ts
index 30aeb81d44..d0df2760ab 100644
--- a/packages/core-api/src/apis/implementations/index.ts
+++ b/packages/core-api/src/apis/implementations/index.ts
@@ -23,7 +23,8 @@ export * from './auth';
 export * from './AlertApi';
 export * from './AppThemeApi';
 export * from './ConfigApi';
-export * from './ErrorApi';
 export * from './DiscoveryApi';
+export * from './ErrorApi';
+export * from './FeatureFlagsApi';
 export * from './OAuthRequestApi';
 export * from './StorageApi';
diff --git a/packages/core-api/src/app/App.tsx b/packages/core-api/src/app/App.tsx
index 91b55a7d2e..9c38c20b44 100644
--- a/packages/core-api/src/app/App.tsx
+++ b/packages/core-api/src/app/App.tsx
@@ -50,11 +50,11 @@ import {
   useApi,
   AnyApiFactory,
   ApiHolder,
+  LocalStorageFeatureFlags,
 } from '../apis';
 import { useAsync } from 'react-use';
 import { AppIdentity } from './AppIdentity';
 import { ApiResolver, ApiFactoryRegistry } from '../apis/system';
-import { LocalStorageFeatureFlags } from './FeatureFlags';
 
 type FullAppOptions = {
   apis: Iterable<AnyApiFactory>;