From bd47e227d13dba6e169657fe8b7801cda11e65c3 Mon Sep 17 00:00:00 2001
From: Raju Ahmed <raju.ahmed@optimizely.com>
Date: Tue, 26 Nov 2024 19:31:48 +0600
Subject: [PATCH] [FSSDK-10941] event processor files and directories cleanup -
 part 3

---
 lib/core/decision_service/index.tests.js                    | 2 +-
 .../batch_event_processor.react_native.spec.ts              | 2 +-
 lib/event_processor/batch_event_processor.spec.ts           | 2 +-
 lib/event_processor/batch_event_processor.ts                | 2 +-
 lib/event_processor/event_builder/log_event.ts              | 2 +-
 .../default_dispatcher.browser.spec.ts                      | 4 ++--
 .../{ => event_dispatcher}/default_dispatcher.browser.ts    | 2 +-
 .../{ => event_dispatcher}/default_dispatcher.node.spec.ts  | 4 ++--
 .../{ => event_dispatcher}/default_dispatcher.node.ts       | 2 +-
 .../{ => event_dispatcher}/default_dispatcher.spec.ts       | 2 +-
 .../{ => event_dispatcher}/default_dispatcher.ts            | 2 +-
 .../{ => event_dispatcher}/event_dispatcher.ts              | 2 +-
 .../send_beacon_dispatcher.browser.spec.ts                  | 0
 .../send_beacon_dispatcher.browser.ts                       | 0
 lib/event_processor/event_processor.ts                      | 2 +-
 lib/event_processor/event_processor_factory.browser.spec.ts | 6 +++---
 lib/event_processor/event_processor_factory.browser.ts      | 6 +++---
 lib/event_processor/event_processor_factory.node.spec.ts    | 2 +-
 lib/event_processor/event_processor_factory.node.ts         | 4 ++--
 .../event_processor_factory.react_native.spec.ts            | 2 +-
 lib/event_processor/event_processor_factory.react_native.ts | 4 ++--
 lib/event_processor/event_processor_factory.ts              | 2 +-
 lib/event_processor/forwarding_event_processor.spec.ts      | 4 ++--
 lib/event_processor/forwarding_event_processor.ts           | 2 +-
 lib/index.browser.ts                                        | 4 ++--
 lib/index.node.ts                                           | 2 +-
 lib/index.react_native.ts                                   | 2 +-
 lib/shared_types.ts                                         | 4 ++--
 28 files changed, 37 insertions(+), 37 deletions(-)
 rename lib/event_processor/{ => event_dispatcher}/default_dispatcher.browser.spec.ts (90%)
 rename lib/event_processor/{ => event_dispatcher}/default_dispatcher.browser.ts (89%)
 rename lib/event_processor/{ => event_dispatcher}/default_dispatcher.node.spec.ts (91%)
 rename lib/event_processor/{ => event_dispatcher}/default_dispatcher.node.ts (90%)
 rename lib/event_processor/{ => event_dispatcher}/default_dispatcher.spec.ts (98%)
 rename lib/event_processor/{ => event_dispatcher}/default_dispatcher.ts (95%)
 rename lib/event_processor/{ => event_dispatcher}/event_dispatcher.ts (93%)
 rename lib/event_processor/{ => event_dispatcher}/send_beacon_dispatcher.browser.spec.ts (100%)
 rename lib/event_processor/{ => event_dispatcher}/send_beacon_dispatcher.browser.ts (100%)

diff --git a/lib/core/decision_service/index.tests.js b/lib/core/decision_service/index.tests.js
index 9ce0337e3..2ad87e07d 100644
--- a/lib/core/decision_service/index.tests.js
+++ b/lib/core/decision_service/index.tests.js
@@ -32,7 +32,7 @@ import OptimizelyUserContext from '../../optimizely_user_context';
 import projectConfig, { createProjectConfig } from '../../project_config/project_config';
 import AudienceEvaluator from '../audience_evaluator';
 import errorHandler from '../../plugins/error_handler';
