diff --git a/lib/core/decision_service/index.tests.js b/lib/core/decision_service/index.tests.js
index 2ad87e07d..046850db9 100644
--- a/lib/core/decision_service/index.tests.js
+++ b/lib/core/decision_service/index.tests.js
@@ -26,7 +26,7 @@ import {
 } from '../../utils/enums';
 import { createLogger } from '../../plugins/logger';
 import { getForwardingEventProcessor } from '../../event_processor/forwarding_event_processor';
-import { createNotificationCenter } from '../notification_center';
+import { createNotificationCenter } from '../../notification_center';
 import Optimizely from '../../optimizely';
 import OptimizelyUserContext from '../../optimizely_user_context';
 import projectConfig, { createProjectConfig } from '../../project_config/project_config';
diff --git a/lib/index.browser.ts b/lib/index.browser.ts
index 521cc773f..2a889c339 100644
--- a/lib/index.browser.ts
+++ b/lib/index.browser.ts
@@ -22,7 +22,7 @@ import defaultEventDispatcher from './event_processor/event_dispatcher/default_d
 import sendBeaconEventDispatcher from './event_processor/event_dispatcher/send_beacon_dispatcher.browser';
 import * as enums from './utils/enums';
 import * as loggerPlugin from './plugins/logger';
-import { createNotificationCenter } from './core/notification_center';
+import { createNotificationCenter } from './notification_center';
 import { OptimizelyDecideOption, Client, Config, OptimizelyOptions } from './shared_types';
 import { BrowserOdpManager } from './plugins/odp_manager/index.browser';
 import Optimizely from './optimizely';
diff --git a/lib/index.lite.ts b/lib/index.lite.ts
index 5aec89ecb..a7cc7cf22 100644
--- a/lib/index.lite.ts
+++ b/lib/index.lite.ts
@@ -26,7 +26,7 @@ import defaultErrorHandler from './plugins/error_handler';
 import * as enums from './utils/enums';
 import * as loggerPlugin from './plugins/logger';
 import Optimizely from './optimizely';
-import { createNotificationCenter } from './core/notification_center';
+import { createNotificationCenter } from './notification_center';
 import { OptimizelyDecideOption, Client, ConfigLite } from './shared_types';
 import * as commonExports from './common_exports';
   
diff --git a/lib/index.node.ts b/lib/index.node.ts
index 606f3aa55..0904c0142 100644
--- a/lib/index.node.ts
+++ b/lib/index.node.ts
@@ -21,7 +21,7 @@ import * as loggerPlugin from './plugins/logger';
 import configValidator from './utils/config_validator';
 import defaultErrorHandler from './plugins/error_handler';
 import defaultEventDispatcher from './event_processor/event_dispatcher/default_dispatcher.node';
-import { createNotificationCenter } from './core/notification_center';
+import { createNotificationCenter } from './notification_center';
 import { OptimizelyDecideOption, Client, Config } from './shared_types';
 import { NodeOdpManager } from './plugins/odp_manager/index.node';
 import * as commonExports from './common_exports';
diff --git a/lib/index.react_native.ts b/lib/index.react_native.ts
index eda80e4e8..2736e40a8 100644
--- a/lib/index.react_native.ts
+++ b/lib/index.react_native.ts
@@ -21,7 +21,7 @@ import configValidator from './utils/config_validator';
 import defaultErrorHandler from './plugins/error_handler';
 import * as loggerPlugin from './plugins/logger/index.react_native';
 import defaultEventDispatcher from './event_processor/event_dispatcher/default_dispatcher.browser';
-import { createNotificationCenter } from './core/notification_center';
+import { createNotificationCenter } from './notification_center';
 import { OptimizelyDecideOption, Client, Config } from './shared_types';
 import { BrowserOdpManager } from './plugins/odp_manager/index.browser';
 import * as commonExports from './common_exports';
diff --git a/lib/core/notification_center/index.tests.js b/lib/notification_center/index.tests.js
similarity index 99%
rename from lib/core/notification_center/index.tests.js
rename to lib/notification_center/index.tests.js
index 79dc2fd5f..e1459af41 100644
--- a/lib/core/notification_center/index.tests.js
+++ b/lib/notification_center/index.tests.js
@@ -17,9 +17,9 @@ import sinon from 'sinon';
 import { assert } from 'chai';
 
 import { createNotificationCenter } from './';
-import * as enums from '../../utils/enums';
-import { createLogger } from '../../plugins/logger';
-import errorHandler from '../../plugins/error_handler';
+import * as enums from '../utils/enums';
+import { createLogger } from '../plugins/logger';
+import errorHandler from '../plugins/error_handler';
 
 var LOG_LEVEL = enums.LOG_LEVEL;
 
