diff --git a/src/main/java/org/studiorailgun/Globals.java b/src/main/java/org/studiorailgun/Globals.java
index 69dbc3b..fea1cb2 100644
--- a/src/main/java/org/studiorailgun/Globals.java
+++ b/src/main/java/org/studiorailgun/Globals.java
@@ -2,8 +2,8 @@ package org.studiorailgun;
 
 import java.io.File;
 
-import org.studiorailgun.conversation.Conversation;
 import org.studiorailgun.conversation.evaluators.greet.GreetingEval;
+import org.studiorailgun.conversation.tracking.Conversation;
 import org.studiorailgun.knowledge.KnowledgeWeb;
 
 /**
diff --git a/src/main/java/org/studiorailgun/conversation/AgentLoop.java b/src/main/java/org/studiorailgun/conversation/AgentLoop.java
index 68def3c..ca120d9 100644
--- a/src/main/java/org/studiorailgun/conversation/AgentLoop.java
+++ b/src/main/java/org/studiorailgun/conversation/AgentLoop.java
@@ -4,6 +4,7 @@ import java.util.Scanner;
 
 import org.studiorailgun.Globals;
 import org.studiorailgun.conversation.parser.CommandParser;
+import org.studiorailgun.conversation.tracking.Quote;
 
 public class AgentLoop {
     
diff --git a/src/main/java/org/studiorailgun/conversation/ConvAI.java b/src/main/java/org/studiorailgun/conversation/ConvAI.java
index 8635873..c31f0f2 100644
--- a/src/main/java/org/studiorailgun/conversation/ConvAI.java
+++ b/src/main/java/org/studiorailgun/conversation/ConvAI.java
@@ -2,6 +2,7 @@ package org.studiorailgun.conversation;
 
 import org.studiorailgun.Globals;
 import org.studiorailgun.conversation.evaluators.EvaluationTree;
+import org.studiorailgun.conversation.tracking.Quote;
 
 /**
  * The top level ai class
diff --git a/src/main/java/org/studiorailgun/conversation/categorization/SentenceFunctionCategorizor.java b/src/main/java/org/studiorailgun/conversation/categorization/SentenceFunctionCategorizor.java
index f86f1ae..4e423ec 100644
--- a/src/main/java/org/studiorailgun/conversation/categorization/SentenceFunctionCategorizor.java
+++ b/src/main/java/org/studiorailgun/conversation/categorization/SentenceFunctionCategorizor.java
@@ -1,6 +1,6 @@
 package org.studiorailgun.conversation.categorization;
 
-import org.studiorailgun.conversation.Quote;
+import org.studiorailgun.conversation.tracking.Quote;
 
 /**
  * Categorizes sentences based on function
diff --git a/src/main/java/org/studiorailgun/conversation/evaluators/EvaluationTree.java b/src/main/java/org/studiorailgun/conversation/evaluators/EvaluationTree.java
index b717e43..17b11d6 100644
--- a/src/main/java/org/studiorailgun/conversation/evaluators/EvaluationTree.java
+++ b/src/main/java/org/studiorailgun/conversation/evaluators/EvaluationTree.java
@@ -1,11 +1,11 @@
 package org.studiorailgun.conversation.evaluators;
 
-import org.studiorailgun.conversation.Conversation;
-import org.studiorailgun.conversation.Quote;
 import org.studiorailgun.conversation.categorization.SentenceFunctionCategorizor;
 import org.studiorailgun.conversation.evaluators.goal.GoalEval;
 import org.studiorailgun.conversation.evaluators.greet.GreetingEval;
 import org.studiorailgun.conversation.evaluators.synthesis.ResponseEval;
+import org.studiorailgun.conversation.tracking.Conversation;
+import org.studiorailgun.conversation.tracking.Quote;
 
 /**
  * Evaluates a sentence based on data about the sentence
diff --git a/src/main/java/org/studiorailgun/conversation/evaluators/goal/GoalEval.java b/src/main/java/org/studiorailgun/conversation/evaluators/goal/GoalEval.java
index 3e9e335..3229fe8 100644
--- a/src/main/java/org/studiorailgun/conversation/evaluators/goal/GoalEval.java
+++ b/src/main/java/org/studiorailgun/conversation/evaluators/goal/GoalEval.java
@@ -1,9 +1,9 @@
 package org.studiorailgun.conversation.evaluators.goal;
 
-import org.studiorailgun.conversation.ConvParticipant;
-import org.studiorailgun.conversation.Conversation;
 import org.studiorailgun.conversation.evaluators.goal.GoalData.ConversationGoal;
 import org.studiorailgun.conversation.evaluators.greet.GreetingData;
+import org.studiorailgun.conversation.tracking.ConvParticipant;
+import org.studiorailgun.conversation.tracking.Conversation;
 
 /**
  * Evaluates the AI's goal in the conversation
diff --git a/src/main/java/org/studiorailgun/conversation/evaluators/greet/GreetingData.java b/src/main/java/org/studiorailgun/conversation/evaluators/greet/GreetingData.java
index 54040a8..3729adc 100644
--- a/src/main/java/org/studiorailgun/conversation/evaluators/greet/GreetingData.java
+++ b/src/main/java/org/studiorailgun/conversation/evaluators/greet/GreetingData.java
@@ -3,7 +3,7 @@ package org.studiorailgun.conversation.evaluators.greet;
 import java.util.LinkedList;
 import java.util.List;
 
-import org.studiorailgun.conversation.ConvParticipant;
+import org.studiorailgun.conversation.tracking.ConvParticipant;
 
 /**
  * Data about greetings for a given conversation
diff --git a/src/main/java/org/studiorailgun/conversation/evaluators/greet/GreetingEval.java b/src/main/java/org/studiorailgun/conversation/evaluators/greet/GreetingEval.java
index 41f59f3..060b7c6 100644
--- a/src/main/java/org/studiorailgun/conversation/evaluators/greet/GreetingEval.java
+++ b/src/main/java/org/studiorailgun/conversation/evaluators/greet/GreetingEval.java
@@ -5,9 +5,9 @@ import java.io.IOException;
 import java.nio.file.Files;
 import java.util.List;
 
-import org.studiorailgun.conversation.ConvParticipant;
-import org.studiorailgun.conversation.Conversation;
-import org.studiorailgun.conversation.Quote;
+import org.studiorailgun.conversation.tracking.ConvParticipant;
+import org.studiorailgun.conversation.tracking.Conversation;
+import org.studiorailgun.conversation.tracking.Quote;
 
 /**
  * Evaluates a greeting
diff --git a/src/main/java/org/studiorailgun/conversation/evaluators/synthesis/ResponseEval.java b/src/main/java/org/studiorailgun/conversation/evaluators/synthesis/ResponseEval.java
index ae2879c..5db619d 100644
--- a/src/main/java/org/studiorailgun/conversation/evaluators/synthesis/ResponseEval.java
+++ b/src/main/java/org/studiorailgun/conversation/evaluators/synthesis/ResponseEval.java
@@ -1,8 +1,8 @@
 package org.studiorailgun.conversation.evaluators.synthesis;
 
-import org.studiorailgun.conversation.Conversation;
-import org.studiorailgun.conversation.Quote;
 import org.studiorailgun.conversation.evaluators.greet.GreetingEval;
+import org.studiorailgun.conversation.tracking.Conversation;
+import org.studiorailgun.conversation.tracking.Quote;
 
 /**
  * Evaluates any response the ai might want to construct
diff --git a/src/main/java/org/studiorailgun/conversation/ConvParticipant.java b/src/main/java/org/studiorailgun/conversation/tracking/ConvParticipant.java
similarity index 93%
rename from src/main/java/org/studiorailgun/conversation/ConvParticipant.java
rename to src/main/java/org/studiorailgun/conversation/tracking/ConvParticipant.java
index d52028a..317167b 100644
--- a/src/main/java/org/studiorailgun/conversation/ConvParticipant.java
+++ b/src/main/java/org/studiorailgun/conversation/tracking/ConvParticipant.java
@@ -1,4 +1,4 @@
-package org.studiorailgun.conversation;
+package org.studiorailgun.conversation.tracking;
 
 import org.studiorailgun.knowledge.Node;
 
diff --git a/src/main/java/org/studiorailgun/conversation/Conversation.java b/src/main/java/org/studiorailgun/conversation/tracking/Conversation.java
similarity index 97%
rename from src/main/java/org/studiorailgun/conversation/Conversation.java
rename to src/main/java/org/studiorailgun/conversation/tracking/Conversation.java
index eda7078..5cf21dc 100644
--- a/src/main/java/org/studiorailgun/conversation/Conversation.java
+++ b/src/main/java/org/studiorailgun/conversation/tracking/Conversation.java
@@ -1,4 +1,4 @@
-package org.studiorailgun.conversation;
+package org.studiorailgun.conversation.tracking;
 
 import org.studiorailgun.conversation.evaluators.goal.GoalData;
 import org.studiorailgun.conversation.evaluators.greet.GreetingData;
diff --git a/src/main/java/org/studiorailgun/conversation/Quote.java b/src/main/java/org/studiorailgun/conversation/tracking/Quote.java
similarity index 94%
rename from src/main/java/org/studiorailgun/conversation/Quote.java
rename to src/main/java/org/studiorailgun/conversation/tracking/Quote.java
index 90aa036..fbb8037 100644
--- a/src/main/java/org/studiorailgun/conversation/Quote.java
+++ b/src/main/java/org/studiorailgun/conversation/tracking/Quote.java
@@ -1,4 +1,4 @@
-package org.studiorailgun.conversation;
+package org.studiorailgun.conversation.tracking;
 
 import org.studiorailgun.conversation.categorization.SentenceFunctionCategorizor.SentenceFunction;
 
diff --git a/src/test/java/org/studiorailgun/GreetingTests.java b/src/test/java/org/studiorailgun/GreetingTests.java
index d686216..6c668ee 100644
--- a/src/test/java/org/studiorailgun/GreetingTests.java
+++ b/src/test/java/org/studiorailgun/GreetingTests.java
@@ -4,8 +4,8 @@ import static org.junit.jupiter.api.Assertions.*;
 
 import org.junit.jupiter.api.Test;
 import org.studiorailgun.conversation.ConvAI;
-import org.studiorailgun.conversation.Quote;
 import org.studiorailgun.conversation.evaluators.goal.GoalData.ConversationGoal;
+import org.studiorailgun.conversation.tracking.Quote;
 
 /**
  * Tests greeting