-import eventDispatcher from '../../event_processor/default_dispatcher.browser';
+import eventDispatcher from '../../event_processor/event_dispatcher/default_dispatcher.browser';
 import * as jsonSchemaValidator from '../../utils/json_schema_validator';
 import { getMockProjectConfigManager } from '../../tests/mock/mock_project_config_manager';
 
diff --git a/lib/event_processor/batch_event_processor.react_native.spec.ts b/lib/event_processor/batch_event_processor.react_native.spec.ts
index b2b50fe0f..a30717d12 100644
--- a/lib/event_processor/batch_event_processor.react_native.spec.ts
+++ b/lib/event_processor/batch_event_processor.react_native.spec.ts
@@ -50,7 +50,7 @@ import { getMockRepeater } from '../tests/mock/mock_repeater';
 import { getMockAsyncCache } from '../tests/mock/mock_cache';
 
 import { EventWithId } from './batch_event_processor';
-import { buildLogEvent } from './event_builder/build_event_v1';
+import { buildLogEvent } from './event_builder/log_event';
 import { createImpressionEvent } from '../tests/mock/create_event';
 import { ProcessableEvent } from './event_processor';
 
diff --git a/lib/event_processor/batch_event_processor.spec.ts b/lib/event_processor/batch_event_processor.spec.ts
index 61318b92c..da02908ed 100644
--- a/lib/event_processor/batch_event_processor.spec.ts
+++ b/lib/event_processor/batch_event_processor.spec.ts
@@ -19,7 +19,7 @@ import { EventWithId, BatchEventProcessor } from './batch_event_processor';
 import { getMockSyncCache } from '../tests/mock/mock_cache';
 import { createImpressionEvent } from '../tests/mock/create_event';
 import { ProcessableEvent } from './event_processor';
-import { buildLogEvent } from './event_builder/build_event_v1';
+import { buildLogEvent } from './event_builder/log_event';
 import { resolvablePromise } from '../utils/promise/resolvablePromise';
 import { advanceTimersByTime } from  '../../tests/testUtils';
 import { getMockLogger } from '../tests/mock/mock_logger';
diff --git a/lib/event_processor/batch_event_processor.ts b/lib/event_processor/batch_event_processor.ts
index 287510b46..f37708521 100644
--- a/lib/event_processor/batch_event_processor.ts
+++ b/lib/event_processor/batch_event_processor.ts
@@ -16,7 +16,7 @@
 
 import { EventProcessor, ProcessableEvent } from "./event_processor";
 import { Cache } from "../utils/cache/cache";
-import { EventDispatcher, EventDispatcherResponse, LogEvent } from "./event_dispatcher";
+import { EventDispatcher, EventDispatcherResponse, LogEvent } from "./event_dispatcher/event_dispatcher";
 import { buildLogEvent } from "./event_builder/log_event";
 import { BackoffController, ExponentialBackoff, IntervalRepeater, Repeater } from "../utils/repeater/repeater";
 import { LoggerFacade } from "../modules/logging";
diff --git a/lib/event_processor/event_builder/log_event.ts b/lib/event_processor/event_builder/log_event.ts
index d648690da..520ab4d0b 100644
--- a/lib/event_processor/event_builder/log_event.ts
+++ b/lib/event_processor/event_builder/log_event.ts
@@ -20,7 +20,7 @@ import {
   UserEvent,
 } from './user_event';
 
-import { LogEvent } from '../event_dispatcher';
+import { LogEvent } from '../event_dispatcher/event_dispatcher';
 
 const ACTIVATE_EVENT_KEY = 'campaign_activated'
 const CUSTOM_ATTRIBUTE_FEATURE_TYPE = 'custom'
diff --git a/lib/event_processor/default_dispatcher.browser.spec.ts b/lib/event_processor/event_dispatcher/default_dispatcher.browser.spec.ts
similarity index 90%
rename from lib/event_processor/default_dispatcher.browser.spec.ts
rename to lib/event_processor/event_dispatcher/default_dispatcher.browser.spec.ts
index 4c35e39a7..bf83ca13b 100644
--- a/lib/event_processor/default_dispatcher.browser.spec.ts
+++ b/lib/event_processor/event_dispatcher/default_dispatcher.browser.spec.ts
@@ -21,13 +21,13 @@ vi.mock('./default_dispatcher', () => {
   return { DefaultEventDispatcher };
 });
 
