diff --git a/README.md b/README.md
index f5e9aa2..5730aeb 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # Node Based Dialogue System for Unity
 
-This is a node-based visual narrative flow creation tool that uses Unity's GraphView API.
+This is Spebby's branch of Mert Kirimgeri's Node-Based visual narrative flow creation tool that uses Unity's GraphView API.
 ![](https://i.ibb.co/JngH8yr/header.png)
 
 ## Features
diff --git a/Samples/DialogueSystemDemo/DemoScene.unity b/Samples/DialogueSystemDemo/DemoScene.unity
index 3502a71..fc0b8bc 100644
--- a/Samples/DialogueSystemDemo/DemoScene.unity
+++ b/Samples/DialogueSystemDemo/DemoScene.unity
@@ -38,12 +38,12 @@ RenderSettings:
   m_ReflectionIntensity: 1
   m_CustomReflection: {fileID: 0}
   m_Sun: {fileID: 705507994}
-  m_IndirectSpecularColor: {r: 0.44657898, g: 0.4964133, b: 0.5748178, a: 1}
+  m_IndirectSpecularColor: {r: 0.44657874, g: 0.49641258, b: 0.5748171, a: 1}
   m_UseRadianceAmbientProbe: 0
 --- !u!157 &3
 LightmapSettings:
   m_ObjectHideFlags: 0
-  serializedVersion: 11
+  serializedVersion: 12
   m_GIWorkflowMode: 0
   m_GISettings:
     serializedVersion: 2
@@ -98,7 +98,7 @@ LightmapSettings:
     m_TrainingDataDestination: TrainingData
     m_LightProbeSampleCountMultiplier: 4
   m_LightingDataAsset: {fileID: 0}
-  m_UseShadowmask: 1
+  m_LightingSettings: {fileID: 4890085278179872738, guid: 8dd983d2ce1e91645bfa3c554c827c63, type: 2}
 --- !u!196 &4
 NavMeshSettings:
   serializedVersion: 2
@@ -118,6 +118,8 @@ NavMeshSettings:
     manualTileSize: 0
     tileSize: 256
     accuratePlacement: 0
+    maxJobWorkers: 0
+    preserveTilesOutsideBounds: 0
     debug:
       m_Flags: 0
   m_NavMeshData: {fileID: 0}
@@ -151,6 +153,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  m_SendPointerHoverToParent: 1
   m_HorizontalAxis: Horizontal
   m_VerticalAxis: Vertical
   m_SubmitButton: Submit
@@ -183,6 +186,7 @@ Transform:
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
   m_RootOrder: 3
@@ -197,6 +201,7 @@ GameObject:
   m_Component:
   - component: {fileID: 705507995}
   - component: {fileID: 705507994}
+  - component: {fileID: 705507996}
   m_Layer: 0
   m_Name: Directional Light
   m_TagString: Untagged
@@ -263,6 +268,7 @@ Light:
   m_UseColorTemperature: 0
   m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0}
   m_UseBoundingSphereOverride: 0
+  m_UseViewFrustumForShadowCasterCull: 1
   m_ShadowRadius: 0
   m_ShadowAngle: 0
 --- !u!4 &705507995
@@ -275,10 +281,31 @@ Transform:
   m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261}
   m_LocalPosition: {x: 0, y: 3, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
+--- !u!114 &705507996
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 705507993}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Version: 1
+  m_UsePipelineSettings: 1
+  m_AdditionalLightsShadowResolutionTier: 2
+  m_LightLayerMask: 1
+  m_CustomShadowLayers: 0
+  m_ShadowLayerMask: 1
+  m_LightCookieSize: {x: 1, y: 1}
+  m_LightCookieOffset: {x: 0, y: 0}
 --- !u!1 &963194225
 GameObject:
   m_ObjectHideFlags: 0
@@ -291,6 +318,7 @@ GameObject:
   - component: {fileID: 963194227}
   - component: {fileID: 963194226}
   - component: {fileID: 963194229}
+  - component: {fileID: 963194230}
   m_Layer: 0
   m_Name: Main Camera
   m_TagString: MainCamera
@@ -359,6 +387,7 @@ Transform:
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 1, z: -10}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
   m_RootOrder: 0
@@ -375,11 +404,43 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 37ccaca0d7c48634d8e70996696a3c4d, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  dialogue: {fileID: 0}
+  dialogue: {fileID: 11400000, guid: 5fa28b959f2b9f74d8abcb265072afed, type: 2}
   dialogueText: {fileID: 1818617936}
-  choicePrefab: {fileID: 3102500559854669817, guid: f77c89383fd59cd47a1921c9684d4122,
-    type: 3}
+  choicePrefab: {fileID: 3102500559854669817, guid: f77c89383fd59cd47a1921c9684d4122, type: 3}
   buttonContainer: {fileID: 1172275448}
+--- !u!114 &963194230
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 963194225}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_RenderShadows: 1
+  m_RequiresDepthTextureOption: 2
+  m_RequiresOpaqueTextureOption: 2
+  m_CameraType: 0
+  m_Cameras: []
+  m_RendererIndex: -1
+  m_VolumeLayerMask:
+    serializedVersion: 2
+    m_Bits: 1
+  m_VolumeTrigger: {fileID: 0}
+  m_VolumeFrameworkUpdateModeOption: 2
+  m_RenderPostProcessing: 0
+  m_Antialiasing: 0
+  m_AntialiasingQuality: 2
+  m_StopNaN: 0
+  m_Dithering: 0
+  m_ClearDepth: 1
+  m_AllowXRRendering: 1
+  m_RequiresDepthTexture: 0
+  m_RequiresColorTexture: 0
+  m_Version: 2
 --- !u!1 &998751766
 GameObject:
   m_ObjectHideFlags: 0
@@ -438,6 +499,7 @@ MonoBehaviour:
   m_FallbackScreenDPI: 96
   m_DefaultSpriteDPI: 96
   m_DynamicPixelsPerUnit: 1
+  m_PresetInfoIsWorld: 0
 --- !u!223 &998751769
 Canvas:
   m_ObjectHideFlags: 0
@@ -469,6 +531,7 @@ RectTransform:
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 0, y: 0, z: 0}
+  m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 1818617935}
   - {fileID: 1172275448}
@@ -509,6 +572,7 @@ RectTransform:
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 998751770}
   m_RootOrder: 1
@@ -543,6 +607,7 @@ MonoBehaviour:
   m_ChildControlHeight: 1
   m_ChildScaleWidth: 0
   m_ChildScaleHeight: 1
+  m_ReverseArrangement: 0
 --- !u!114 &1172275450
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -558,6 +623,8 @@ MonoBehaviour:
   m_Material: {fileID: 0}
   m_Color: {r: 1, g: 1, b: 1, a: 0}
   m_RaycastTarget: 0
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
@@ -607,6 +674,7 @@ RectTransform:
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 998751770}
   m_RootOrder: 0
@@ -631,6 +699,8 @@ MonoBehaviour:
   m_Material: {fileID: 0}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
@@ -655,13 +725,12 @@ MonoBehaviour:
   m_fontColorGradientPreset: {fileID: 0}
   m_spriteAsset: {fileID: 0}
   m_tintAllSprites: 0
+  m_StyleSheet: {fileID: 0}
+  m_TextStyleHashCode: -1183493901
   m_overrideHtmlColors: 0
   m_faceColor:
     serializedVersion: 2
     rgba: 4294967295
-  m_outlineColor:
-    serializedVersion: 2
-    rgba: 4278190080
   m_fontSize: 36
   m_fontSizeBase: 36
   m_fontWeight: 400
@@ -669,7 +738,9 @@ MonoBehaviour:
   m_fontSizeMin: 18
   m_fontSizeMax: 72
   m_fontStyle: 0
-  m_textAlignment: 514
+  m_HorizontalAlignment: 2
+  m_VerticalAlignment: 512
+  m_textAlignment: 65535
   m_characterSpacing: 0
   m_wordSpacing: 0
   m_lineSpacing: 0
@@ -679,10 +750,8 @@ MonoBehaviour:
   m_enableWordWrapping: 1
   m_wordWrappingRatios: 0.4
   m_overflowMode: 0
-  m_firstOverflowCharacterIndex: -1
   m_linkedTextComponent: {fileID: 0}
-  m_isLinkedTextComponent: 0
-  m_isTextTruncated: 0
+  parentLinkedComponent: {fileID: 0}
   m_enableKerning: 1
   m_enableExtraPadding: 0
   checkPaddingRequired: 0
@@ -690,40 +759,18 @@ MonoBehaviour:
   m_parseCtrlCharacters: 1
   m_isOrthographic: 1
   m_isCullingEnabled: 0
-  m_ignoreRectMaskCulling: 0
-  m_ignoreCulling: 1
   m_horizontalMapping: 0
   m_verticalMapping: 0
   m_uvLineOffset: 0
   m_geometrySortingOrder: 0
+  m_IsTextObjectScaleStatic: 0
   m_VertexBufferAutoSizeReduction: 1
-  m_firstVisibleCharacter: 0
   m_useMaxVisibleDescender: 1
   m_pageToDisplay: 1
   m_margin: {x: 0, y: 0, z: 0, w: 0}
-  m_textInfo:
-    textComponent: {fileID: 1818617936}
-    characterCount: 0
-    spriteCount: 0
-    spaceCount: 0
-    wordCount: 0
-    linkCount: 0
-    lineCount: 0
-    pageCount: 0
-    materialCount: 1
   m_isUsingLegacyAnimationComponent: 0
   m_isVolumetricText: 0
-  m_spriteAnimator: {fileID: 0}
   m_hasFontAssetChanged: 0
-  m_subTextObjects:
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
   m_baseMaterial: {fileID: 0}
   m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
 --- !u!222 &1818617937