diff --git a/lib/core/notification_center/index.ts b/lib/notification_center/index.ts
similarity index 97%
rename from lib/core/notification_center/index.ts
rename to lib/notification_center/index.ts
index a0a91dffe..ee2135104 100644
--- a/lib/core/notification_center/index.ts
+++ b/lib/notification_center/index.ts
@@ -13,15 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { LogHandler, ErrorHandler } from '../../modules/logging';
-import { objectValues } from '../../utils/fns';
-import { NotificationListener, ListenerPayload } from '../../shared_types';
+import { LogHandler, ErrorHandler } from '../modules/logging';
+import { objectValues } from '../utils/fns';
+import { NotificationListener, ListenerPayload } from '../shared_types';
 
 import {
   LOG_LEVEL,
   LOG_MESSAGES,
   NOTIFICATION_TYPES,
-} from '../../utils/enums';
+} from '../utils/enums';
 
 const MODULE_NAME = 'NOTIFICATION_CENTER';
 
diff --git a/lib/optimizely/index.spec.ts b/lib/optimizely/index.spec.ts
index a4b88017f..ee1525e2d 100644
--- a/lib/optimizely/index.spec.ts
+++ b/lib/optimizely/index.spec.ts
@@ -20,7 +20,7 @@ import { getMockProjectConfigManager } from '../tests/mock/mock_project_config_m
 import * as logger from '../plugins/logger';
 import * as jsonSchemaValidator from '../utils/json_schema_validator';
 import { LOG_LEVEL } from '../common_exports';
-import { createNotificationCenter } from '../core/notification_center';
+import { createNotificationCenter } from '../notification_center';
 import testData from '../tests/test_data';
 import { getForwardingEventProcessor } from '../event_processor/forwarding_event_processor';
 import { LoggerFacade } from '../modules/logging';
diff --git a/lib/optimizely/index.tests.js b/lib/optimizely/index.tests.js
index 00e9d69cc..e7fc378f7 100644
--- a/lib/optimizely/index.tests.js
+++ b/lib/optimizely/index.tests.js
@@ -34,7 +34,7 @@ import * as jsonSchemaValidator from '../utils/json_schema_validator';
 import * as projectConfig from '../project_config/project_config';
 import testData from '../tests/test_data';
 import { getForwardingEventProcessor } from '../event_processor/forwarding_event_processor';
-import { createNotificationCenter } from '../core/notification_center';
+import { createNotificationCenter } from '../notification_center';
 import { createProjectConfig } from '../project_config/project_config';
 import { getMockProjectConfigManager } from '../tests/mock/mock_project_config_manager';
 
diff --git a/lib/optimizely/index.ts b/lib/optimizely/index.ts
index cb15e1ed3..8833c92b2 100644
--- a/lib/optimizely/index.ts
+++ b/lib/optimizely/index.ts
@@ -16,7 +16,7 @@
 
 import { LoggerFacade, ErrorHandler } from '../modules/logging';
 import { sprintf, objectValues } from '../utils/fns';
-import { NotificationCenter } from '../core/notification_center';
+import { NotificationCenter } from '../notification_center';
 import { EventProcessor } from '../event_processor/event_processor';
 
 import { IOdpManager } from '../core/odp/odp_manager';
diff --git a/lib/optimizely_user_context/index.tests.js b/lib/optimizely_user_context/index.tests.js
index 0e169fa7b..a895d928d 100644
--- a/lib/optimizely_user_context/index.tests.js
+++ b/lib/optimizely_user_context/index.tests.js
@@ -23,7 +23,7 @@ import { NOTIFICATION_TYPES } from '../utils/enums';
 
 import OptimizelyUserContext from './';
 import { createLogger } from '../plugins/logger';
-import { createNotificationCenter } from '../core/notification_center';
+import { createNotificationCenter } from '../notification_center';
 import Optimizely from '../optimizely';
 import errorHandler from '../plugins/error_handler';
 import { CONTROL_ATTRIBUTES, LOG_LEVEL, LOG_MESSAGES } from '../utils/enums';
diff --git a/lib/shared_types.ts b/lib/shared_types.ts
index bf3d238df..e8ed60e8b 100644
--- a/lib/shared_types.ts
+++ b/lib/shared_types.ts
@@ -21,7 +21,7 @@
 
 import { ErrorHandler, LogHandler, LogLevel, LoggerFacade } from './modules/logging';
 
-import { NotificationCenter as NotificationCenterImpl } from './core/notification_center';
+import { NotificationCenter as NotificationCenterImpl } from './notification_center';
 import { NOTIFICATION_TYPES } from './utils/enums';
 
 import { IOptimizelyUserContext as OptimizelyUserContext } from './optimizely_user_context';