-vi.mock('../utils/http_request_handler/browser_request_handler', () => {
+vi.mock('../../utils/http_request_handler/browser_request_handler', () => {
   const BrowserRequestHandler = vi.fn();
   return { BrowserRequestHandler };
 });
 
 import { DefaultEventDispatcher } from './default_dispatcher';
-import { BrowserRequestHandler } from '../utils/http_request_handler/browser_request_handler';
+import { BrowserRequestHandler } from '../../utils/http_request_handler/browser_request_handler';
 import eventDispatcher from './default_dispatcher.browser';
 
 describe('eventDispatcher', () => {
diff --git a/lib/event_processor/default_dispatcher.browser.ts b/lib/event_processor/event_dispatcher/default_dispatcher.browser.ts
similarity index 89%
rename from lib/event_processor/default_dispatcher.browser.ts
rename to lib/event_processor/event_dispatcher/default_dispatcher.browser.ts
index 1dd72ab00..893039d92 100644
--- a/lib/event_processor/default_dispatcher.browser.ts
+++ b/lib/event_processor/event_dispatcher/default_dispatcher.browser.ts
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { BrowserRequestHandler } from "../utils/http_request_handler/browser_request_handler";
+import { BrowserRequestHandler } from "../../utils/http_request_handler/browser_request_handler";
 import { EventDispatcher } from './event_dispatcher';
 import { DefaultEventDispatcher } from './default_dispatcher';
 
diff --git a/lib/event_processor/default_dispatcher.node.spec.ts b/lib/event_processor/event_dispatcher/default_dispatcher.node.spec.ts
similarity index 91%
rename from lib/event_processor/default_dispatcher.node.spec.ts
rename to lib/event_processor/event_dispatcher/default_dispatcher.node.spec.ts
index ddfc0c763..abd319b09 100644
--- a/lib/event_processor/default_dispatcher.node.spec.ts
+++ b/lib/event_processor/event_dispatcher/default_dispatcher.node.spec.ts
@@ -20,13 +20,13 @@ vi.mock('./default_dispatcher', () => {
   return { DefaultEventDispatcher };
 });
 
-vi.mock('../utils/http_request_handler/node_request_handler', () => {
+vi.mock('../../utils/http_request_handler/node_request_handler', () => {
   const NodeRequestHandler = vi.fn();
   return { NodeRequestHandler };
 });
 
 import { DefaultEventDispatcher } from './default_dispatcher';
-import { NodeRequestHandler } from '../utils/http_request_handler/node_request_handler';
+import { NodeRequestHandler } from '../../utils/http_request_handler/node_request_handler';
 import eventDispatcher from './default_dispatcher.node';
 
 describe('eventDispatcher', () => {
diff --git a/lib/event_processor/default_dispatcher.node.ts b/lib/event_processor/event_dispatcher/default_dispatcher.node.ts
similarity index 90%
rename from lib/event_processor/default_dispatcher.node.ts
rename to lib/event_processor/event_dispatcher/default_dispatcher.node.ts
index 130eaa6d2..52524140c 100644
--- a/lib/event_processor/default_dispatcher.node.ts
+++ b/lib/event_processor/event_dispatcher/default_dispatcher.node.ts
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 import { EventDispatcher } from './event_dispatcher';
-import { NodeRequestHandler } from '../utils/http_request_handler/node_request_handler';
+import { NodeRequestHandler } from '../../utils/http_request_handler/node_request_handler';
 import { DefaultEventDispatcher } from './default_dispatcher';
 
 const eventDispatcher: EventDispatcher = new DefaultEventDispatcher(new NodeRequestHandler());
diff --git a/lib/event_processor/default_dispatcher.spec.ts b/lib/event_processor/event_dispatcher/default_dispatcher.spec.ts
similarity index 98%
rename from lib/event_processor/default_dispatcher.spec.ts
rename to lib/event_processor/event_dispatcher/default_dispatcher.spec.ts
index e3f73ffad..d491bf3a0 100644
--- a/lib/event_processor/default_dispatcher.spec.ts
+++ b/lib/event_processor/event_dispatcher/default_dispatcher.spec.ts
@@ -15,7 +15,7 @@
  */
 import { expect, vi, describe, it } from 'vitest';
 import { DefaultEventDispatcher } from './default_dispatcher';
-import { EventBatch } from './event_builder/build_event_v1';
+import { EventBatch } from '../event_builder/log_event';
 
 const getEvent = (): EventBatch => {
   return {
diff --git a/lib/event_processor/default_dispatcher.ts b/lib/event_processor/event_dispatcher/default_dispatcher.ts
similarity index 95%
rename from lib/event_processor/default_dispatcher.ts
rename to lib/event_processor/event_dispatcher/default_dispatcher.ts
index 43cb062c3..b8c73833c 100644
--- a/lib/event_processor/default_dispatcher.ts
+++ b/lib/event_processor/event_dispatcher/default_dispatcher.ts
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { RequestHandler } from '../utils/http_request_handler/http';
+import { RequestHandler } from '../../utils/http_request_handler/http';
 import { EventDispatcher, EventDispatcherResponse, LogEvent } from './event_dispatcher';
 
 export class DefaultEventDispatcher implements EventDispatcher {
diff --git a/lib/event_processor/event_dispatcher.ts b/lib/event_processor/event_dispatcher/event_dispatcher.ts
similarity index 93%
rename from lib/event_processor/event_dispatcher.ts
rename to lib/event_processor/event_dispatcher/event_dispatcher.ts
index f58c3fea2..4dfda8f30 100644
--- a/lib/event_processor/event_dispatcher.ts
+++ b/lib/event_processor/event_dispatcher/event_dispatcher.ts
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { EventBatch } from "./event_builder/log_event";
+import { EventBatch } from "../event_builder/log_event";
 
 export type EventDispatcherResponse = {
   statusCode?: number  
diff --git a/lib/event_processor/send_beacon_dispatcher.browser.spec.ts b/lib/event_processor/event_dispatcher/send_beacon_dispatcher.browser.spec.ts
similarity index 100%
rename from lib/event_processor/send_beacon_dispatcher.browser.spec.ts
rename to lib/event_processor/event_dispatcher/send_beacon_dispatcher.browser.spec.ts
diff --git a/lib/event_processor/send_beacon_dispatcher.browser.ts b/lib/event_processor/event_dispatcher/send_beacon_dispatcher.browser.ts
similarity index 100%
rename from lib/event_processor/send_beacon_dispatcher.browser.ts
rename to lib/event_processor/event_dispatcher/send_beacon_dispatcher.browser.ts
diff --git a/lib/event_processor/event_processor.ts b/lib/event_processor/event_processor.ts
index 29df80a6c..2bc4d5be0 100644
--- a/lib/event_processor/event_processor.ts
+++ b/lib/event_processor/event_processor.ts
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 import { ConversionEvent, ImpressionEvent } from './event_builder/user_event'
-import { LogEvent } from './event_dispatcher'
+import { LogEvent } from './event_dispatcher/event_dispatcher'
 import { getLogger } from '../modules/logging'
 import { Service } from '../service'
 import { Consumer, Fn } from '../utils/type';
diff --git a/lib/event_processor/event_processor_factory.browser.spec.ts b/lib/event_processor/event_processor_factory.browser.spec.ts
index e35dd1908..b0b636efb 100644
--- a/lib/event_processor/event_processor_factory.browser.spec.ts
+++ b/lib/event_processor/event_processor_factory.browser.spec.ts
@@ -43,14 +43,14 @@ vi.mock('../utils/cache/cache', () => {
 });
 
 
-import defaultEventDispatcher from './default_dispatcher.browser';
+import defaultEventDispatcher from './event_dispatcher/default_dispatcher.browser';
 import { LocalStorageCache } from '../utils/cache/local_storage_cache.browser';
 import { SyncPrefixCache } from '../utils/cache/cache';
 import { createForwardingEventProcessor, createBatchEventProcessor } from './event_processor_factory.browser';
 import { EVENT_STORE_PREFIX, FAILED_EVENT_RETRY_INTERVAL } from './event_processor_factory';
-import sendBeaconEventDispatcher from './send_beacon_dispatcher.browser';
+import sendBeaconEventDispatcher from './event_dispatcher/send_beacon_dispatcher.browser';
 import { getForwardingEventProcessor } from './forwarding_event_processor';
-import browserDefaultEventDispatcher from './default_dispatcher.browser';
+import browserDefaultEventDispatcher from './event_dispatcher/default_dispatcher.browser';
 import { getBatchEventProcessor } from './event_processor_factory';
 
 describe('createForwardingEventProcessor', () => {
diff --git a/lib/event_processor/event_processor_factory.browser.ts b/lib/event_processor/event_processor_factory.browser.ts
index 9456d06b1..b6651ed70 100644
--- a/lib/event_processor/event_processor_factory.browser.ts
+++ b/lib/event_processor/event_processor_factory.browser.ts
@@ -15,12 +15,12 @@
  */
 
 import { getForwardingEventProcessor } from './forwarding_event_processor';
-import { EventDispatcher } from './event_dispatcher';
+import { EventDispatcher } from './event_dispatcher/event_dispatcher';
 import { EventProcessor } from './event_processor';
 import { EventWithId } from './batch_event_processor';
 import { getBatchEventProcessor, BatchEventProcessorOptions } from './event_processor_factory';
-import defaultEventDispatcher from './default_dispatcher.browser';
-import sendBeaconEventDispatcher from './send_beacon_dispatcher.browser';
+import defaultEventDispatcher from './event_dispatcher/default_dispatcher.browser';
+import sendBeaconEventDispatcher from './event_dispatcher/send_beacon_dispatcher.browser';
 import { LocalStorageCache } from '../utils/cache/local_storage_cache.browser';
 import { SyncPrefixCache } from '../utils/cache/cache';
 import { EVENT_STORE_PREFIX, FAILED_EVENT_RETRY_INTERVAL } from './event_processor_factory';
diff --git a/lib/event_processor/event_processor_factory.node.spec.ts b/lib/event_processor/event_processor_factory.node.spec.ts
index a511e2e06..31001400f 100644
--- a/lib/event_processor/event_processor_factory.node.spec.ts
+++ b/lib/event_processor/event_processor_factory.node.spec.ts
@@ -42,7 +42,7 @@ vi.mock('../utils/cache/cache', () => {
 
 import { createBatchEventProcessor, createForwardingEventProcessor } from './event_processor_factory.node';
 import { getForwardingEventProcessor } from './forwarding_event_processor';
-import nodeDefaultEventDispatcher from './default_dispatcher.node';
+import nodeDefaultEventDispatcher from './event_dispatcher/default_dispatcher.node';
 import { EVENT_STORE_PREFIX, FAILED_EVENT_RETRY_INTERVAL } from './event_processor_factory';
 import { getBatchEventProcessor } from './event_processor_factory';
 import { AsyncCache, AsyncPrefixCache, SyncCache, SyncPrefixCache } from '../utils/cache/cache';
diff --git a/lib/event_processor/event_processor_factory.node.ts b/lib/event_processor/event_processor_factory.node.ts
index 1a21fbf60..6c57272bc 100644
--- a/lib/event_processor/event_processor_factory.node.ts
+++ b/lib/event_processor/event_processor_factory.node.ts
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 import { getForwardingEventProcessor } from './forwarding_event_processor';
-import { EventDispatcher } from './event_dispatcher';
+import { EventDispatcher } from './event_dispatcher/event_dispatcher';
 import { EventProcessor } from './event_processor';
-import defaultEventDispatcher from './default_dispatcher.node';
+import defaultEventDispatcher from './event_dispatcher/default_dispatcher.node';
 import { BatchEventProcessorOptions, FAILED_EVENT_RETRY_INTERVAL, getBatchEventProcessor, getPrefixEventStore } from './event_processor_factory';
 
 export const createForwardingEventProcessor = (
diff --git a/lib/event_processor/event_processor_factory.react_native.spec.ts b/lib/event_processor/event_processor_factory.react_native.spec.ts
index 93e7a05ad..1ef075cd4 100644
--- a/lib/event_processor/event_processor_factory.react_native.spec.ts
+++ b/lib/event_processor/event_processor_factory.react_native.spec.ts
@@ -67,7 +67,7 @@ async function mockRequireNetInfo() {
 
 import { createForwardingEventProcessor, createBatchEventProcessor } from './event_processor_factory.react_native';
 import { getForwardingEventProcessor } from './forwarding_event_processor';
-import defaultEventDispatcher from './default_dispatcher.browser';
+import defaultEventDispatcher from './event_dispatcher/default_dispatcher.browser';
 import { EVENT_STORE_PREFIX, FAILED_EVENT_RETRY_INTERVAL } from './event_processor_factory';
 import { getBatchEventProcessor } from './event_processor_factory';
 import { AsyncCache, AsyncPrefixCache, SyncCache, SyncPrefixCache } from '../utils/cache/cache';
diff --git a/lib/event_processor/event_processor_factory.react_native.ts b/lib/event_processor/event_processor_factory.react_native.ts
index a007501a5..ce300ac79 100644
--- a/lib/event_processor/event_processor_factory.react_native.ts
+++ b/lib/event_processor/event_processor_factory.react_native.ts
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 import { getForwardingEventProcessor } from './forwarding_event_processor';
-import { EventDispatcher } from './event_dispatcher';
+import { EventDispatcher } from './event_dispatcher/event_dispatcher';
 import { EventProcessor } from './event_processor';
-import defaultEventDispatcher from './default_dispatcher.browser';
+import defaultEventDispatcher from './event_dispatcher/default_dispatcher.browser';
 import { BatchEventProcessorOptions, getBatchEventProcessor, getPrefixEventStore } from './event_processor_factory';
 import { EVENT_STORE_PREFIX, FAILED_EVENT_RETRY_INTERVAL } from './event_processor_factory';
 import { AsyncPrefixCache } from '../utils/cache/cache';
diff --git a/lib/event_processor/event_processor_factory.ts b/lib/event_processor/event_processor_factory.ts
index adba35c1d..8221e7dab 100644
--- a/lib/event_processor/event_processor_factory.ts
+++ b/lib/event_processor/event_processor_factory.ts
@@ -17,7 +17,7 @@
 import { LogLevel } from "../common_exports";
 import { StartupLog } from "../service";
 import { ExponentialBackoff, IntervalRepeater } from "../utils/repeater/repeater";
-import { EventDispatcher } from "./event_dispatcher";
+import { EventDispatcher } from "./event_dispatcher/event_dispatcher";
 import { EventProcessor } from "./event_processor";
 import { BatchEventProcessor, EventWithId, RetryConfig } from "./batch_event_processor";
 import { AsyncPrefixCache, Cache, SyncPrefixCache } from "../utils/cache/cache";
diff --git a/lib/event_processor/forwarding_event_processor.spec.ts b/lib/event_processor/forwarding_event_processor.spec.ts
index 3651df273..76b69a185 100644
--- a/lib/event_processor/forwarding_event_processor.spec.ts
+++ b/lib/event_processor/forwarding_event_processor.spec.ts
@@ -16,8 +16,8 @@
 import { expect, describe, it, vi } from 'vitest';
 
 import { getForwardingEventProcessor } from './forwarding_event_processor';
-import { EventDispatcher } from './event_dispatcher';
-import { buildLogEvent, makeEventBatch } from './event_builder/build_event_v1';
+import { EventDispatcher } from './event_dispatcher/event_dispatcher';
+import { buildLogEvent, makeEventBatch } from './event_builder/log_event';
 import { createImpressionEvent } from '../tests/mock/create_event';
 import { ServiceState } from '../service';
 
diff --git a/lib/event_processor/forwarding_event_processor.ts b/lib/event_processor/forwarding_event_processor.ts
index caf0752aa..768c10e87 100644
--- a/lib/event_processor/forwarding_event_processor.ts
+++ b/lib/event_processor/forwarding_event_processor.ts
@@ -15,7 +15,7 @@
  */
 
 
-import { LogEvent } from './event_dispatcher';
+import { LogEvent } from './event_dispatcher/event_dispatcher';
 import { EventProcessor, ProcessableEvent } from './event_processor';
 
 import { EventDispatcher } from '../shared_types';
diff --git a/lib/index.browser.ts b/lib/index.browser.ts
index 5821d0aa0..521cc773f 100644
--- a/lib/index.browser.ts
+++ b/lib/index.browser.ts
@@ -18,8 +18,8 @@ import logHelper from './modules/logging/logger';
 import { getLogger, setErrorHandler, getErrorHandler, LogLevel } from './modules/logging';
 import configValidator from './utils/config_validator';
 import defaultErrorHandler from './plugins/error_handler';
-import defaultEventDispatcher from './event_processor/default_dispatcher.browser';
-import sendBeaconEventDispatcher from './event_processor/send_beacon_dispatcher.browser';
+import defaultEventDispatcher from './event_processor/event_dispatcher/default_dispatcher.browser';
+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';
diff --git a/lib/index.node.ts b/lib/index.node.ts
index ba4290d53..606f3aa55 100644
--- a/lib/index.node.ts
+++ b/lib/index.node.ts
@@ -20,7 +20,7 @@ import * as enums from './utils/enums';
 import * as loggerPlugin from './plugins/logger';
 import configValidator from './utils/config_validator';
 import defaultErrorHandler from './plugins/error_handler';
-import defaultEventDispatcher from './event_processor/default_dispatcher.node';
+import defaultEventDispatcher from './event_processor/event_dispatcher/default_dispatcher.node';
 import { createNotificationCenter } from './core/notification_center';
 import { OptimizelyDecideOption, Client, Config } from './shared_types';
 import { NodeOdpManager } from './plugins/odp_manager/index.node';
diff --git a/lib/index.react_native.ts b/lib/index.react_native.ts
index 41cf71369..eda80e4e8 100644
--- a/lib/index.react_native.ts
+++ b/lib/index.react_native.ts
@@ -20,7 +20,7 @@ import Optimizely from './optimizely';
 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/default_dispatcher.browser';
+import defaultEventDispatcher from './event_processor/event_dispatcher/default_dispatcher.browser';
 import { createNotificationCenter } from './core/notification_center';
 import { OptimizelyDecideOption, Client, Config } from './shared_types';
 import { BrowserOdpManager } from './plugins/odp_manager/index.browser';
diff --git a/lib/shared_types.ts b/lib/shared_types.ts
index eb99d4578..bf3d238df 100644
--- a/lib/shared_types.ts
+++ b/lib/shared_types.ts
@@ -38,10 +38,10 @@ import { IUserAgentParser } from './core/odp/user_agent_parser';
 import PersistentCache from './plugins/key_value_cache/persistentKeyValueCache';
 import { ProjectConfig } from './project_config/project_config';
 import { ProjectConfigManager } from './project_config/project_config_manager';
-import { EventDispatcher } from './event_processor/event_dispatcher';
+import { EventDispatcher } from './event_processor/event_dispatcher/event_dispatcher';
 import { EventProcessor } from './event_processor/event_processor';
 
-export { EventDispatcher } from './event_processor/event_dispatcher';
+export { EventDispatcher } from './event_processor/event_dispatcher/event_dispatcher';
 export { EventProcessor } from './event_processor/event_processor';
 export interface BucketerParams {
   experimentId: string;