diff --git a/Samples/DialogueSystemDemo/DemoSceneSettings.lighting b/Samples/DialogueSystemDemo/DemoSceneSettings.lighting
new file mode 100644
index 0000000..23e3559
--- /dev/null
+++ b/Samples/DialogueSystemDemo/DemoSceneSettings.lighting
@@ -0,0 +1,64 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!850595691 &4890085278179872738
+LightingSettings:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: DemoSceneSettings
+  serializedVersion: 4
+  m_GIWorkflowMode: 0
+  m_EnableBakedLightmaps: 1
+  m_EnableRealtimeLightmaps: 1
+  m_RealtimeEnvironmentLighting: 1
+  m_BounceScale: 1
+  m_AlbedoBoost: 1
+  m_IndirectOutputScale: 1
+  m_UsingShadowmask: 1
+  m_BakeBackend: 1
+  m_LightmapMaxSize: 1024
+  m_BakeResolution: 40
+  m_Padding: 2
+  m_LightmapCompression: 3
+  m_AO: 0
+  m_AOMaxDistance: 1
+  m_CompAOExponent: 1
+  m_CompAOExponentDirect: 0
+  m_ExtractAO: 0
+  m_MixedBakeMode: 2
+  m_LightmapsBakeMode: 1
+  m_FilterMode: 1
+  m_LightmapParameters: {fileID: 15204, guid: 0000000000000000f000000000000000, type: 0}
+  m_ExportTrainingData: 0
+  m_TrainingDataDestination: TrainingData
+  m_RealtimeResolution: 2
+  m_ForceWhiteAlbedo: 0
+  m_ForceUpdates: 0
+  m_FinalGather: 0
+  m_FinalGatherRayCount: 256
+  m_FinalGatherFiltering: 1
+  m_PVRCulling: 1
+  m_PVRSampling: 1
+  m_PVRDirectSampleCount: 32
+  m_PVRSampleCount: 500
+  m_PVREnvironmentSampleCount: 500
+  m_PVREnvironmentReferencePointCount: 2048
+  m_LightProbeSampleCountMultiplier: 4
+  m_PVRBounces: 2
+  m_PVRMinBounces: 2
+  m_PVREnvironmentMIS: 0
+  m_PVRFilteringMode: 2
+  m_PVRDenoiserTypeDirect: 0
+  m_PVRDenoiserTypeIndirect: 0
+  m_PVRDenoiserTypeAO: 0
+  m_PVRFilterTypeDirect: 0
+  m_PVRFilterTypeIndirect: 0
+  m_PVRFilterTypeAO: 0
+  m_PVRFilteringGaussRadiusDirect: 1
+  m_PVRFilteringGaussRadiusIndirect: 5
+  m_PVRFilteringGaussRadiusAO: 2
+  m_PVRFilteringAtrousPositionSigmaDirect: 0.5
+  m_PVRFilteringAtrousPositionSigmaIndirect: 2
+  m_PVRFilteringAtrousPositionSigmaAO: 1
+  m_PVRTiledBaking: 0
diff --git a/Samples/DialogueSystemDemo/DemoSceneSettings.lighting.meta b/Samples/DialogueSystemDemo/DemoSceneSettings.lighting.meta
new file mode 100644
index 0000000..6082db5
--- /dev/null
+++ b/Samples/DialogueSystemDemo/DemoSceneSettings.lighting.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 8dd983d2ce1e91645bfa3c554c827c63
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 4890085278179872738
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Samples/DialogueSystemDemo/DialogueParser.cs b/Samples/DialogueSystemDemo/DialogueParser.cs
index a0942eb..01b78eb 100644
--- a/Samples/DialogueSystemDemo/DialogueParser.cs
+++ b/Samples/DialogueSystemDemo/DialogueParser.cs
@@ -1,13 +1,11 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
+using NodeBasedDialogueSystem.com.DialogueSystem.Runtime;
 using TMPro;
 using UnityEngine;
 using UnityEngine.UI;
-using Subtegral.DialogueSystem.DataContainers;
 
