diff --git a/ConversationEditor/src/com/projectswg/tools/csc/conversationeditor/Compiler.java b/ConversationEditor/src/com/projectswg/tools/csc/conversationeditor/Compiler.java
index a067f1f..d577e78 100644
--- a/ConversationEditor/src/com/projectswg/tools/csc/conversationeditor/Compiler.java
+++ b/ConversationEditor/src/com/projectswg/tools/csc/conversationeditor/Compiler.java
@@ -1,6 +1,6 @@
 package com.projectswg.tools.csc.conversationeditor;
 
-import com.projectswg.tools.csc.conversationeditor.ConversationNode;
+import com.projectswg.tools.csc.conversationeditor.nodes.ConversationNode;
 import com.projectswg.tools.csc.conversationeditor.EditorTopComponent;
 import com.projectswg.tools.csc.conversationeditor.SceneView;
 import java.io.BufferedWriter;
diff --git a/ConversationEditor/src/com/projectswg/tools/csc/conversationeditor/ConversationConnectProvider.java b/ConversationEditor/src/com/projectswg/tools/csc/conversationeditor/ConversationConnectProvider.java
index 08be295..3812198 100644
--- a/ConversationEditor/src/com/projectswg/tools/csc/conversationeditor/ConversationConnectProvider.java
+++ b/ConversationEditor/src/com/projectswg/tools/csc/conversationeditor/ConversationConnectProvider.java
@@ -1,5 +1,6 @@
 package com.projectswg.tools.csc.conversationeditor;
 
+import com.projectswg.tools.csc.conversationeditor.nodes.ConversationNode;
 import java.awt.Point;
 import javax.swing.JOptionPane;
 import org.netbeans.api.visual.action.ConnectProvider;
diff --git a/ConversationEditor/src/com/projectswg/tools/csc/conversationeditor/ConversationWidget.java b/ConversationEditor/src/com/projectswg/tools/csc/conversationeditor/ConversationWidget.java
index 8258c0e..b2326b3 100644
--- a/ConversationEditor/src/com/projectswg/tools/csc/conversationeditor/ConversationWidget.java
+++ b/ConversationEditor/src/com/projectswg/tools/csc/conversationeditor/ConversationWidget.java
@@ -1,5 +1,6 @@
 package com.projectswg.tools.csc.conversationeditor;
 
+import com.projectswg.tools.csc.conversationeditor.nodes.ConversationNode;
 import java.awt.Point;
 import java.beans.PropertyVetoException;
 import org.netbeans.api.visual.action.ActionFactory;
diff --git a/ConversationEditor/src/com/projectswg/tools/csc/conversationeditor/EditorTopComponent.java b/ConversationEditor/src/com/projectswg/tools/csc/conversationeditor/EditorTopComponent.java
index 243ad3e..3e77289 100644
--- a/ConversationEditor/src/com/projectswg/tools/csc/conversationeditor/EditorTopComponent.java
+++ b/ConversationEditor/src/com/projectswg/tools/csc/conversationeditor/EditorTopComponent.java
@@ -1,5 +1,6 @@
 package com.projectswg.tools.csc.conversationeditor;
 
+import com.projectswg.tools.csc.conversationeditor.nodes.ConversationNode;
 import com.projectswg.tools.csc.conversationeditor.actions.OpenConversation;
 import java.io.File;
 import javax.swing.JOptionPane;
diff --git a/ConversationEditor/src/com/projectswg/tools/csc/conversationeditor/SceneSaver.java b/ConversationEditor/src/com/projectswg/tools/csc/conversationeditor/SceneSaver.java
index f007a3b..49eff7a 100644
--- a/ConversationEditor/src/com/projectswg/tools/csc/conversationeditor/SceneSaver.java
+++ b/ConversationEditor/src/com/projectswg/tools/csc/conversationeditor/SceneSaver.java
@@ -1,5 +1,6 @@
 package com.projectswg.tools.csc.conversationeditor;
 
+import com.projectswg.tools.csc.conversationeditor.nodes.ConversationNode;
 import java.awt.Point;
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
diff --git a/ConversationEditor/src/com/projectswg/tools/csc/conversationeditor/SceneView.java b/ConversationEditor/src/com/projectswg/tools/csc/conversationeditor/SceneView.java
index 87c504a..de9de49 100644
--- a/ConversationEditor/src/com/projectswg/tools/csc/conversationeditor/SceneView.java
+++ b/ConversationEditor/src/com/projectswg/tools/csc/conversationeditor/SceneView.java
@@ -1,5 +1,6 @@
 package com.projectswg.tools.csc.conversationeditor;
 
+import com.projectswg.tools.csc.conversationeditor.nodes.ConversationNode;
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
 import java.util.ArrayList;
