diff --git a/src/BasePlatform.js b/src/BasePlatform.js
index f6301fd173..14e34a1f40 100644
--- a/src/BasePlatform.js
+++ b/src/BasePlatform.js
@@ -19,7 +19,7 @@ limitations under the License.
 */
 
 import dis from './dispatcher';
-import BaseEventIndexManager from './BaseEventIndexManager';
+import BaseEventIndexManager from './indexing/BaseEventIndexManager';
 
 /**
  * Base class for classes that provide platform-specific functionality
diff --git a/src/Lifecycle.js b/src/Lifecycle.js
index 1b69ca6ade..65fa0b29ce 100644
--- a/src/Lifecycle.js
+++ b/src/Lifecycle.js
@@ -20,7 +20,7 @@ import Promise from 'bluebird';
 import Matrix from 'matrix-js-sdk';
 
 import MatrixClientPeg from './MatrixClientPeg';
-import EventIndexPeg from './EventIndexPeg';
+import EventIndexPeg from './indexing/EventIndexPeg';
 import createMatrixClient from './utils/createMatrixClient';
 import Analytics from './Analytics';
 import Notifier from './Notifier';
diff --git a/src/Searching.js b/src/Searching.js
index ca3e7f041f..f8976c92e4 100644
--- a/src/Searching.js
+++ b/src/Searching.js
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import EventIndexPeg from "./EventIndexPeg";
+import EventIndexPeg from "./indexing/EventIndexPeg";
 import MatrixClientPeg from "./MatrixClientPeg";
 
 function serverSideSearch(term, roomId = undefined) {
diff --git a/src/BaseEventIndexManager.js b/src/indexing/BaseEventIndexManager.js
similarity index 100%
rename from src/BaseEventIndexManager.js
rename to src/indexing/BaseEventIndexManager.js
diff --git a/src/EventIndex.js b/src/indexing/EventIndex.js
similarity index 99%
rename from src/EventIndex.js
rename to src/indexing/EventIndex.js
index b6784cd331..df81667c6e 100644
--- a/src/EventIndex.js
+++ b/src/indexing/EventIndex.js
@@ -14,8 +14,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import PlatformPeg from "./PlatformPeg";
-import MatrixClientPeg from "./MatrixClientPeg";
+import PlatformPeg from "../PlatformPeg";
+import MatrixClientPeg from "../MatrixClientPeg";
 
 /**
  * Event indexing class that wraps the platform specific event indexing.
diff --git a/src/EventIndexPeg.js b/src/indexing/EventIndexPeg.js
similarity index 95%
rename from src/EventIndexPeg.js
rename to src/indexing/EventIndexPeg.js
index eb4caa2ca4..c0bdd74ff4 100644
--- a/src/EventIndexPeg.js
+++ b/src/indexing/EventIndexPeg.js
@@ -19,9 +19,9 @@ limitations under the License.
  * platform supports event indexing.
  */
 
-import PlatformPeg from "./PlatformPeg";
-import EventIndex from "./EventIndex";
-import SettingsStore from './settings/SettingsStore';
+import PlatformPeg from "../PlatformPeg";
+import EventIndex from "../indexing/EventIndex";
+import SettingsStore from '../settings/SettingsStore';
 
 class EventIndexPeg {
     constructor() {