diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 881d1c7128120f9eabc11eab705406ef04ea8f97..e441a4bb12bd4a3f5477ef603ea6bc273ca5c6a8 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -18,7 +18,7 @@ You can checkout how Turborepo works using the built in [README-turborepo.md](RE
 
 Install NodeJS. Preferably v18 using nvm or n.
 
-Inside the llamascript directory:
+Inside the LlamaIndexTS directory:
 
 ```
 npm i -g pnpm ts-node
diff --git a/package.json b/package.json
index 99799f1e1efb5245bee6be69223e223ccd708f32..6f6285174a39aabbd4539f964f7b295e8ce2c37d 100644
--- a/package.json
+++ b/package.json
@@ -20,6 +20,5 @@
     "ts-jest": "^29.1.1",
     "turbo": "^1.10.8"
   },
-  "packageManager": "pnpm@7.15.0",
-  "name": "llamascript"
+  "packageManager": "pnpm@7.15.0"
 }
diff --git a/packages/core/src/Retriever.ts b/packages/core/src/Retriever.ts
index 60fcf7d70574af41d1c6d2c67f3cc9881c09757a..66e672e9ef16e36e7b2e3e153d094babb5dcbc26 100644
--- a/packages/core/src/Retriever.ts
+++ b/packages/core/src/Retriever.ts
@@ -1,13 +1,6 @@
-import { VectorStoreIndex } from "./BaseIndex";
-import { globalsHelper } from "./GlobalsHelper";
 import { NodeWithScore } from "./Node";
 import { ServiceContext } from "./ServiceContext";
 import { Event } from "./callbacks/CallbackManager";
-import { DEFAULT_SIMILARITY_TOP_K } from "./constants";
-import {
-  VectorStoreQuery,
-  VectorStoreQueryMode,
-} from "./storage/vectorStore/types";
 
 /**
  * Retrievers retrieve the nodes that most closely match our query in similarity.
@@ -16,58 +9,3 @@ export interface BaseRetriever {
   aretrieve(query: string, parentEvent?: Event): Promise<NodeWithScore[]>;
   getServiceContext(): ServiceContext;
 }
-
-/**
- * VectorIndexRetriever retrieves nodes from a VectorIndex.
- */
-export class VectorIndexRetriever implements BaseRetriever {
-  index: VectorStoreIndex;
-  similarityTopK = DEFAULT_SIMILARITY_TOP_K;
-  private serviceContext: ServiceContext;
-
-  constructor(index: VectorStoreIndex) {
-    this.index = index;
-    this.serviceContext = this.index.serviceContext;
-  }
-
-  async aretrieve(
-    query: string,
-    parentEvent?: Event
-  ): Promise<NodeWithScore[]> {
-    const queryEmbedding =
-      await this.serviceContext.embedModel.aGetQueryEmbedding(query);
-
-    const q: VectorStoreQuery = {
-      queryEmbedding: queryEmbedding,
-      mode: VectorStoreQueryMode.DEFAULT,
-      similarityTopK: this.similarityTopK,
-    };
-    const result = this.index.vectorStore.query(q);
-
-    let nodesWithScores: NodeWithScore[] = [];
-    for (let i = 0; i < result.ids.length; i++) {
-      const node = this.index.indexStruct.nodesDict[result.ids[i]];
-      nodesWithScores.push({
-        node: node,
-        score: result.similarities[i],
-      });
-    }
-
-    if (this.serviceContext.callbackManager.onRetrieve) {
-      this.serviceContext.callbackManager.onRetrieve({
-        query,
-        nodes: nodesWithScores,
-        event: globalsHelper.createEvent({
-          parentEvent,
-          type: "retrieve",
-        }),
-      });
-    }
-
-    return nodesWithScores;
-  }
-
-  getServiceContext(): ServiceContext {
-    return this.serviceContext;
-  }
-}
diff --git a/packages/core/src/index.ts b/packages/core/src/index.ts
index 7bf8c8264fdd0db27acdf83458913f9afc33dc6a..f9fa64a276ae236a215a840e78533a39cb51eaf2 100644
--- a/packages/core/src/index.ts
+++ b/packages/core/src/index.ts
@@ -1,4 +1,4 @@
-export * from "./BaseIndex";
+export * from "./indices/BaseIndex";
 export * from "./ChatEngine";
 export * from "./constants";
 export * from "./Embedding";
@@ -19,7 +19,7 @@ export * from "./ServiceContext";
 export * from "./TextSplitter";
 export * from "./Tool";
 
-export * from "./index/list";
+export * from "./indices/list";
 
 export * from "./callbacks/CallbackManager";
 
diff --git a/packages/core/src/indices/BaseIndex.ts b/packages/core/src/indices/BaseIndex.ts
new file mode 100644
index 0000000000000000000000000000000000000000..043f18e129b14c8cb4323fd627e2953cff0a3191
--- /dev/null
+++ b/packages/core/src/indices/BaseIndex.ts
@@ -0,0 +1,97 @@
+import { Document, BaseNode } from "../Node";
+import { v4 as uuidv4 } from "uuid";
+import { BaseRetriever } from "../Retriever";
+import { ServiceContext } from "../ServiceContext";
+import { StorageContext } from "../storage/StorageContext";
+import { BaseDocumentStore } from "../storage/docStore/types";
+import { VectorStore } from "../storage/vectorStore/types";
+import { BaseIndexStore } from "../storage/indexStore/types";
+
+/**
+ * The underlying structure of each index.
+ */
+export abstract class IndexStruct {
+  indexId: string;
+  summary?: string;
+
+  constructor(indexId = uuidv4(), summary = undefined) {
+    this.indexId = indexId;
+    this.summary = summary;
+  }
+
+  getSummary(): string {
+    if (this.summary === undefined) {
+      throw new Error("summary field of the index dict is not set");
+    }
+    return this.summary;
+  }
+}
+
+export class IndexDict extends IndexStruct {
+  nodesDict: Record<string, BaseNode> = {};
+  docStore: Record<string, Document> = {}; // FIXME: this should be implemented in storageContext
+
+  getSummary(): string {
+    if (this.summary === undefined) {
+      throw new Error("summary field of the index dict is not set");
+    }
+    return this.summary;
+  }
+
+  addNode(node: BaseNode, textId?: string) {
+    const vectorId = textId ?? node.id_;
+    this.nodesDict[vectorId] = node;
+  }
+}
+
+export class IndexList extends IndexStruct {
+  nodes: string[] = [];
+
+  addNode(node: BaseNode) {
+    this.nodes.push(node.id_);
+  }
+}
+
+export interface BaseIndexInit<T> {
+  serviceContext: ServiceContext;
+  storageContext: StorageContext;
+  docStore: BaseDocumentStore;
+  vectorStore?: VectorStore;
+  indexStore?: BaseIndexStore;
+  indexStruct: T;
+}
+
+/**
+ * Indexes are the data structure that we store our nodes and embeddings in so
+ * they can be retrieved for our queries.
+ */
+export abstract class BaseIndex<T> {
+  serviceContext: ServiceContext;
+  storageContext: StorageContext;
+  docStore: BaseDocumentStore;
+  vectorStore?: VectorStore;
+  indexStore?: BaseIndexStore;
+  indexStruct: T;
+
+  constructor(init: BaseIndexInit<T>) {
+    this.serviceContext = init.serviceContext;
+    this.storageContext = init.storageContext;
+    this.docStore = init.docStore;
+    this.vectorStore = init.vectorStore;
+    this.indexStore = init.indexStore;
+    this.indexStruct = init.indexStruct;
+  }
+
+  abstract asRetriever(): BaseRetriever;
+}
+
+export interface VectorIndexOptions {
+  nodes?: BaseNode[];
+  indexStruct?: IndexDict;
+  serviceContext?: ServiceContext;
+  storageContext?: StorageContext;
+}
+
+export interface VectorIndexConstructorProps extends BaseIndexInit<IndexDict> {
+  vectorStore: VectorStore;
+}
diff --git a/packages/core/src/indices/index.ts b/packages/core/src/indices/index.ts
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/packages/core/src/index/list/ListIndex.ts b/packages/core/src/indices/list/ListIndex.ts
similarity index 98%
rename from packages/core/src/index/list/ListIndex.ts
rename to packages/core/src/indices/list/ListIndex.ts
index 54bd62e62c2c51072fec069f527c1bc993dffc24..23d178f7dab682cd1b3515e4ad2cc2b21877f5d3 100644
--- a/packages/core/src/index/list/ListIndex.ts
+++ b/packages/core/src/indices/list/ListIndex.ts
@@ -1,5 +1,5 @@
 import { BaseNode, Document } from "../../Node";
-import { BaseIndex, BaseIndexInit, IndexList } from "../../BaseIndex";
+import { BaseIndex, BaseIndexInit, IndexList } from "../BaseIndex";
 import { BaseQueryEngine, RetrieverQueryEngine } from "../../QueryEngine";
 import {
   StorageContext,
diff --git a/packages/core/src/index/list/ListIndexRetriever.ts b/packages/core/src/indices/list/ListIndexRetriever.ts
similarity index 100%
rename from packages/core/src/index/list/ListIndexRetriever.ts
rename to packages/core/src/indices/list/ListIndexRetriever.ts
diff --git a/packages/core/src/index/list/index.ts b/packages/core/src/indices/list/index.ts
similarity index 100%
rename from packages/core/src/index/list/index.ts
rename to packages/core/src/indices/list/index.ts
diff --git a/packages/core/src/index/list/utils.ts b/packages/core/src/indices/list/utils.ts
similarity index 100%
rename from packages/core/src/index/list/utils.ts
rename to packages/core/src/indices/list/utils.ts
diff --git a/packages/core/src/indices/vectorStore/VectorIndexRetriever.ts b/packages/core/src/indices/vectorStore/VectorIndexRetriever.ts
new file mode 100644
index 0000000000000000000000000000000000000000..c8106b90f1e0cec5c7fca58bf2e2bfb955aabef7
--- /dev/null
+++ b/packages/core/src/indices/vectorStore/VectorIndexRetriever.ts
@@ -0,0 +1,67 @@
+import { VectorStoreIndex } from "./VectorStoreIndex";
+import { globalsHelper } from "../../GlobalsHelper";
+import { NodeWithScore } from "../../Node";
+import { ServiceContext } from "../../ServiceContext";
+import { Event } from "../../callbacks/CallbackManager";
+import { DEFAULT_SIMILARITY_TOP_K } from "../../constants";
+import {
+  VectorStoreQuery,
+  VectorStoreQueryMode,
+} from "../../storage/vectorStore/types";
+import { BaseRetriever } from "../../Retriever";
+
+/**
+ * VectorIndexRetriever retrieves nodes from a VectorIndex.
+ */
+
+export class VectorIndexRetriever implements BaseRetriever {
+  index: VectorStoreIndex;
+  similarityTopK = DEFAULT_SIMILARITY_TOP_K;
+  private serviceContext: ServiceContext;
+
+  constructor(index: VectorStoreIndex) {
+    this.index = index;
+    this.serviceContext = this.index.serviceContext;
+  }
+
+  async aretrieve(
+    query: string,
+    parentEvent?: Event
+  ): Promise<NodeWithScore[]> {
+    const queryEmbedding =
+      await this.serviceContext.embedModel.aGetQueryEmbedding(query);
+
+    const q: VectorStoreQuery = {
+      queryEmbedding: queryEmbedding,
+      mode: VectorStoreQueryMode.DEFAULT,
+      similarityTopK: this.similarityTopK,
+    };
+    const result = this.index.vectorStore.query(q);
+
+    let nodesWithScores: NodeWithScore[] = [];
+    for (let i = 0; i < result.ids.length; i++) {
+      const node = this.index.indexStruct.nodesDict[result.ids[i]];
+      nodesWithScores.push({
+        node: node,
+        score: result.similarities[i],
+      });
+    }
+
+    if (this.serviceContext.callbackManager.onRetrieve) {
+      this.serviceContext.callbackManager.onRetrieve({
+        query,
+        nodes: nodesWithScores,
+        event: globalsHelper.createEvent({
+          parentEvent,
+          type: "retrieve",
+        }),
+      });
+    }
+
+    return nodesWithScores;
+  }
+
+  getServiceContext(): ServiceContext {
+    return this.serviceContext;
+  }
+}
diff --git a/packages/core/src/BaseIndex.ts b/packages/core/src/indices/vectorStore/VectorStoreIndex.ts
similarity index 61%
rename from packages/core/src/BaseIndex.ts
rename to packages/core/src/indices/vectorStore/VectorStoreIndex.ts
index ef0acc169956a81388c52a30f3c3fc270ba09b4a..a50e29fea3e509542a19108d261f95a63ce2b5c7 100644
--- a/packages/core/src/BaseIndex.ts
+++ b/packages/core/src/indices/vectorStore/VectorStoreIndex.ts
@@ -1,108 +1,31 @@
-import { Document, BaseNode, MetadataMode, NodeWithEmbedding } from "./Node";
-import { BaseQueryEngine, RetrieverQueryEngine } from "./QueryEngine";
-import { v4 as uuidv4 } from "uuid";
-import { BaseRetriever, VectorIndexRetriever } from "./Retriever";
-import { ServiceContext, serviceContextFromDefaults } from "./ServiceContext";
+import {
+  Document,
+  BaseNode,
+  MetadataMode,
+  NodeWithEmbedding,
+} from "../../Node";
+import { BaseQueryEngine, RetrieverQueryEngine } from "../../QueryEngine";
+import { VectorIndexRetriever } from "./VectorIndexRetriever";
+import {
+  ServiceContext,
+  serviceContextFromDefaults,
+} from "../../ServiceContext";
 import {
   StorageContext,
   storageContextFromDefaults,
-} from "./storage/StorageContext";
-import { BaseDocumentStore } from "./storage/docStore/types";
-import { VectorStore } from "./storage/vectorStore/types";
-import { BaseIndexStore } from "./storage/indexStore/types";
-
-/**
- * The underlying structure of each index.
- */
-export abstract class IndexStruct {
-  indexId: string;
-  summary?: string;
-
-  constructor(indexId = uuidv4(), summary = undefined) {
-    this.indexId = indexId;
-    this.summary = summary;
-  }
-
-  getSummary(): string {
-    if (this.summary === undefined) {
-      throw new Error("summary field of the index dict is not set");
-    }
-    return this.summary;
-  }
-}
-
-export class IndexDict extends IndexStruct {
-  nodesDict: Record<string, BaseNode> = {};
-  docStore: Record<string, Document> = {}; // FIXME: this should be implemented in storageContext
-
-  getSummary(): string {
-    if (this.summary === undefined) {
-      throw new Error("summary field of the index dict is not set");
-    }
-    return this.summary;
-  }
-
-  addNode(node: BaseNode, textId?: string) {
-    const vectorId = textId ?? node.id_;
-    this.nodesDict[vectorId] = node;
-  }
-}
-
-export class IndexList extends IndexStruct {
-  nodes: string[] = [];
-
-  addNode(node: BaseNode) {
-    this.nodes.push(node.id_);
-  }
-}
-
-export interface BaseIndexInit<T> {
-  serviceContext: ServiceContext;
-  storageContext: StorageContext;
-  docStore: BaseDocumentStore;
-  vectorStore?: VectorStore;
-  indexStore?: BaseIndexStore;
-  indexStruct: T;
-}
-
-/**
- * Indexes are the data structure that we store our nodes and embeddings in so
- * they can be retrieved for our queries.
- */
-export abstract class BaseIndex<T> {
-  serviceContext: ServiceContext;
-  storageContext: StorageContext;
-  docStore: BaseDocumentStore;
-  vectorStore?: VectorStore;
-  indexStore?: BaseIndexStore;
-  indexStruct: T;
-
-  constructor(init: BaseIndexInit<T>) {
-    this.serviceContext = init.serviceContext;
-    this.storageContext = init.storageContext;
-    this.docStore = init.docStore;
-    this.vectorStore = init.vectorStore;
-    this.indexStore = init.indexStore;
-    this.indexStruct = init.indexStruct;
-  }
-
-  abstract asRetriever(): BaseRetriever;
-}
-
-export interface VectorIndexOptions {
-  nodes?: BaseNode[];
-  indexStruct?: IndexDict;
-  serviceContext?: ServiceContext;
-  storageContext?: StorageContext;
-}
-
-interface VectorIndexConstructorProps extends BaseIndexInit<IndexDict> {
-  vectorStore: VectorStore;
-}
+} from "../../storage/StorageContext";
+import { VectorStore } from "../../storage/vectorStore/types";
+import {
+  BaseIndex,
+  IndexDict,
+  VectorIndexConstructorProps,
+  VectorIndexOptions,
+} from "../BaseIndex";
 
 /**
  * The VectorStoreIndex, an index that stores the nodes only according to their vector embedings.
  */
+
 export class VectorStoreIndex extends BaseIndex<IndexDict> {
   vectorStore: VectorStore;
 
diff --git a/packages/core/src/indices/vectorStore/index.ts b/packages/core/src/indices/vectorStore/index.ts
new file mode 100644
index 0000000000000000000000000000000000000000..526610b11ef04baed9c1192f3c13ef2ca8d9b142
--- /dev/null
+++ b/packages/core/src/indices/vectorStore/index.ts
@@ -0,0 +1,2 @@
+export { VectorStoreIndex } from "./VectorStoreIndex";
+export { VectorIndexRetriever } from "./VectorIndexRetriever";
diff --git a/packages/core/src/tests/CallbackManager.test.ts b/packages/core/src/tests/CallbackManager.test.ts
index ea790ea1180d93cdcb51c25ff30771290000bf24..b32a05b7edab1cfae8a2db99cd2bcfdfca6d8fd3 100644
--- a/packages/core/src/tests/CallbackManager.test.ts
+++ b/packages/core/src/tests/CallbackManager.test.ts
@@ -1,4 +1,4 @@
-import { VectorStoreIndex } from "../BaseIndex";
+import { VectorStoreIndex } from "../indices/vectorStore/VectorStoreIndex";
 import { OpenAIEmbedding } from "../Embedding";
 import { OpenAI } from "../LLM";
 import { Document } from "../Node";
@@ -8,7 +8,7 @@ import {
   RetrievalCallbackResponse,
   StreamCallbackResponse,
 } from "../callbacks/CallbackManager";
-import { ListIndex, ListRetrieverMode } from "../index/list";
+import { ListIndex, ListRetrieverMode } from "../indices/list";
 import {
   ResponseSynthesizer,
   SimpleResponseBuilder,