diff --git a/ConversationEditor/src/com/projectswg/tools/csc/conversationeditor/actions/NewConvEnd.java b/ConversationEditor/src/com/projectswg/tools/csc/conversationeditor/actions/NewConvEnd.java
index a434312..dc2de9a 100644
--- a/ConversationEditor/src/com/projectswg/tools/csc/conversationeditor/actions/NewConvEnd.java
+++ b/ConversationEditor/src/com/projectswg/tools/csc/conversationeditor/actions/NewConvEnd.java
@@ -5,7 +5,7 @@
  */
 package com.projectswg.tools.csc.conversationeditor.actions;
 
-import com.projectswg.tools.csc.conversationeditor.ConversationNode;
+import com.projectswg.tools.csc.conversationeditor.nodes.ConversationNode;
 import com.projectswg.tools.csc.conversationeditor.EditorTopComponent;
 import com.projectswg.tools.csc.conversationeditor.SceneView;
 import java.awt.event.ActionEvent;
diff --git a/ConversationEditor/src/com/projectswg/tools/csc/conversationeditor/actions/NewConvOption.java b/ConversationEditor/src/com/projectswg/tools/csc/conversationeditor/actions/NewConvOption.java
index e23a69d..cf603e2 100644
--- a/ConversationEditor/src/com/projectswg/tools/csc/conversationeditor/actions/NewConvOption.java
+++ b/ConversationEditor/src/com/projectswg/tools/csc/conversationeditor/actions/NewConvOption.java
@@ -1,6 +1,6 @@
 package com.projectswg.tools.csc.conversationeditor.actions;
 
-import com.projectswg.tools.csc.conversationeditor.ConversationNode;
+import com.projectswg.tools.csc.conversationeditor.nodes.ConversationNode;
 import com.projectswg.tools.csc.conversationeditor.EditorTopComponent;
 import com.projectswg.tools.csc.conversationeditor.SceneView;
 import java.awt.event.ActionEvent;
diff --git a/ConversationEditor/src/com/projectswg/tools/csc/conversationeditor/actions/NewConvResponse.java b/ConversationEditor/src/com/projectswg/tools/csc/conversationeditor/actions/NewConvResponse.java
index 8bed03c..4e4a54c 100644
--- a/ConversationEditor/src/com/projectswg/tools/csc/conversationeditor/actions/NewConvResponse.java
+++ b/ConversationEditor/src/com/projectswg/tools/csc/conversationeditor/actions/NewConvResponse.java
@@ -5,7 +5,7 @@
  */
 package com.projectswg.tools.csc.conversationeditor.actions;
 
-import com.projectswg.tools.csc.conversationeditor.ConversationNode;
+import com.projectswg.tools.csc.conversationeditor.nodes.ConversationNode;
 import com.projectswg.tools.csc.conversationeditor.EditorTopComponent;
 import com.projectswg.tools.csc.conversationeditor.SceneView;
 import java.awt.event.ActionEvent;
diff --git a/ConversationEditor/src/com/projectswg/tools/csc/conversationeditor/actions/TrashConvNode.java b/ConversationEditor/src/com/projectswg/tools/csc/conversationeditor/actions/TrashConvNode.java
index 14cb774..f100c8d 100644
--- a/ConversationEditor/src/com/projectswg/tools/csc/conversationeditor/actions/TrashConvNode.java
+++ b/ConversationEditor/src/com/projectswg/tools/csc/conversationeditor/actions/TrashConvNode.java
@@ -5,7 +5,7 @@
  */
 package com.projectswg.tools.csc.conversationeditor.actions;
 
-import com.projectswg.tools.csc.conversationeditor.ConversationNode;
+import com.projectswg.tools.csc.conversationeditor.nodes.ConversationNode;
 import com.projectswg.tools.csc.conversationeditor.ConversationWidget;
 import com.projectswg.tools.csc.conversationeditor.EditorTopComponent;
 import com.projectswg.tools.csc.conversationeditor.SceneView;
diff --git a/ConversationEditor/src/com/projectswg/tools/csc/conversationeditor/ConversationNode.java b/ConversationEditor/src/com/projectswg/tools/csc/conversationeditor/nodes/ConversationNode.java
similarity index 99%
rename from ConversationEditor/src/com/projectswg/tools/csc/conversationeditor/ConversationNode.java
rename to ConversationEditor/src/com/projectswg/tools/csc/conversationeditor/nodes/ConversationNode.java
index 7fa9b82..a2dfd24 100644
--- a/ConversationEditor/src/com/projectswg/tools/csc/conversationeditor/ConversationNode.java
+++ b/ConversationEditor/src/com/projectswg/tools/csc/conversationeditor/nodes/ConversationNode.java
@@ -1,4 +1,4 @@
-package com.projectswg.tools.csc.conversationeditor;
+package com.projectswg.tools.csc.conversationeditor.nodes;
 
 import java.lang.reflect.InvocationTargetException;
 import org.openide.nodes.AbstractNode;