-namespace Subtegral.DialogueSystem.Runtime
+namespace NodeBasedDialogueSystem.Samples.DialogueSystemDemo
 {
     public class DialogueParser : MonoBehaviour
     {
@@ -18,35 +16,32 @@ public class DialogueParser : MonoBehaviour
 
         private void Start()
         {
-            var narrativeData = dialogue.NodeLinks.First(); //Entrypoint node
-            ProceedToNarrative(narrativeData.TargetNodeGUID);
+            var narrativeData = dialogue.nodeLinks.First(); //Entrypoint node
+            ProceedToNarrative(narrativeData.targetNodeGuid);
         }
 
-        private void ProceedToNarrative(string narrativeDataGUID)
+        void ProceedToNarrative(string narrativeDataGuid)
         {
-            var text = dialogue.DialogueNodeData.Find(x => x.NodeGUID == narrativeDataGUID).DialogueText;
-            var choices = dialogue.NodeLinks.Where(x => x.BaseNodeGUID == narrativeDataGUID);
-            dialogueText.text = ProcessProperties(text);
-            var buttons = buttonContainer.GetComponentsInChildren<Button>();
-            for (int i = 0; i < buttons.Length; i++)
-            {
-                Destroy(buttons[i].gameObject);
-            }
+            var text = dialogue.dialogueNodeData.Find(x => x.nodeGuid == narrativeDataGuid).dialogueText;
+            IEnumerable<NodeLinkData> choices = dialogue.nodeLinks.Where(x => x.baseNodeGuid == narrativeDataGuid);
+            
+            var processedText = ProcessPropertiesArray(text);
+            dialogueText.text = string.Join("\n", processedText);
+            Button[] buttons = buttonContainer.GetComponentsInChildren<Button>();
+            foreach (var t in buttons)
+                Destroy(t.gameObject);
 
-            foreach (var choice in choices)
-            {
+            foreach (var choice in choices) {
                 var button = Instantiate(choicePrefab, buttonContainer);
-                button.GetComponentInChildren<Text>().text = ProcessProperties(choice.PortName);
-                button.onClick.AddListener(() => ProceedToNarrative(choice.TargetNodeGUID));
+                button.GetComponentInChildren<Text>().text = ProcessProperties(choice.portName);
+                button.onClick.AddListener(() => ProceedToNarrative(choice.targetNodeGuid));
             }
         }
 
-        private string ProcessProperties(string text)
+        string ProcessProperties(string text) => dialogue.exposedProperties.Aggregate(text, (current, exposedProperty) => current.Replace($"[{exposedProperty.propertyName}]", exposedProperty.propertyValue));
+        List<string> ProcessPropertiesArray(List<string> text)
         {
-            foreach (var exposedProperty in dialogue.ExposedProperties)
-            {
-                text = text.Replace($"[{exposedProperty.PropertyName}]", exposedProperty.PropertyValue);
-            }
+            dialogue.exposedProperties.ForEach(x => text = text.Select(y => y.Replace($"[{x.propertyName}]", x.propertyValue)).ToList());
             return text;
         }
     }
diff --git a/com.subtegral.dialoguesystem.meta b/com.DialogueSystem.meta
similarity index 100%
rename from com.subtegral.dialoguesystem.meta
rename to com.DialogueSystem.meta
diff --git a/com.subtegral.dialoguesystem/Editor.meta b/com.DialogueSystem/Editor.meta
similarity index 100%
rename from com.subtegral.dialoguesystem/Editor.meta
rename to com.DialogueSystem/Editor.meta
diff --git a/com.subtegral.dialoguesystem/Editor/Graph.meta b/com.DialogueSystem/Editor/Graph.meta
similarity index 100%
rename from com.subtegral.dialoguesystem/Editor/Graph.meta
rename to com.DialogueSystem/Editor/Graph.meta
diff --git a/com.subtegral.dialoguesystem/Editor/Graph/NodeSearchWindow.cs b/com.DialogueSystem/Editor/Graph/NodeSearchWindow.cs
similarity index 79%
rename from com.subtegral.dialoguesystem/Editor/Graph/NodeSearchWindow.cs
rename to com.DialogueSystem/Editor/Graph/NodeSearchWindow.cs
index de46704..3e1cd1c 100644
--- a/com.subtegral.dialoguesystem/Editor/Graph/NodeSearchWindow.cs
+++ b/com.DialogueSystem/Editor/Graph/NodeSearchWindow.cs
@@ -1,19 +1,18 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
+using System.Collections.Generic;
+using NodeBasedDialogueSystem.com.DialogueSystem.Editor.Nodes;
 using UnityEditor;
 using UnityEditor.Experimental.GraphView;
 using UnityEngine;
 using UnityEngine.UIElements;
 
-namespace Subtegral.DialogueSystem.Editor
+namespace NodeBasedDialogueSystem.com.DialogueSystem.Editor.Graph
 {
     public class NodeSearchWindow : ScriptableObject,ISearchWindowProvider
     {
-        private EditorWindow _window;
-        private StoryGraphView _graphView;
+        EditorWindow _window;
+        StoryGraphView _graphView;
 
-        private Texture2D _indentationIcon;
+        Texture2D _indentationIcon;
         
         public void Configure(EditorWindow window,StoryGraphView graphView)
         {
@@ -32,12 +31,10 @@ public List<SearchTreeEntry> CreateSearchTree(SearchWindowContext context)
             {
                 new SearchTreeGroupEntry(new GUIContent("Create Node"), 0),
                 new SearchTreeGroupEntry(new GUIContent("Dialogue"), 1),
-                new SearchTreeEntry(new GUIContent("Dialogue Node", _indentationIcon))
-                {
+                new SearchTreeEntry(new GUIContent("Dialogue Node", _indentationIcon)) {
                     level = 2, userData = new DialogueNode()
                 },
-                new SearchTreeEntry(new GUIContent("Comment Block",_indentationIcon))
-                {
+                new SearchTreeEntry(new GUIContent("Comment Block",_indentationIcon)) {
                     level = 1,
                     userData = new Group()
                 }
@@ -46,16 +43,16 @@ public List<SearchTreeEntry> CreateSearchTree(SearchWindowContext context)
             return tree;
         }
 
-        public bool OnSelectEntry(SearchTreeEntry SearchTreeEntry, SearchWindowContext context)
+        public bool OnSelectEntry(SearchTreeEntry searchTreeEntry, SearchWindowContext context)
         {
             //Editor window-based mouse position
             var mousePosition = _window.rootVisualElement.ChangeCoordinatesTo(_window.rootVisualElement.parent,
                 context.screenMousePosition - _window.position.position);
             var graphMousePosition = _graphView.contentViewContainer.WorldToLocal(mousePosition);
-            switch (SearchTreeEntry.userData)
+            switch (searchTreeEntry.userData)
             {
                 case DialogueNode dialogueNode:
-                    _graphView.CreateNewDialogueNode("Dialogue Node",graphMousePosition);
+                    _graphView.CreateNewDialogueNode(new List<string> {}, graphMousePosition);
                     return true;
                 case Group group:
                     var rect = new Rect(graphMousePosition, _graphView.DefaultCommentBlockSize);
diff --git a/com.subtegral.dialoguesystem/Editor/Graph/NodeSearchWindow.cs.meta b/com.DialogueSystem/Editor/Graph/NodeSearchWindow.cs.meta
similarity index 100%
rename from com.subtegral.dialoguesystem/Editor/Graph/NodeSearchWindow.cs.meta
rename to com.DialogueSystem/Editor/Graph/NodeSearchWindow.cs.meta
diff --git a/com.DialogueSystem/Editor/Graph/StoryGraph.cs b/com.DialogueSystem/Editor/Graph/StoryGraph.cs
new file mode 100644
index 0000000..149498d
--- /dev/null
+++ b/com.DialogueSystem/Editor/Graph/StoryGraph.cs
@@ -0,0 +1,138 @@
+using System.Linq;
+using NodeBasedDialogueSystem.com.DialogueSystem.Runtime;
+using UnityEditor;
+using UnityEditor.Experimental.GraphView;
+using UnityEditor.UIElements;
+using UnityEngine;
+using UnityEngine.UIElements;
+
+namespace NodeBasedDialogueSystem.com.DialogueSystem.Editor.Graph
+{
+    public class StoryGraph : EditorWindow
+    {
+        string _fileName;
+        string _filePath;
+        StoryGraphView _graphView;
+        DialogueContainer _dialogueContainer;
+
+        [MenuItem("Graph/Narrative Graph")]
+        public static void CreateGraphViewWindow()
+        {
+            var window = GetWindow<StoryGraph>();
+            window.titleContent = new GUIContent("Narrative Graph");
+        }
+
+        void ConstructGraphView()
+        {
+            _graphView = new StoryGraphView(this) {
+                name = "Narrative Graph",
+            };
+            _graphView.StretchToParentSize();
+            rootVisualElement.Add(_graphView);
+        }
+
+        void RegenerateToolbar()
+        {
+            // remove the old toolbar
+            rootVisualElement.Remove(rootVisualElement.Q<Toolbar>());
+            // generate a new toolbar
+            GenerateToolbar();
+        }
+        
+        void GenerateToolbar() 
+        {
+            var toolbar           = new Toolbar();
+            // add a label for the file name, non editable
+            // add the save and load buttons
+            toolbar.Add(new Button(() => RequestDataOperation(0)) {text = "New"});
+            toolbar.Add(new Button(() => RequestDataOperation(1)) {text = "Save"});
+            toolbar.Add(new Button(() => RequestDataOperation(2)) {text = "Load"});
+
+            if (_fileName != string.Empty) {
+                var fileNameTextField = new Label($"File Name: {_fileName}");
+                toolbar.Add(fileNameTextField);
+            }
+
+            // toolbar.Add(new Button(() => _graphView.CreateNewDialogueNode("Dialogue Node")) {text = "New Node",});
+            rootVisualElement.Add(toolbar);
+        }
+
+        void RequestDataOperation(byte option) 
+        {
+            var saveUtility = GraphSaveUtility.GetInstance(_graphView);
+            switch (option) {
+                case 0: 
+                {
+                    _fileName = string.Empty;
+                    _filePath = string.Empty;
+                    rootVisualElement.Remove(_graphView);
+                    ConstructGraphView();
+                    RegenerateToolbar();
+                    GenerateMiniMap();
+                    GenerateBlackBoard();
+                    break;
+                }
+                case 1: 
+                {
+                    if (_filePath != string.Empty) {
+                        saveUtility.SaveGraph(_filePath);
+                    } else saveUtility.SaveGraph(out _filePath);
+                    
+                    Debug.Log($"Saved Narrative at: {_filePath}");
+                    _fileName = _filePath.Split('/').Last();
+                    _fileName = _fileName[..^6];
+                    RegenerateToolbar();
+                    break;
+                }
+                case 2:
+                {
+                    saveUtility.LoadNarrative(out _filePath, out _fileName);
+                    RegenerateToolbar();
+                    break;
+                }
+            }
+        }
+
+        void OnEnable()
+        {
+            ConstructGraphView();
+            GenerateToolbar();
+            GenerateMiniMap();
+            GenerateBlackBoard();
+        }
+
+        void GenerateMiniMap()
+        {
+            var miniMap = new MiniMap {anchored = true};
+            var cords = _graphView.contentViewContainer.WorldToLocal(new Vector2(this.maxSize.x - 10, 30));
+            miniMap.SetPosition(new Rect(cords.x, cords.y, 200, 140));
+            _graphView.Add(miniMap);
+        }
+
+        void GenerateBlackBoard()
+        {
+            var blackboard = new Blackboard(_graphView);
+            blackboard.Add(new BlackboardSection {title = "Exposed Variables"});
+            blackboard.addItemRequested = _ => {
+                _graphView.AddPropertyToBlackBoard(ExposedProperty.CreateInstance());
+            };
+            blackboard.editTextRequested = (_, element, newValue) => {
+                var oldPropertyName = ((BlackboardField) element).text;
+                if (_graphView.ExposedProperties.Any(x => x.propertyName == newValue)) {
+                    EditorUtility.DisplayDialog("Error", "This property name already exists, please chose another one.",
+                        "OK");
+                    return;
+                }
+
+                var targetIndex = _graphView.ExposedProperties.FindIndex(x => x.propertyName == oldPropertyName);
+                _graphView.ExposedProperties[targetIndex].propertyName = newValue;
+                ((BlackboardField) element).text = newValue;
+            };
+            blackboard.SetPosition(new Rect(10,30,200,300));
+            _graphView.Add(blackboard);
+            _graphView.Blackboard = blackboard;
+        }
+
+        void OnDisable() => rootVisualElement.Remove(_graphView);
+    }
+}
\ No newline at end of file
diff --git a/com.subtegral.dialoguesystem/Editor/Graph/StoryGraph.cs.meta b/com.DialogueSystem/Editor/Graph/StoryGraph.cs.meta
similarity index 100%
rename from com.subtegral.dialoguesystem/Editor/Graph/StoryGraph.cs.meta
rename to com.DialogueSystem/Editor/Graph/StoryGraph.cs.meta
diff --git a/com.subtegral.dialoguesystem/Editor/Graph/StoryGraphView.cs b/com.DialogueSystem/Editor/Graph/StoryGraphView.cs
similarity index 54%
rename from com.subtegral.dialoguesystem/Editor/Graph/StoryGraphView.cs
rename to com.DialogueSystem/Editor/Graph/StoryGraphView.cs
index f644e96..5e6b015 100644
--- a/com.subtegral.dialoguesystem/Editor/Graph/StoryGraphView.cs
+++ b/com.DialogueSystem/Editor/Graph/StoryGraphView.cs
@@ -1,16 +1,14 @@
 using System;
-using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
-using Subtegral.DialogueSystem.DataContainers;
-using UnityEditor;
+using NodeBasedDialogueSystem.com.DialogueSystem.Editor.Nodes;
+using NodeBasedDialogueSystem.com.DialogueSystem.Runtime;
 using UnityEditor.Experimental.GraphView;
 using UnityEngine;
-using UnityEngine.UI;
 using UnityEngine.UIElements;
 using Button = UnityEngine.UIElements.Button;
 
-namespace Subtegral.DialogueSystem.Editor
+namespace NodeBasedDialogueSystem.com.DialogueSystem.Editor.Graph
 {
     public class StoryGraphView : GraphView
     {
@@ -18,7 +16,7 @@ public class StoryGraphView : GraphView
         public readonly Vector2 DefaultCommentBlockSize = new Vector2(300, 200);
         public DialogueNode EntryPointNode;
         public Blackboard Blackboard = new Blackboard();
-        public List<ExposedProperty> ExposedProperties { get; private set; } = new List<ExposedProperty>();
+        internal List<ExposedProperty> ExposedProperties { get; set; } = new List<ExposedProperty>();
         private NodeSearchWindow _searchWindow;
 
         public StoryGraphView(StoryGraph editorWindow)
@@ -36,7 +34,6 @@ public StoryGraphView(StoryGraph editorWindow)
             grid.StretchToParentSize();
 
             AddElement(GetEntryPointNodeInstance());
-
             AddSearchWindow(editorWindow);
         }
 
@@ -58,12 +55,10 @@ public void ClearBlackBoardAndExposedProperties()
 
         public Group CreateCommentBlock(Rect rect, CommentBlockData commentBlockData = null)
         {
-            if(commentBlockData==null)
-                commentBlockData = new CommentBlockData();
-            var group = new Group
-            {
+            commentBlockData ??= new CommentBlockData();
+            var group = new Group {
                 autoUpdateGeometry = true,
-                title = commentBlockData.Title
+                title              = commentBlockData.title
             };
             AddElement(group);
             group.SetPosition(rect);
@@ -72,31 +67,28 @@ public Group CreateCommentBlock(Rect rect, CommentBlockData commentBlockData = n
 
         public void AddPropertyToBlackBoard(ExposedProperty property, bool loadMode = false)
         {
-            var localPropertyName = property.PropertyName;
-            var localPropertyValue = property.PropertyValue;
-            if (!loadMode)
-            {
-                while (ExposedProperties.Any(x => x.PropertyName == localPropertyName))
+            var localPropertyName  = property.propertyName;
+            var localPropertyValue = property.propertyValue;
+            if (!loadMode) {
+                while (ExposedProperties.Any(x => x.propertyName == localPropertyName))
                     localPropertyName = $"{localPropertyName}(1)";
             }
 
             var item = ExposedProperty.CreateInstance();
-            item.PropertyName = localPropertyName;
-            item.PropertyValue = localPropertyValue;
+            item.propertyName  = localPropertyName;
+            item.propertyValue = localPropertyValue;
             ExposedProperties.Add(item);
 
             var container = new VisualElement();
-            var field = new BlackboardField {text = localPropertyName, typeText = "string"};
+            var field     = new BlackboardField { text = localPropertyName, typeText = "string" };
             container.Add(field);
 
-            var propertyValueTextField = new TextField("Value:")
-            {
+            var propertyValueTextField = new TextField("Value:") {
                 value = localPropertyValue
             };
-            propertyValueTextField.RegisterValueChangedCallback(evt =>
-            {
-                var index = ExposedProperties.FindIndex(x => x.PropertyName == item.PropertyName);
-                ExposedProperties[index].PropertyValue = evt.newValue;
+            propertyValueTextField.RegisterValueChangedCallback(evt => {
+                var index = ExposedProperties.FindIndex(x => x.propertyName == item.propertyName);
+                ExposedProperties[index].propertyValue = evt.newValue;
             });
             var sa = new BlackboardRow(field, propertyValueTextField);
             container.Add(sa);
@@ -106,30 +98,24 @@ public void AddPropertyToBlackBoard(ExposedProperty property, bool loadMode = fa
         public override List<Port> GetCompatiblePorts(Port startPort, NodeAdapter nodeAdapter)
         {
             var compatiblePorts = new List<Port>();
-            var startPortView = startPort;
+            var startPortView   = startPort;
 
-            ports.ForEach((port) =>
-            {
-                var portView = port;
-                if (startPortView != portView && startPortView.node != portView.node)
+            ports.ForEach((port) => {
+                if (startPortView != port && startPortView.node != port.node)
                     compatiblePorts.Add(port);
             });
 
             return compatiblePorts;
         }
 
-        public void CreateNewDialogueNode(string nodeName, Vector2 position)
-        {
+        public void CreateNewDialogueNode(List<string> nodeName, Vector2 position) =>
             AddElement(CreateNode(nodeName, position));
-        }
 
-        public DialogueNode CreateNode(string nodeName, Vector2 position)
+        public DialogueNode CreateNode(List<string> dialogue, Vector2 position)
         {
-            var tempDialogueNode = new DialogueNode()
-            {
-                title = nodeName,
-                DialogueText = nodeName,
-                GUID = Guid.NewGuid().ToString()
+            var tempDialogueNode = new DialogueNode() {
+                GUID = Guid.NewGuid().ToString(),
+                DialogueText = dialogue,
             };
             tempDialogueNode.styleSheets.Add(Resources.Load<StyleSheet>("Node"));
             var inputPort = GetPortInstance(tempDialogueNode, Direction.Input, Port.Capacity.Multi);
@@ -138,27 +124,49 @@ public DialogueNode CreateNode(string nodeName, Vector2 position)
             tempDialogueNode.RefreshExpandedState();
             tempDialogueNode.RefreshPorts();
             tempDialogueNode.SetPosition(new Rect(position,
-                DefaultNodeSize)); //To-Do: implement screen center instantiation positioning
+                                                  DefaultNodeSize)); //To-Do: implement screen center instantiation positioning
 
-            var textField = new TextField("");
-            textField.RegisterValueChangedCallback(evt =>
-            {
-                tempDialogueNode.DialogueText = evt.newValue;
-                tempDialogueNode.title = evt.newValue;
-            });
-            textField.SetValueWithoutNotify(tempDialogueNode.title);
-            tempDialogueNode.mainContainer.Add(textField);
+            var dialogueButton = new Button(() => { AddTextField(tempDialogueNode); }) {
+                text = "Add Dialogue"
+            };
+            tempDialogueNode.titleButtonContainer.Add(dialogueButton);
+
+            if (dialogue.Count > 0) {
+                foreach (var text in dialogue)
+                    AddTextField(tempDialogueNode, text);
+            } else {
+                AddTextField(tempDialogueNode);
+            }
 
-            var button = new Button(() => { AddChoicePort(tempDialogueNode); })
-            {
+            var choiceButton = new Button(() => { AddChoicePort(tempDialogueNode); }) {
                 text = "Add Choice"
             };
-            tempDialogueNode.titleButtonContainer.Add(button);
+            tempDialogueNode.titleButtonContainer.Add(choiceButton);
             return tempDialogueNode;
         }
 
+        void AddTextField(DialogueNode nodeCache, string text = "New Text")
+        {
+            var textField = new TextField() {
+                name      = "textField",
+                value     = text,
+                multiline = true,
+                tripleClickSelectsLine = true,
+            };
+            nodeCache.mainContainer.Add(textField);
+            var deleteButton = new Button(() => RemoveTextField(nodeCache, textField)) {
+                text = "X"
+            };
+            textField.Add(deleteButton);
+        }
 
-        public void AddChoicePort(DialogueNode nodeCache, string overriddenPortName = "")
+        void RemoveTextField(DialogueNode nodeCache, TextField textField)
+        {
+            nodeCache.DialogueText.Remove(textField.value);
+            nodeCache.mainContainer.Remove(textField);
+        }
+
+        public void AddChoicePort(Node nodeCache, string overriddenPortName = "")
         {
             var generatedPort = GetPortInstance(nodeCache, Direction.Output);
             var portLabel = generatedPort.contentContainer.Q<Label>("type");
@@ -170,16 +178,14 @@ public void AddChoicePort(DialogueNode nodeCache, string overriddenPortName = ""
                 : overriddenPortName;
 
 
-            var textField = new TextField()
-            {
-                name = string.Empty,
+            var textField = new TextField() {
+                name  = "port",
                 value = outputPortName
             };
             textField.RegisterValueChangedCallback(evt => generatedPort.portName = evt.newValue);
             generatedPort.contentContainer.Add(new Label("  "));
             generatedPort.contentContainer.Add(textField);
-            var deleteButton = new Button(() => RemovePort(nodeCache, generatedPort))
-            {
+            var deleteButton = new Button(() => RemovePort(nodeCache, generatedPort)) {
                 text = "X"
             };
             generatedPort.contentContainer.Add(deleteButton);
@@ -189,15 +195,18 @@ public void AddChoicePort(DialogueNode nodeCache, string overriddenPortName = ""
             nodeCache.RefreshExpandedState();
         }
 
-        private void RemovePort(Node node, Port socket)
+        /// <summary> Removes a port from a node.</summary>
+        /// <param name="node">The node to remove the port from.</param>
+        /// <param name="socket">The port to remove.</param>
+        void RemovePort(Node node, Port socket)
         {
-            var targetEdge = edges.ToList()
-                .Where(x => x.output.portName == socket.portName && x.output.node == socket.node);
-            if (targetEdge.Any())
-            {
-                var edge = targetEdge.First();
+            IEnumerable<Edge> targetEdge = edges.ToList()
+                                                .Where(x => x.output.portName == socket.portName && x.output.node == socket.node);
+            Edge[] enumerable = targetEdge as Edge[] ?? targetEdge.ToArray();
+            if (enumerable.Any()) {
+                var edge = enumerable.First();
                 edge.input.Disconnect(edge);
-                RemoveElement(targetEdge.First());
+                RemoveElement(enumerable.First());
             }
 
             node.outputContainer.Remove(socket);
@@ -205,20 +214,23 @@ private void RemovePort(Node node, Port socket)
             node.RefreshExpandedState();
         }
 
-        private Port GetPortInstance(DialogueNode node, Direction nodeDirection,
-            Port.Capacity capacity = Port.Capacity.Single)
-        {
-            return node.InstantiatePort(Orientation.Horizontal, nodeDirection, capacity, typeof(float));
-        }
-
-        private DialogueNode GetEntryPointNodeInstance()
+        /// <summary> Creates a new port instance for a given node.</summary>
+        /// <param name="node">The node to create the port for.</param>
+        /// <param name="nodeDirection">The direction of the port.</param>
+        /// <param name="capacity">The capacity of the port.</param>
+        /// <returns>The port instance.</returns>
+        static Port GetPortInstance(Node node, Direction nodeDirection,
+                                    Port.Capacity capacity = Port.Capacity.Single) => node.InstantiatePort(Orientation.Horizontal, nodeDirection, capacity, typeof(float));
+    
+        /// <summary>Creates a new entry point node</summary>
+        /// <returns>The created node.</returns>
+        static DialogueNode GetEntryPointNodeInstance()
         {
-            var nodeCache = new DialogueNode()
-            {
+            var nodeCache = new DialogueNode() {
                 title = "START",
                 GUID = Guid.NewGuid().ToString(),
-                DialogueText = "ENTRYPOINT",
-                EntyPoint = true
+                DialogueText = new List<string> {"ENTRYPOINT"},
+                EntryPoint = true
             };
 
             var generatedPort = GetPortInstance(nodeCache, Direction.Output);
diff --git a/com.subtegral.dialoguesystem/Editor/Graph/StoryGraphView.cs.meta b/com.DialogueSystem/Editor/Graph/StoryGraphView.cs.meta
similarity index 100%
rename from com.subtegral.dialoguesystem/Editor/Graph/StoryGraphView.cs.meta
rename to com.DialogueSystem/Editor/Graph/StoryGraphView.cs.meta
diff --git a/com.DialogueSystem/Editor/GraphSaveUtility.cs b/com.DialogueSystem/Editor/GraphSaveUtility.cs
new file mode 100644
index 0000000..72e9b01
--- /dev/null
+++ b/com.DialogueSystem/Editor/GraphSaveUtility.cs
@@ -0,0 +1,223 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using NodeBasedDialogueSystem.com.DialogueSystem.Editor.Graph;
+using NodeBasedDialogueSystem.com.DialogueSystem.Editor.Nodes;
+using NodeBasedDialogueSystem.com.DialogueSystem.Runtime;
+using UnityEditor;
+using UnityEditor.Experimental.GraphView;
+using UnityEngine;
+using UnityEngine.UIElements;
+
+namespace NodeBasedDialogueSystem.com.DialogueSystem.Editor
+{
+    public class GraphSaveUtility
+    {
+        IEnumerable<Edge> Edges => _graphView.edges.ToList();
+        List<DialogueNode> Nodes => _graphView.nodes.ToList().Cast<DialogueNode>().ToList();
+
+        List<Group> CommentBlocks =>
+            _graphView.graphElements.ToList().Where(x => x is Group).Cast<Group>().ToList();
+        
+        DialogueContainer _dialogueContainer;
+        StoryGraphView _graphView;
+
+        public static GraphSaveUtility GetInstance(StoryGraphView graphView) => new GraphSaveUtility
+        {
+            _graphView = graphView
+        };
+
+        public void SaveGraph() => SaveGraph(out _);
+
+        public void SaveGraph(out string filePath)
+        {
+            filePath = EditorUtility.SaveFilePanelInProject("Save Narrative", "New Narrative", "asset", "Pick a save location");
+            if (string.IsNullOrEmpty(filePath))
+                return;
+
+            SaveGraph(filePath);
+            EditorUtility.RevealInFinder($"{filePath}");
+        }
+
+        public void SaveGraph(string filePath)
+        {
+            var dialogueContainerObject = ScriptableObject.CreateInstance<DialogueContainer>();
+            if (!SaveNodes(dialogueContainerObject))
+                return;
+            SaveExposedProperties(dialogueContainerObject);
+            SaveCommentBlocks(dialogueContainerObject);
+
+            var loadedAsset = AssetDatabase.LoadAssetAtPath($"{filePath}", typeof(DialogueContainer));
+
+            if (loadedAsset == null || !AssetDatabase.Contains(loadedAsset)) {
+                AssetDatabase.CreateAsset(dialogueContainerObject, $"{filePath}");
+            } else {
+                var container = loadedAsset as DialogueContainer;
+                if (container != null) {
+                    container.nodeLinks         = dialogueContainerObject.nodeLinks;
+                    container.dialogueNodeData  = dialogueContainerObject.dialogueNodeData;
+                    container.exposedProperties = dialogueContainerObject.exposedProperties;
+                    container.commentBlockData  = dialogueContainerObject.commentBlockData;
+                    EditorUtility.SetDirty(container);
+                }
+            }
+
+            AssetDatabase.SaveAssets();
+        }
+
+        bool SaveNodes(DialogueContainer dialogueContainerObject)
+        {
+            if (!Edges.Any()) return false;
+            Edge[] connectedSockets = Edges.Where(x => x.input.node != null).ToArray();
+            for (var i = 0; i < connectedSockets.Count(); i++) {
+                var inputNode = (connectedSockets[i].input.node as DialogueNode);
+                if (connectedSockets[i].output.node is not DialogueNode outputNode)
+                    continue;
+                if (inputNode != null) {
+                    dialogueContainerObject.nodeLinks.Add(new NodeLinkData {
+                        baseNodeGuid   = outputNode.GUID,
+                        portName       = connectedSockets[i].output.portName,
+                        targetNodeGuid = inputNode.GUID
+                    });
+                }
+            }
+            
+            foreach (var node in Nodes.Where(node => !node.EntryPoint)) {
+                // add every TextField's value to the dialogueText list
+                node.DialogueText.Clear();
+                node.mainContainer.Query<TextField>().ForEach(textField => {
+                    if (textField.value.Length > 0 && textField.name == "textField") {
+                        node.DialogueText.Add(textField.value);
+                    }
+                });
+                
+                dialogueContainerObject.dialogueNodeData.Add(new DialogueNodeData {
+                    nodeGuid     = node.GUID,
+                    dialogueText = node.DialogueText,
+                    position     = node.GetPosition().position
+                });
+            }
+
+            return true;
+        }
+
+        void SaveExposedProperties(DialogueContainer dialogueContainer)
+        {
+            dialogueContainer.exposedProperties.Clear();
+            dialogueContainer.exposedProperties.AddRange(_graphView.ExposedProperties);
+        }
+
+        void SaveCommentBlocks(DialogueContainer dialogueContainer)
+        {
+            foreach (var block in CommentBlocks) {
+                List<string> nodes = block.containedElements.Where(x => x is DialogueNode).Cast<DialogueNode>().Select(x => x.GUID)
+                                          .ToList();
+
+                dialogueContainer.commentBlockData.Add(new CommentBlockData {
+                    childNodes = nodes,
+                    title = block.title,
+                    position = block.GetPosition().position
+                });
+            }
+        }
+
+        public void LoadNarrative(out string filePath, out string fileName)
+        {
+            fileName = String.Empty;
+            filePath = EditorUtility.OpenFilePanel("Load Narrative", Application.dataPath + "/Resources", "asset");
+            if (filePath.Length == 0)
+                return;
+            
+            // reduce the file path to only include the path to the file from the Application.dataPath folder
+            filePath = filePath.Replace(Application.dataPath, "Assets");
+            // find the last / in the file path and get the file name
+            var startIndex = filePath.LastIndexOf("/", StringComparison.Ordinal) + 1;
+            var endIndex   = filePath.LastIndexOf(".asset", StringComparison.Ordinal);
+            fileName = filePath.Substring(startIndex, endIndex - startIndex);
+            // shorten the file path to only include the path to the file from the Assets folder
+            _dialogueContainer = AssetDatabase.LoadAssetAtPath<DialogueContainer>(filePath);
+
+            ClearGraph();
+            GenerateDialogueNodes();
+            ConnectDialogueNodes();
+            AddExposedProperties();
+            GenerateCommentBlocks();
+        }
+
+        /// <summary>
+        /// Set Entry point GUID then Get All Nodes, remove all and their edges. Leave only the entrypoint node. (Remove its edge too)
+        /// </summary>
+        void ClearGraph()
+        {
+            Nodes.Find(x => x.EntryPoint).GUID = _dialogueContainer.nodeLinks[0].baseNodeGuid;
+            foreach (var perNode in Nodes.Where(perNode => !perNode.EntryPoint)) {
+                Edges.Where(x => x.input.node == perNode).ToList()
+                     .ForEach(edge => _graphView.RemoveElement(edge));
+                _graphView.RemoveElement(perNode);
+            }
+        }
+
+        /// <summary>
+        /// Create All serialized nodes and assign their guid and dialogue text to them
+        /// </summary>
+        void GenerateDialogueNodes()
+        {
+            foreach (var node in _dialogueContainer.dialogueNodeData) {
+                var tempNode = _graphView.CreateNode(node.dialogueText, Vector2.zero);
+                tempNode.GUID = node.nodeGuid;
+                _graphView.AddElement(tempNode);
+
+                List<NodeLinkData> nodePorts = _dialogueContainer.nodeLinks.Where(x => x.baseNodeGuid == node.nodeGuid).ToList();
+                nodePorts.ForEach(x => _graphView.AddChoicePort(tempNode, x.portName));
+            }
+        }
+
+        void ConnectDialogueNodes()
+        {
+            for (var i = 0; i < Nodes.Count; i++) {
+                var k= i; //Prevent access to modified closure
+                List<NodeLinkData> connections = _dialogueContainer.nodeLinks.Where(x => x.baseNodeGuid == Nodes[k].GUID).ToList();
+                for (var j = 0; j < connections.Count(); j++) {
+                    var targetNodeGuid = connections[j].targetNodeGuid;
+                    var targetNode = Nodes.First(x => x.GUID == targetNodeGuid);
+                    LinkNodesTogether(Nodes[i].outputContainer[j].Q<Port>(), (Port) targetNode.inputContainer[0]);
+
+                    targetNode.SetPosition(new Rect(
+                        _dialogueContainer.dialogueNodeData.First(x => x.nodeGuid == targetNodeGuid).position,
+                        _graphView.DefaultNodeSize));
+                }
+            }
+        }
+
+        void LinkNodesTogether(Port outputSocket, Port inputSocket)
+        {
+            var tempEdge = new Edge() {
+                output = outputSocket,
+                input = inputSocket
+            };
+            tempEdge.input.Connect(tempEdge);
+            tempEdge.output.Connect(tempEdge);
+            _graphView.Add(tempEdge);
+        }
+
+        void AddExposedProperties()
+        {
+            _graphView.ClearBlackBoardAndExposedProperties();
+            foreach (var exposedProperty in _dialogueContainer.exposedProperties) {
+                _graphView.AddPropertyToBlackBoard(exposedProperty);
+            }
+        }
+
+        void GenerateCommentBlocks()
+        {
+            foreach (var commentBlock in CommentBlocks) {
+                _graphView.RemoveElement(commentBlock);
+            }
+
+            foreach (var commentBlockData in _dialogueContainer.commentBlockData) {
+               var block = _graphView.CreateCommentBlock(new Rect(commentBlockData.position, _graphView.DefaultCommentBlockSize), commentBlockData);
+               block.AddElements(Nodes.Where(x=>commentBlockData.childNodes.Contains(x.GUID)));
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/com.subtegral.dialoguesystem/Editor/GraphSaveUtility.cs.meta b/com.DialogueSystem/Editor/GraphSaveUtility.cs.meta
similarity index 100%
rename from com.subtegral.dialoguesystem/Editor/GraphSaveUtility.cs.meta
rename to com.DialogueSystem/Editor/GraphSaveUtility.cs.meta
diff --git a/com.subtegral.dialoguesystem/Editor/Nodes.meta b/com.DialogueSystem/Editor/Nodes.meta
similarity index 100%
rename from com.subtegral.dialoguesystem/Editor/Nodes.meta
rename to com.DialogueSystem/Editor/Nodes.meta
diff --git a/com.DialogueSystem/Editor/Nodes/DialogueNode.cs b/com.DialogueSystem/Editor/Nodes/DialogueNode.cs
new file mode 100644
index 0000000..6bcc0b0
--- /dev/null
+++ b/com.DialogueSystem/Editor/Nodes/DialogueNode.cs
@@ -0,0 +1,12 @@
+using System.Collections.Generic;
+using UnityEditor.Experimental.GraphView;
+
+namespace NodeBasedDialogueSystem.com.DialogueSystem.Editor.Nodes
+{
+    public class DialogueNode : Node
+    {
+        public string GUID;
+        public List<string> DialogueText;
+        public bool EntryPoint = false;
+    }
+}
\ No newline at end of file
diff --git a/com.subtegral.dialoguesystem/Editor/Nodes/DialogueNode.cs.meta b/com.DialogueSystem/Editor/Nodes/DialogueNode.cs.meta
similarity index 100%
rename from com.subtegral.dialoguesystem/Editor/Nodes/DialogueNode.cs.meta
rename to com.DialogueSystem/Editor/Nodes/DialogueNode.cs.meta
diff --git a/com.subtegral.dialoguesystem/Editor/Resources.meta b/com.DialogueSystem/Editor/Resources.meta
similarity index 100%
rename from com.subtegral.dialoguesystem/Editor/Resources.meta
rename to com.DialogueSystem/Editor/Resources.meta
diff --git a/com.subtegral.dialoguesystem/Editor/Resources/NarrativeGraph.uss b/com.DialogueSystem/Editor/Resources/NarrativeGraph.uss
similarity index 100%
rename from com.subtegral.dialoguesystem/Editor/Resources/NarrativeGraph.uss
rename to com.DialogueSystem/Editor/Resources/NarrativeGraph.uss
diff --git a/com.subtegral.dialoguesystem/Editor/Resources/NarrativeGraph.uss.meta b/com.DialogueSystem/Editor/Resources/NarrativeGraph.uss.meta
similarity index 100%
rename from com.subtegral.dialoguesystem/Editor/Resources/NarrativeGraph.uss.meta
rename to com.DialogueSystem/Editor/Resources/NarrativeGraph.uss.meta
diff --git a/com.subtegral.dialoguesystem/Editor/Resources/Node.uss b/com.DialogueSystem/Editor/Resources/Node.uss
similarity index 100%
rename from com.subtegral.dialoguesystem/Editor/Resources/Node.uss
rename to com.DialogueSystem/Editor/Resources/Node.uss
diff --git a/com.subtegral.dialoguesystem/Editor/Resources/Node.uss.meta b/com.DialogueSystem/Editor/Resources/Node.uss.meta
similarity index 100%
rename from com.subtegral.dialoguesystem/Editor/Resources/Node.uss.meta
rename to com.DialogueSystem/Editor/Resources/Node.uss.meta
diff --git a/com.subtegral.dialoguesystem/Editor/Subtegral.DialogueSystem.Editor.asmdef b/com.DialogueSystem/Editor/Subtegral.DialogueSystem.Editor.asmdef
similarity index 100%
rename from com.subtegral.dialoguesystem/Editor/Subtegral.DialogueSystem.Editor.asmdef
rename to com.DialogueSystem/Editor/Subtegral.DialogueSystem.Editor.asmdef
diff --git a/com.subtegral.dialoguesystem/Editor/Subtegral.DialogueSystem.Editor.asmdef.meta b/com.DialogueSystem/Editor/Subtegral.DialogueSystem.Editor.asmdef.meta
similarity index 100%
rename from com.subtegral.dialoguesystem/Editor/Subtegral.DialogueSystem.Editor.asmdef.meta
rename to com.DialogueSystem/Editor/Subtegral.DialogueSystem.Editor.asmdef.meta
diff --git a/com.subtegral.dialoguesystem/Runtime.meta b/com.DialogueSystem/Runtime.meta
similarity index 100%
rename from com.subtegral.dialoguesystem/Runtime.meta
rename to com.DialogueSystem/Runtime.meta
diff --git a/com.DialogueSystem/Runtime/CommentBlockData.cs b/com.DialogueSystem/Runtime/CommentBlockData.cs
new file mode 100644
index 0000000..bbe55b5
--- /dev/null
+++ b/com.DialogueSystem/Runtime/CommentBlockData.cs
@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.Serialization;
+
+namespace NodeBasedDialogueSystem.com.DialogueSystem.Runtime
+{
+    [Serializable]
+    public class CommentBlockData
+    {
+        [FormerlySerializedAs("ChildNodes")] public List<string> childNodes = new List<string>();
+        [FormerlySerializedAs("Position")] public Vector2 position;
+        [FormerlySerializedAs("Title")] public string title = "Comment Block";
+    }
+}
\ No newline at end of file
diff --git a/com.subtegral.dialoguesystem/Runtime/CommentBlockData.cs.meta b/com.DialogueSystem/Runtime/CommentBlockData.cs.meta
similarity index 100%
rename from com.subtegral.dialoguesystem/Runtime/CommentBlockData.cs.meta
rename to com.DialogueSystem/Runtime/CommentBlockData.cs.meta
diff --git a/com.DialogueSystem/Runtime/DialogueContainer.cs b/com.DialogueSystem/Runtime/DialogueContainer.cs
new file mode 100644
index 0000000..be35bb6
--- /dev/null
+++ b/com.DialogueSystem/Runtime/DialogueContainer.cs
@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.Serialization;
+
+namespace NodeBasedDialogueSystem.com.DialogueSystem.Runtime
+{
+    [Serializable]
+    public class DialogueContainer : ScriptableObject
+    {
+        // node link data does not need to be public to the editor, it's just confusing to read.
+        [FormerlySerializedAs("NodeLinks")] public List<NodeLinkData> nodeLinks = new List<NodeLinkData>();
+        [FormerlySerializedAs("DialogueNodeData")] public List<DialogueNodeData> dialogueNodeData = new List<DialogueNodeData>();
+        [FormerlySerializedAs("ExposedProperties")] public List<ExposedProperty> exposedProperties = new List<ExposedProperty>();
+        [FormerlySerializedAs("CommentBlockData")] public List<CommentBlockData> commentBlockData = new List<CommentBlockData>();
+    }
+}
\ No newline at end of file
diff --git a/com.subtegral.dialoguesystem/Runtime/DialogueContainer.cs.meta b/com.DialogueSystem/Runtime/DialogueContainer.cs.meta
similarity index 100%
rename from com.subtegral.dialoguesystem/Runtime/DialogueContainer.cs.meta
rename to com.DialogueSystem/Runtime/DialogueContainer.cs.meta
diff --git a/com.DialogueSystem/Runtime/DialogueNodeData.cs b/com.DialogueSystem/Runtime/DialogueNodeData.cs
new file mode 100644
index 0000000..1b90c15
--- /dev/null
+++ b/com.DialogueSystem/Runtime/DialogueNodeData.cs
@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.Serialization;
+
+namespace NodeBasedDialogueSystem.com.DialogueSystem.Runtime
+{
+    [Serializable]
+    public class DialogueNodeData
+    {
+        [FormerlySerializedAs("NodeGUID"), HideInInspector] public string nodeGuid;
+        [FormerlySerializedAs("DialogueText")] public List<string> dialogueText;
+        [FormerlySerializedAs("Position"), HideInInspector] public Vector2 position;
+    }
+}
\ No newline at end of file
diff --git a/com.subtegral.dialoguesystem/Runtime/DialogueNodeData.cs.meta b/com.DialogueSystem/Runtime/DialogueNodeData.cs.meta
similarity index 100%
rename from com.subtegral.dialoguesystem/Runtime/DialogueNodeData.cs.meta
rename to com.DialogueSystem/Runtime/DialogueNodeData.cs.meta
diff --git a/com.DialogueSystem/Runtime/ExposedProperty.cs b/com.DialogueSystem/Runtime/ExposedProperty.cs
new file mode 100644
index 0000000..71c287f
--- /dev/null
+++ b/com.DialogueSystem/Runtime/ExposedProperty.cs
@@ -0,0 +1,13 @@
+using UnityEngine.Serialization;
+
+namespace NodeBasedDialogueSystem.com.DialogueSystem.Runtime
+{
+    [System.Serializable]
+    public class ExposedProperty
+    {
+        public static ExposedProperty CreateInstance() => new ExposedProperty();
+
+        [FormerlySerializedAs("PropertyName")] public string propertyName = "New String";
+        [FormerlySerializedAs("PropertyValue")] public string propertyValue = "New Value";
+    }
+}
\ No newline at end of file
diff --git a/com.subtegral.dialoguesystem/Runtime/ExposedProperty.cs.meta b/com.DialogueSystem/Runtime/ExposedProperty.cs.meta
similarity index 100%
rename from com.subtegral.dialoguesystem/Runtime/ExposedProperty.cs.meta
rename to com.DialogueSystem/Runtime/ExposedProperty.cs.meta
diff --git a/com.subtegral.dialoguesystem/Runtime/Subtegral.DialogueSystem.Runtime.asmdef b/com.DialogueSystem/Runtime/NodeBasedDialogueSystem.com.DialogueSystem.Runtime.asmdef
similarity index 100%
rename from com.subtegral.dialoguesystem/Runtime/Subtegral.DialogueSystem.Runtime.asmdef
rename to com.DialogueSystem/Runtime/NodeBasedDialogueSystem.com.DialogueSystem.Runtime.asmdef
diff --git a/com.subtegral.dialoguesystem/Runtime/Subtegral.DialogueSystem.Runtime.asmdef.meta b/com.DialogueSystem/Runtime/NodeBasedDialogueSystem.com.DialogueSystem.Runtime.asmdef.meta
similarity index 100%
rename from com.subtegral.dialoguesystem/Runtime/Subtegral.DialogueSystem.Runtime.asmdef.meta
rename to com.DialogueSystem/Runtime/NodeBasedDialogueSystem.com.DialogueSystem.Runtime.asmdef.meta
diff --git a/com.DialogueSystem/Runtime/NodeLinkData.cs b/com.DialogueSystem/Runtime/NodeLinkData.cs
new file mode 100644
index 0000000..beaf2d9
--- /dev/null
+++ b/com.DialogueSystem/Runtime/NodeLinkData.cs
@@ -0,0 +1,13 @@
+using System;
+using UnityEngine.Serialization;
+
+namespace NodeBasedDialogueSystem.com.DialogueSystem.Runtime
+{
+    [Serializable]
+    public class NodeLinkData
+    {
+        [FormerlySerializedAs("BaseNodeGUID")] public string baseNodeGuid;
+        [FormerlySerializedAs("PortName")] public string portName;
+        [FormerlySerializedAs("TargetNodeGUID")] public string targetNodeGuid;
+    }
+}
\ No newline at end of file
diff --git a/com.subtegral.dialoguesystem/Runtime/NodeLinkData.cs.meta b/com.DialogueSystem/Runtime/NodeLinkData.cs.meta
similarity index 100%
rename from com.subtegral.dialoguesystem/Runtime/NodeLinkData.cs.meta
rename to com.DialogueSystem/Runtime/NodeLinkData.cs.meta
diff --git a/com.subtegral.dialoguesystem/Editor/Graph/StoryGraph.cs b/com.subtegral.dialoguesystem/Editor/Graph/StoryGraph.cs
deleted file mode 100644
index 4a1b2ec..0000000
--- a/com.subtegral.dialoguesystem/Editor/Graph/StoryGraph.cs
+++ /dev/null
@@ -1,119 +0,0 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Linq;
-using UnityEditor;
-using UnityEditor.Experimental.GraphView;
-using UnityEditor.UIElements;
-using UnityEngine;
-using UnityEngine.UIElements;
-using Subtegral.DialogueSystem.DataContainers;
-
-namespace Subtegral.DialogueSystem.Editor
-{
-    public class StoryGraph : EditorWindow
-    {
-        private string _fileName = "New Narrative";
-
-        private StoryGraphView _graphView;
-        private DialogueContainer _dialogueContainer;
-
-        [MenuItem("Graph/Narrative Graph")]
-        public static void CreateGraphViewWindow()
-        {
-            var window = GetWindow<StoryGraph>();
-            window.titleContent = new GUIContent("Narrative Graph");
-        }
-
-        private void ConstructGraphView()
-        {
-            _graphView = new StoryGraphView(this)
-            {
-                name = "Narrative Graph",
-            };
-            _graphView.StretchToParentSize();
-            rootVisualElement.Add(_graphView);
-        }
-
-        private void GenerateToolbar()
-        {
-            var toolbar = new Toolbar();
-
-            var fileNameTextField = new TextField("File Name:");
-            fileNameTextField.SetValueWithoutNotify(_fileName);
-            fileNameTextField.MarkDirtyRepaint();
-            fileNameTextField.RegisterValueChangedCallback(evt => _fileName = evt.newValue);
-            toolbar.Add(fileNameTextField);
-
-            toolbar.Add(new Button(() => RequestDataOperation(true)) {text = "Save Data"});
-
-            toolbar.Add(new Button(() => RequestDataOperation(false)) {text = "Load Data"});
-            // toolbar.Add(new Button(() => _graphView.CreateNewDialogueNode("Dialogue Node")) {text = "New Node",});
-            rootVisualElement.Add(toolbar);
-        }
-
-        private void RequestDataOperation(bool save)
-        {
-            if (!string.IsNullOrEmpty(_fileName))
-            {
-                var saveUtility = GraphSaveUtility.GetInstance(_graphView);
-                if (save)
-                    saveUtility.SaveGraph(_fileName);
-                else
-                    saveUtility.LoadNarrative(_fileName);
-            }
-            else
-            {
-                EditorUtility.DisplayDialog("Invalid File name", "Please Enter a valid filename", "OK");
-            }
-        }
-
-        private void OnEnable()
-        {
-            ConstructGraphView();
-            GenerateToolbar();
-            GenerateMiniMap();
-            GenerateBlackBoard();
-        }
-
-        private void GenerateMiniMap()
-        {
-            var miniMap = new MiniMap {anchored = true};
-            var cords = _graphView.contentViewContainer.WorldToLocal(new Vector2(this.maxSize.x - 10, 30));
-            miniMap.SetPosition(new Rect(cords.x, cords.y, 200, 140));
-            _graphView.Add(miniMap);
-        }
-
-        private void GenerateBlackBoard()
-        {
-            var blackboard = new Blackboard(_graphView);
-            blackboard.Add(new BlackboardSection {title = "Exposed Variables"});
-            blackboard.addItemRequested = _blackboard =>
-            {
-                _graphView.AddPropertyToBlackBoard(ExposedProperty.CreateInstance(), false);
-            };
-            blackboard.editTextRequested = (_blackboard, element, newValue) =>
-            {
-                var oldPropertyName = ((BlackboardField) element).text;
-                if (_graphView.ExposedProperties.Any(x => x.PropertyName == newValue))
-                {
-                    EditorUtility.DisplayDialog("Error", "This property name already exists, please chose another one.",
-                        "OK");
-                    return;
-                }
-
-                var targetIndex = _graphView.ExposedProperties.FindIndex(x => x.PropertyName == oldPropertyName);
-                _graphView.ExposedProperties[targetIndex].PropertyName = newValue;
-                ((BlackboardField) element).text = newValue;
-            };
-            blackboard.SetPosition(new Rect(10,30,200,300));
-            _graphView.Add(blackboard);
-            _graphView.Blackboard = blackboard;
-        }
-
-        private void OnDisable()
-        {
-            rootVisualElement.Remove(_graphView);
-        }
-    }
-}
\ No newline at end of file
diff --git a/com.subtegral.dialoguesystem/Editor/GraphSaveUtility.cs b/com.subtegral.dialoguesystem/Editor/GraphSaveUtility.cs
deleted file mode 100644
index fe42d22..0000000
--- a/com.subtegral.dialoguesystem/Editor/GraphSaveUtility.cs
+++ /dev/null
@@ -1,217 +0,0 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Net;
-using System.Text;
-using UnityEditor;
-using UnityEditor.Experimental.GraphView;
-using UnityEngine;
-using Subtegral.DialogueSystem.DataContainers;
-using UnityEngine.UIElements;
-
-namespace Subtegral.DialogueSystem.Editor
-{
-    public class GraphSaveUtility
-    {
-        private List<Edge> Edges => _graphView.edges.ToList();
-        private List<DialogueNode> Nodes => _graphView.nodes.ToList().Cast<DialogueNode>().ToList();
-
-        private List<Group> CommentBlocks =>
-            _graphView.graphElements.ToList().Where(x => x is Group).Cast<Group>().ToList();
-
-        private DialogueContainer _dialogueContainer;
-        private StoryGraphView _graphView;
-
-        public static GraphSaveUtility GetInstance(StoryGraphView graphView)
-        {
-            return new GraphSaveUtility
-            {
-                _graphView = graphView
-            };
-        }
-
-        public void SaveGraph(string fileName)
-        {
-            var dialogueContainerObject = ScriptableObject.CreateInstance<DialogueContainer>();
-            if (!SaveNodes(fileName, dialogueContainerObject)) return;
-            SaveExposedProperties(dialogueContainerObject);
-            SaveCommentBlocks(dialogueContainerObject);
-
-            if (!AssetDatabase.IsValidFolder("Assets/Resources"))
-                AssetDatabase.CreateFolder("Assets", "Resources");
-
-            UnityEngine.Object loadedAsset = AssetDatabase.LoadAssetAtPath($"Assets/Resources/{fileName}.asset", typeof(DialogueContainer));
-
-            if (loadedAsset == null || !AssetDatabase.Contains(loadedAsset)) 
-			{
-                AssetDatabase.CreateAsset(dialogueContainerObject, $"Assets/Resources/{fileName}.asset");
-            }
-            else 
-			{
-                DialogueContainer container = loadedAsset as DialogueContainer;
-                container.NodeLinks = dialogueContainerObject.NodeLinks;
-                container.DialogueNodeData = dialogueContainerObject.DialogueNodeData;
-                container.ExposedProperties = dialogueContainerObject.ExposedProperties;
-                container.CommentBlockData = dialogueContainerObject.CommentBlockData;
-                EditorUtility.SetDirty(container);
-            }
-
-            AssetDatabase.SaveAssets();
-        }
-
-        private bool SaveNodes(string fileName, DialogueContainer dialogueContainerObject)
-        {
-            if (!Edges.Any()) return false;
-            var connectedSockets = Edges.Where(x => x.input.node != null).ToArray();
-            for (var i = 0; i < connectedSockets.Count(); i++)
-            {
-                var outputNode = (connectedSockets[i].output.node as DialogueNode);
-                var inputNode = (connectedSockets[i].input.node as DialogueNode);
-                dialogueContainerObject.NodeLinks.Add(new NodeLinkData
-                {
-                    BaseNodeGUID = outputNode.GUID,
-                    PortName = connectedSockets[i].output.portName,
-                    TargetNodeGUID = inputNode.GUID
-                });
-            }
-
-            foreach (var node in Nodes.Where(node => !node.EntyPoint))
-            {
-                dialogueContainerObject.DialogueNodeData.Add(new DialogueNodeData
-                {
-                    NodeGUID = node.GUID,
-                    DialogueText = node.DialogueText,
-                    Position = node.GetPosition().position
-                });
-            }
-
-            return true;
-        }
-
-        private void SaveExposedProperties(DialogueContainer dialogueContainer)
-        {
-            dialogueContainer.ExposedProperties.Clear();
-            dialogueContainer.ExposedProperties.AddRange(_graphView.ExposedProperties);
-        }
-
-        private void SaveCommentBlocks(DialogueContainer dialogueContainer)
-        {
-            foreach (var block in CommentBlocks)
-            {
-                var nodes = block.containedElements.Where(x => x is DialogueNode).Cast<DialogueNode>().Select(x => x.GUID)
-                    .ToList();
-
-                dialogueContainer.CommentBlockData.Add(new CommentBlockData
-                {
-                    ChildNodes = nodes,
-                    Title = block.title,
-                    Position = block.GetPosition().position
-                });
-            }
-        }
-
-        public void LoadNarrative(string fileName)
-        {
-            _dialogueContainer = Resources.Load<DialogueContainer>(fileName);
-            if (_dialogueContainer == null)
-            {
-                EditorUtility.DisplayDialog("File Not Found", "Target Narrative Data does not exist!", "OK");
-                return;
-            }
-
-            ClearGraph();
-            GenerateDialogueNodes();
-            ConnectDialogueNodes();
-            AddExposedProperties();
-            GenerateCommentBlocks();
-        }
-
-        /// <summary>
-        /// Set Entry point GUID then Get All Nodes, remove all and their edges. Leave only the entrypoint node. (Remove its edge too)
-        /// </summary>
-        private void ClearGraph()
-        {
-            Nodes.Find(x => x.EntyPoint).GUID = _dialogueContainer.NodeLinks[0].BaseNodeGUID;
-            foreach (var perNode in Nodes)
-            {
-                if (perNode.EntyPoint) continue;
-                Edges.Where(x => x.input.node == perNode).ToList()
-                    .ForEach(edge => _graphView.RemoveElement(edge));
-                _graphView.RemoveElement(perNode);
-            }
-        }
-
-        /// <summary>
-        /// Create All serialized nodes and assign their guid and dialogue text to them
-        /// </summary>
-        private void GenerateDialogueNodes()
-        {
-            foreach (var perNode in _dialogueContainer.DialogueNodeData)
-            {
-                var tempNode = _graphView.CreateNode(perNode.DialogueText, Vector2.zero);
-                tempNode.GUID = perNode.NodeGUID;
-                _graphView.AddElement(tempNode);
-
-                var nodePorts = _dialogueContainer.NodeLinks.Where(x => x.BaseNodeGUID == perNode.NodeGUID).ToList();
-                nodePorts.ForEach(x => _graphView.AddChoicePort(tempNode, x.PortName));
-            }
-        }
-
-        private void ConnectDialogueNodes()
-        {
-            for (var i = 0; i < Nodes.Count; i++)
-            {
-                var k = i; //Prevent access to modified closure
-                var connections = _dialogueContainer.NodeLinks.Where(x => x.BaseNodeGUID == Nodes[k].GUID).ToList();
-                for (var j = 0; j < connections.Count(); j++)
-                {
-                    var targetNodeGUID = connections[j].TargetNodeGUID;
-                    var targetNode = Nodes.First(x => x.GUID == targetNodeGUID);
-                    LinkNodesTogether(Nodes[i].outputContainer[j].Q<Port>(), (Port) targetNode.inputContainer[0]);
-
-                    targetNode.SetPosition(new Rect(
-                        _dialogueContainer.DialogueNodeData.First(x => x.NodeGUID == targetNodeGUID).Position,
-                        _graphView.DefaultNodeSize));
-                }
-            }
-        }
-
-        private void LinkNodesTogether(Port outputSocket, Port inputSocket)
-        {
-            var tempEdge = new Edge()
-            {
-                output = outputSocket,
-                input = inputSocket
-            };
-            tempEdge?.input.Connect(tempEdge);
-            tempEdge?.output.Connect(tempEdge);
-            _graphView.Add(tempEdge);
-        }
-
-        private void AddExposedProperties()
-        {
-            _graphView.ClearBlackBoardAndExposedProperties();
-            foreach (var exposedProperty in _dialogueContainer.ExposedProperties)
-            {
-                _graphView.AddPropertyToBlackBoard(exposedProperty);
-            }
-        }
-
-        private void GenerateCommentBlocks()
-        {
-            foreach (var commentBlock in CommentBlocks)
-            {
-                _graphView.RemoveElement(commentBlock);
-            }
-
-            foreach (var commentBlockData in _dialogueContainer.CommentBlockData)
-            {
-               var block = _graphView.CreateCommentBlock(new Rect(commentBlockData.Position, _graphView.DefaultCommentBlockSize),
-                    commentBlockData);
-               block.AddElements(Nodes.Where(x=>commentBlockData.ChildNodes.Contains(x.GUID)));
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/com.subtegral.dialoguesystem/Editor/Nodes/DialogueNode.cs b/com.subtegral.dialoguesystem/Editor/Nodes/DialogueNode.cs
deleted file mode 100644
index 519ce13..0000000
--- a/com.subtegral.dialoguesystem/Editor/Nodes/DialogueNode.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using UnityEditor.Experimental.GraphView;
-using UnityEngine;
-
-namespace Subtegral.DialogueSystem.Editor
-{
-    public class DialogueNode : Node
-    {
-        public string DialogueText;
-        public string GUID;
-        public bool EntyPoint = false;
-    }
-}
\ No newline at end of file
diff --git a/com.subtegral.dialoguesystem/Runtime/CommentBlockData.cs b/com.subtegral.dialoguesystem/Runtime/CommentBlockData.cs
deleted file mode 100644
index fbd72f9..0000000
--- a/com.subtegral.dialoguesystem/Runtime/CommentBlockData.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using System;
-using System.Collections.Generic;
-using UnityEngine;
-
-namespace Subtegral.DialogueSystem.DataContainers
-{
-    [Serializable]
-    public class CommentBlockData
-    {
-        public List<string> ChildNodes = new List<string>();
-        public Vector2 Position;
-        public string Title= "Comment Block";
-    }
-}
\ No newline at end of file
diff --git a/com.subtegral.dialoguesystem/Runtime/DialogueContainer.cs b/com.subtegral.dialoguesystem/Runtime/DialogueContainer.cs
deleted file mode 100644
index 886ae8b..0000000
--- a/com.subtegral.dialoguesystem/Runtime/DialogueContainer.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using System;
-using System.Collections.Generic;
-using UnityEngine;
-
-namespace Subtegral.DialogueSystem.DataContainers
-{
-    [Serializable]
-    public class DialogueContainer : ScriptableObject
-    {
-        public List<NodeLinkData> NodeLinks = new List<NodeLinkData>();
-        public List<DialogueNodeData> DialogueNodeData = new List<DialogueNodeData>();
-        public List<ExposedProperty> ExposedProperties = new List<ExposedProperty>();
-        public List<CommentBlockData> CommentBlockData = new List<CommentBlockData>();
-    }
-}
\ No newline at end of file
diff --git a/com.subtegral.dialoguesystem/Runtime/DialogueNodeData.cs b/com.subtegral.dialoguesystem/Runtime/DialogueNodeData.cs
deleted file mode 100644
index 3b0d8a6..0000000
--- a/com.subtegral.dialoguesystem/Runtime/DialogueNodeData.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-using System;
-using UnityEngine;
-
-namespace Subtegral.DialogueSystem.DataContainers
-{
-    [Serializable]
-    public class DialogueNodeData
-    {
-        public string NodeGUID;
-        public string DialogueText;
-        public Vector2 Position;
-    }
-}
\ No newline at end of file
diff --git a/com.subtegral.dialoguesystem/Runtime/ExposedProperty.cs b/com.subtegral.dialoguesystem/Runtime/ExposedProperty.cs
deleted file mode 100644
index 0dde3e7..0000000
--- a/com.subtegral.dialoguesystem/Runtime/ExposedProperty.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-namespace Subtegral.DialogueSystem.DataContainers
-{
-    [System.Serializable]
-    public class ExposedProperty
-    {
-        public static ExposedProperty CreateInstance()
-        {
-            return new ExposedProperty();
-        }
-
-        public string PropertyName = "New String";
-        public string PropertyValue = "New Value";
-    }
-}
\ No newline at end of file
diff --git a/com.subtegral.dialoguesystem/Runtime/NodeLinkData.cs b/com.subtegral.dialoguesystem/Runtime/NodeLinkData.cs
deleted file mode 100644
index e35515e..0000000
--- a/com.subtegral.dialoguesystem/Runtime/NodeLinkData.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-using System;
-using System.Linq;
-
-namespace Subtegral.DialogueSystem.DataContainers
-{
-    [Serializable]
-    public class NodeLinkData
-    {
-        public string BaseNodeGUID;
-        public string PortName;
-        public string TargetNodeGUID;
-    }
-}
\ No newline at end of file
diff --git a/package.json b/package.json
index 1e25d4d..eec5e53 100644
--- a/package.json
+++ b/package.json
@@ -22,6 +22,6 @@
   "category": "Visual Scripting",
   "repository": {
     "type": "git",
-    "url": "https://github.com/m3rt32/NodeBasedDialogueSystem.git"
+    "url": "https://github.com/Spebby/NodeBasedDialogueSystem.git"
   }
 }