diff --git a/.gitignore b/.gitignore
index cef7dc8..37dba55 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,10 +1,81 @@
 .vs/
+.vscode/
+.vsconfig
 Library/
 obj/
 Temp/
 *.csproj
-*.suo
-*.sln
+*.suo*.sln
+
 
 jkedit/
-Extracted/
\ No newline at end of file
+Extracted/
+
+/[Ll]ibrary/
+/[Tt]emp/
+/[Oo]bj/
+/[Bb]uild/
+/[Bb]uilds/
+/[Ll]ogs/
+/[Uu]ser[Ss]ettings/
+
+# MemoryCaptures can get excessive in size.
+# They also could contain extremely sensitive data
+/[Mm]emoryCaptures/
+
+# Recordings can get excessive in size
+/[Rr]ecordings/
+
+# Uncomment this line if you wish to ignore the asset store tools plugin
+# /[Aa]ssets/AssetStoreTools*
+
+# Autogenerated Jetbrains Rider plugin
+/[Aa]ssets/Plugins/Editor/JetBrains*
+
+# Visual Studio cache directory
+.vs/
+
+# Gradle cache directory
+.gradle/
+
+# Autogenerated VS/MD/Consulo solution and project files
+ExportedObj/
+.consulo/
+*.csproj
+*.unityproj
+*.sln
+*.suo
+*.tmp
+*.user
+*.userprefs
+*.pidb
+*.booproj
+*.svd
+*.pdb
+*.mdb
+*.opendb
+*.VC.db
+
+# Unity3D generated meta files
+*.pidb.meta
+*.pdb.meta
+*.mdb.meta
+
+# Unity3D generated file on crash reports
+sysinfo.txt
+
+# Builds
+*.apk
+*.aab
+*.unitypackage
+*.app
+
+# Crashlytics generated file
+crashlytics-build.properties
+
+# Packed Addressables
+/[Aa]ssets/[Aa]ddressable[Aa]ssets[Dd]ata/*/*.bin*
+
+# Temporary auto-generated Android Assets
+/[Aa]ssets/[Ss]treamingAssets/aa.meta
+/[Aa]ssets/[Ss]treamingAssets/aa/*
\ No newline at end of file
diff --git a/.vscode/launch.json b/.vscode/launch.json
deleted file mode 100644
index c1e71fc..0000000
--- a/.vscode/launch.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-    // Use IntelliSense to learn about possible attributes.
-    // Hover to view descriptions of existing attributes.
-    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
-    "version": "0.2.0",
-    "configurations": [
-        {
-            "name": "Unity Editor",
-            "type": "unity",
-            "request": "launch"
-        },
-        {
-            "name": "Windows Player",
-            "type": "unity",
-            "request": "launch"
-        },
-        {
-            "name": "OSX Player",
-            "type": "unity",
-            "request": "launch"
-        },
-        {
-            "name": "Linux Player",
-            "type": "unity",
-            "request": "launch"
-        },
-        {
-            "name": "iOS Player",
-            "type": "unity",
-            "request": "launch"
-        },
-        {
-            "name": "Android Player",
-            "type": "unity",
-            "request": "launch"
-        }
-    ]
-}
\ No newline at end of file
diff --git a/.vscode/settings.json b/.vscode/settings.json
deleted file mode 100644
index 4edd970..0000000
--- a/.vscode/settings.json
+++ /dev/null
@@ -1,56 +0,0 @@
-{
-    "files.exclude":
-    {
-        "**/.DS_Store":true,
-        "**/.git":true,
-        "**/.gitignore":true,
-        "**/.gitmodules":true,
-        "**/*.booproj":true,
-        "**/*.pidb":true,
-        "**/*.suo":true,
-        "**/*.user":true,
-        "**/*.userprefs":true,
-        "**/*.unityproj":true,
-        "**/*.dll":true,
-        "**/*.exe":true,
-        "**/*.pdf":true,
-        "**/*.mid":true,
-        "**/*.midi":true,
-        "**/*.wav":true,
-        "**/*.gif":true,
-        "**/*.ico":true,
-        "**/*.jpg":true,
-        "**/*.jpeg":true,
-        "**/*.png":true,
-        "**/*.psd":true,
-        "**/*.tga":true,
-        "**/*.tif":true,
-        "**/*.tiff":true,
-        "**/*.3ds":true,
-        "**/*.3DS":true,
-        "**/*.fbx":true,
-        "**/*.FBX":true,
-        "**/*.lxo":true,
-        "**/*.LXO":true,
-        "**/*.ma":true,
-        "**/*.MA":true,
-        "**/*.obj":true,
-        "**/*.OBJ":true,
-        "**/*.asset":true,
-        "**/*.cubemap":true,
-        "**/*.flare":true,
-        "**/*.mat":true,
-        "**/*.meta":true,
-        "**/*.prefab":true,
-        "**/*.unity":true,
-        "build/":true,
-        "Build/":true,
-        "Library/":true,
-        "library/":true,
-        "obj/":true,
-        "Obj/":true,
-        "ProjectSettings/":true,
-        "temp/":true,
-        "Temp/":true
-    }
-}
\ No newline at end of file
diff --git a/Assets/DeactivateLights.cs b/Assets/DeactivateLights.cs
new file mode 100644
index 0000000..b832715
--- /dev/null
+++ b/Assets/DeactivateLights.cs
@@ -0,0 +1,30 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+[ExecuteAlways]
+public class DeactivateLights : MonoBehaviour
+{
+    public bool deacivateLights;
+    // Start is called before the first frame update
+    void Start()
+    {
+        
+    }
+
+    // Update is called once per frame
+    void Update()
+    {
+        if (deacivateLights)
+        {
+            Light[] lights = GetComponentsInChildren<Light>();
+
+            foreach (Light light in lights)
+            {
+                light.enabled = false;
+            }
+            deacivateLights = false;
+            DestroyImmediate(this);
+        }
+    }
+}
diff --git a/Assets/Scripts/GOBManager.cs.meta b/Assets/DeactivateLights.cs.meta
similarity index 83%
rename from Assets/Scripts/GOBManager.cs.meta
rename to Assets/DeactivateLights.cs.meta
index 531c53c..4a67a43 100644
--- a/Assets/Scripts/GOBManager.cs.meta
+++ b/Assets/DeactivateLights.cs.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: c583c298051cfe54dbcde7b3faaf5d74
+guid: a2e3e61a45554c4409855e6e5517a24d
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2
diff --git a/Assets/Editor/SithEditor.cs b/Assets/Editor/SithEditor.cs
index e14a101..c03e603 100644
--- a/Assets/Editor/SithEditor.cs
+++ b/Assets/Editor/SithEditor.cs
@@ -1,11 +1,16 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using jksharp.jklviewer;
 using UnityEditor;
 using UnityEngine;
 using System.Collections;
-using Assets.Scripts;
+using Assets.Sith;
+
+using Assets.Sith.Content;
+using Assets.Sith.Game;
+using Assets.Sith.Game.World;
+using Assets.Sith.Vfs;
+
 
 public class SithEditor : EditorWindow
 {
@@ -15,10 +20,12 @@ public static void ShowWindow()
         EditorWindow.GetWindow(typeof(SithEditor));
     }
 
-    private string _jkPath = @"D:\Spel\Steam\steamapps\common\Star Wars Jedi Knight";
+    private string _gamePath = @"";
     private string _assetPath = "Extracted\\";
     private IEnumerable<GobFile> _gobFiles;
     private bool _gobFilesEnabled;
+    private IEnumerable<string> _levelFiles;
+    private Vector2 _scrollPos;
 
     void Start()
     {
@@ -26,10 +33,13 @@ void Start()
 
     void OnGUI()
     {
-        _jkPath = EditorGUILayout.TextField("Jedi Knight path", _jkPath);
+        _gamePath = EditorGUILayout.TextField("Game path", _gamePath);
+        if (!Directory.Exists(_gamePath)) return;
         if (GUILayout.Button("Find GOBs"))
         {
-            _gobFiles = Directory.GetFiles(_jkPath, "*.gob", SearchOption.AllDirectories).Select(x => new GobFile { Path = x.Replace(_jkPath + "\\", ""), Enabled = false }).ToArray();
+            _gobFiles = Directory.EnumerateFiles(_gamePath, "*.*", SearchOption.AllDirectories)
+                .Where(s => s.ToLower().EndsWith(".gob") || s.ToLower().EndsWith(".goo"))
+                .Select(x => new GobFile { Path = x.Replace(_gamePath + "\\", ""), Enabled = false }).ToArray();
         }
 
         if (_gobFiles != null)
@@ -47,12 +57,69 @@ void OnGUI()
         {
             foreach (var gobFile in _gobFiles.Where(x => x.Enabled))
             {
-                using (var stream = new GOBStream(Path.Combine(_jkPath, gobFile.Path)))
+                using (var stream = new GOBStream(Path.Combine(_gamePath, gobFile.Path)))
                 {
                     stream.Extract(Path.Combine(_assetPath, gobFile.Path));
                 }
             }
         }
+
+        if (GUILayout.Button("Find levels"))
+        {
+            _levelFiles = Directory.EnumerateFiles(_gamePath, "*.*", SearchOption.AllDirectories)
+                .Where(s => s.ToLower().EndsWith(".jkl") || s.ToLower().EndsWith(".ndy"))
+                .Select(x => x.Replace(_gamePath + "\\", ""))
+                .ToArray();
+        }
+
+        if (_levelFiles != null)
+        {
+            GUILayout.Label("Level Files");
+            EditorGUILayout.BeginHorizontal();
+            _scrollPos = EditorGUILayout.BeginScrollView(_scrollPos);
+            foreach (var file in _levelFiles)
+            {
+                //gobFile.Enabled = EditorGUILayout.Toggle(gobFile.Path, gobFile.Enabled);
+                EditorGUILayout.BeginHorizontal();
+                GUILayout.Label(file);
+                if (GUILayout.Button("Load", GUILayout.Width(100)))
+                {
+                    SithAssets.Instance.AddSystemPath(_gamePath);
+                    SithAssets.Instance.AddSystemPath(Path.Combine(_gamePath, "Resource"));
+                    SithAssets.Instance.AddSystemPath(Path.Combine(_gamePath, "Extracted"));
+
+                    // JKDF2
+                    SithAssets.Instance.AddGob(Path.Combine(_gamePath, "Resource\\Res1hi.gob"));
+                    SithAssets.Instance.AddGob(Path.Combine(_gamePath, "Resource\\Res2.gob"));
+                    SithAssets.Instance.AddGob(Path.Combine(_gamePath, "Episode\\JK1.GOB"));
+                    SithAssets.Instance.AddGob(Path.Combine(_gamePath, "Episode\\JK1CTF.GOB"));
+                    SithAssets.Instance.AddGob(Path.Combine(_gamePath, "Episode\\JK1MP.GOB"));
+
+                    // MOTS
+                    SithAssets.Instance.AddGob(Path.Combine(_gamePath, "Resource\\JKMRES.GOO"));
+                    SithAssets.Instance.AddGob(Path.Combine(_gamePath, "Resource\\JKMsndLO.goo"));
+                    SithAssets.Instance.AddGob(Path.Combine(_gamePath, "Episode\\JKM.GOO"));
+                    SithAssets.Instance.AddGob(Path.Combine(_gamePath, "Episode\\JKM_KFY.GOO"));
+                    SithAssets.Instance.AddGob(Path.Combine(_gamePath, "Episode\\JKM_MP.GOO"));
+                    SithAssets.Instance.AddGob(Path.Combine(_gamePath, "Episode\\Jkm_saber.GOO"));
+
+                    // IJIM
+                    SithAssets.Instance.AddGob(Path.Combine(_gamePath, "cd1.gob"));
+                    SithAssets.Instance.AddGob(Path.Combine(_gamePath, "cd2.gob"));
+                    SithAssets.Instance.AddGob(Path.Combine(_gamePath, "Resource\\cd1.gob"));
+                    SithAssets.Instance.AddGob(Path.Combine(_gamePath, "Resource\\cd2.gob"));
+
+                    var go = new GameObject("SithWorld");
+                    var world = go.AddComponent<SithWorld>();
+                    world.Load(file);
+                }
+
+                EditorGUILayout.EndHorizontal();
+            }
+            EditorGUILayout.EndScrollView();
+            EditorGUILayout.EndHorizontal();
+        }
+
     }
 
     class GobFile
diff --git a/Assets/ExportMaterial.cs b/Assets/ExportMaterial.cs
new file mode 100644
index 0000000..e8ba543
--- /dev/null
+++ b/Assets/ExportMaterial.cs
@@ -0,0 +1,65 @@
+using System.Collections;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using UnityEngine;
+using UnityEditor;
+using UnityEngine.UI;
+using System.IO;
+
+public class ExportMaterial : MonoBehaviour
+{
+    public bool export;
+    //public Button m_HitMeButton;
+
+    private void Start()
+    {
+        //Button btn = m_HitMeButton.GetComponent<Button>();
+        //btn.onClick.AddListener(onExport);
+    }
+
+    void onExport()
+    {
+
+    }
+
+    // Update is called once per frame
+    void Update()
+    {
+        if (export)
+        {
+            Renderer[] rends = GetComponentsInChildren<Renderer>();
+            var counters = new Dictionary<string, int>(10000); // init dict with 10000 capacity
+            try
+            {
+                AssetDatabase.StartAssetEditing();
+                foreach (Renderer r in rends)
+                {
+                    foreach (Material mat in r.materials)
+                    {
+                        string name = mat.name.Split(".")[0];
+                        string path;
+                        if (!counters.ContainsKey(name))
+                        {
+                            AssetDatabase.CreateAsset(mat.mainTexture, "Assets/textures/" + name + ".asset"); // Save mat texture
+                            counters[name] = 1;
+                            path = string.Join("", "Assets/materials/", name, ".mat (instance", ".mat");
+                        }
+                        else
+                        {
+                            path = string.Join("", "Assets/materials/", name, ".mat (instance)_", counters[name].ToString(), ".mat");
+                            counters[name]++;
+                        }
+                        AssetDatabase.CreateAsset(mat, path);
+                    }
+                }
+            }
+            finally
+            {
+                // The StopAssetEditing should be enclosed in this finally scope
+                // in case an exception occurs to keep asset database responsive.
+                AssetDatabase.StopAssetEditing();
+            }
+            export = false;
+        }
+    }
+}
diff --git a/Assets/Scripts/KEYParser.cs.meta b/Assets/ExportMaterial.cs.meta
similarity index 71%
rename from Assets/Scripts/KEYParser.cs.meta
rename to Assets/ExportMaterial.cs.meta
index 8097c8a..948c552 100644
--- a/Assets/Scripts/KEYParser.cs.meta
+++ b/Assets/ExportMaterial.cs.meta
@@ -1,7 +1,5 @@
 fileFormatVersion: 2
-guid: a52017ab81b0a534f95a50ec2d3d2a62
-timeCreated: 1519572739
-licenseType: Free
+guid: ef35797f9def3594d9b4fd875af557de
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2
diff --git a/Assets/ImportMaterial.cs b/Assets/ImportMaterial.cs
new file mode 100644
index 0000000..b341ede
--- /dev/null
+++ b/Assets/ImportMaterial.cs
@@ -0,0 +1,51 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using System.IO;
+
+//[ExecuteAlways]
+public class ImportMaterial : MonoBehaviour
+{
+    public bool import;
+
+    // Start is called before the first frame update
+    void Start()
+    {
+        
+    }
+
+    // Update is called once per frame
+    void Update()
+    {
+        if (import)
+        {
+            Renderer[] renderer = GetComponentsInChildren<Renderer>();
+            var light = GetComponentsInChildren<Light>();
+
+            foreach (Light l in light)
+            {
+                l.enabled = false;
+            }
+
+            foreach (Renderer rend in renderer)
+            {
+                Material[] mat = rend.materials;
+
+                for (int m = 0; m < mat.Length; m++)
+                {
+                    string[] name = mat[m].name.Split("_mat");
+                    mat[m] = Resources.Load<Material>("materials/" + name[0]);
+                    if (File.Exists("Assets/Resources/materials/" + name[0] + ".mat"))
+                    {
+                        Debug.Log("File exist");
+                    }
+                }
+
+                rend.materials = mat;
+            }
+
+            import = false;
+            Destroy(this);
+        }
+    }
+}
diff --git a/Assets/PlayerController/PlayerJump.cs.meta b/Assets/ImportMaterial.cs.meta
similarity index 71%
rename from Assets/PlayerController/PlayerJump.cs.meta
rename to Assets/ImportMaterial.cs.meta
index b02970b..f9d7070 100644
--- a/Assets/PlayerController/PlayerJump.cs.meta
+++ b/Assets/ImportMaterial.cs.meta
@@ -1,7 +1,5 @@
 fileFormatVersion: 2
-guid: 088dd35915624744aa71c45fe22ed31e
-timeCreated: 1519685861
-licenseType: Free
+guid: d0cb04618a4a39a4eac0a43624a7deeb
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2
diff --git a/Assets/New Shader Graph.shadergraph b/Assets/New Shader Graph.shadergraph
new file mode 100644
index 0000000..340bda3
--- /dev/null
+++ b/Assets/New Shader Graph.shadergraph	
@@ -0,0 +1,658 @@
+{
+    "m_SGVersion": 2,
+    "m_Type": "UnityEditor.ShaderGraph.GraphData",
+    "m_ObjectId": "1ede5ccc8a9c44a3b129c0c58c4fb4f9",
+    "m_Properties": [],
+    "m_Keywords": [],
+    "m_Nodes": [
+        {
+            "m_Id": "a95dcb0e96a54c4d840db730c39b85f1"
+        },
+        {
+            "m_Id": "fb68d3a346844dc5af8968c7eb897955"
+        },
+        {
+            "m_Id": "81405bc7cd3b403084f67f20d0ae6128"
+        },
+        {
+            "m_Id": "038468cb842044e8948228242a350f58"
+        },
+        {
+            "m_Id": "b2364fc986c64073b365c1c40324e06b"
+        },
+        {
+            "m_Id": "dbd206debbb74ad5bb79a06425747d4b"
+        },
+        {
+            "m_Id": "19ffc272d2a24d20ac7dcdef4a004e48"
+        }
+    ],
+    "m_GroupDatas": [],
+    "m_StickyNoteDatas": [],
+    "m_Edges": [
+        {
+            "m_OutputSlot": {
+                "m_Node": {
+                    "m_Id": "b2364fc986c64073b365c1c40324e06b"
+                },
+                "m_SlotId": 0
+            },
+            "m_InputSlot": {
+                "m_Node": {
+                    "m_Id": "038468cb842044e8948228242a350f58"
+                },
+                "m_SlotId": 0
+            }
+        }
+    ],
+    "m_VertexContext": {
+        "m_Position": {
+            "x": 0.0,
+            "y": 0.0
+        },
+        "m_Blocks": [
+            {
+                "m_Id": "a95dcb0e96a54c4d840db730c39b85f1"
+            },
+            {
+                "m_Id": "fb68d3a346844dc5af8968c7eb897955"
+            },
+            {
+                "m_Id": "81405bc7cd3b403084f67f20d0ae6128"
+            }
+        ]
+    },
+    "m_FragmentContext": {
+        "m_Position": {
+            "x": 0.0,
+            "y": 200.0
+        },
+        "m_Blocks": [
+            {
+                "m_Id": "038468cb842044e8948228242a350f58"
+            },
+            {
+                "m_Id": "dbd206debbb74ad5bb79a06425747d4b"
+            },
+            {
+                "m_Id": "19ffc272d2a24d20ac7dcdef4a004e48"
+            }
+        ]
+    },
+    "m_PreviewData": {
+        "serializedMesh": {
+            "m_SerializedMesh": "{\"mesh\":{\"instanceID\":0}}",
+            "m_Guid": ""
+        }
+    },
+    "m_Path": "Shader Graphs",
+    "m_ConcretePrecision": 0,
+    "m_PreviewMode": 2,
+    "m_OutputNode": {
+        "m_Id": ""
+    },
+    "m_ActiveTargets": [
+        {
+            "m_Id": "0deeb5321823462e8c5b95aa73f25a05"
+        }
+    ]
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.BlockNode",
+    "m_ObjectId": "038468cb842044e8948228242a350f58",
+    "m_Group": {
+        "m_Id": ""
+    },
+    "m_Name": "SurfaceDescription.BaseColor",
+    "m_DrawState": {
+        "m_Expanded": true,
+        "m_Position": {
+            "serializedVersion": "2",
+            "x": 13.600027084350586,
+            "y": 232.0,
+            "width": 200.00001525878907,
+            "height": 41.600006103515628
+        }
+    },
+    "m_Slots": [
+        {
+            "m_Id": "b1b6c0604bf340b19d2e20e7a3eb2fef"
+        }
+    ],
+    "synonyms": [],
+    "m_Precision": 0,
+    "m_PreviewExpanded": true,
+    "m_PreviewMode": 0,
+    "m_CustomColors": {
+        "m_SerializableColors": []
+    },
+    "m_SerializedDescriptor": "SurfaceDescription.BaseColor"
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.SamplerStateMaterialSlot",
+    "m_ObjectId": "057a60894da74d73ae47e2bdf0df650f",
+    "m_Id": 3,
+    "m_DisplayName": "Sampler",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_ShaderOutputName": "Sampler",
+    "m_StageCapability": 3,
+    "m_BareResource": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.Universal.ShaderGraph.UniversalTarget",
+    "m_ObjectId": "0deeb5321823462e8c5b95aa73f25a05",
+    "m_ActiveSubTarget": {
+        "m_Id": "d472d226c35a4c08a7e9703935339970"
+    },
+    "m_SurfaceType": 1,
+    "m_AlphaMode": 0,
+    "m_TwoSided": false,
+    "m_AlphaClip": true,
+    "m_CustomEditorGUI": ""
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.BlockNode",
+    "m_ObjectId": "19ffc272d2a24d20ac7dcdef4a004e48",
+    "m_Group": {
+        "m_Id": ""
+    },
+    "m_Name": "SurfaceDescription.AlphaClipThreshold",
+    "m_DrawState": {
+        "m_Expanded": true,
+        "m_Position": {
+            "serializedVersion": "2",
+            "x": 0.0,
+            "y": 0.0,
+            "width": 0.0,
+            "height": 0.0
+        }
+    },
+    "m_Slots": [
+        {
+            "m_Id": "82e7896d5feb42c08234cc6f6cb7deeb"
+        }
+    ],
+    "synonyms": [],
+    "m_Precision": 0,
+    "m_PreviewExpanded": true,
+    "m_PreviewMode": 0,
+    "m_CustomColors": {
+        "m_SerializableColors": []
+    },
+    "m_SerializedDescriptor": "SurfaceDescription.AlphaClipThreshold"
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+    "m_ObjectId": "281be7f828cf4b37ae65e70310e39440",
+    "m_Id": 6,
+    "m_DisplayName": "B",
+    "m_SlotType": 1,
+    "m_Hidden": false,
+    "m_ShaderOutputName": "B",
+    "m_StageCapability": 2,
+    "m_Value": 0.0,
+    "m_DefaultValue": 0.0,
+    "m_Labels": []
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.UVMaterialSlot",
+    "m_ObjectId": "326c08eaebfe45e192d21f17a1d2fc6b",
+    "m_Id": 2,
+    "m_DisplayName": "UV",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_ShaderOutputName": "UV",
+    "m_StageCapability": 3,
+    "m_Value": {
+        "x": 0.0,
+        "y": 0.0
+    },
+    "m_DefaultValue": {
+        "x": 0.0,
+        "y": 0.0
+    },
+    "m_Labels": [],
+    "m_Channel": 0
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+    "m_ObjectId": "3e9baa45064a473da42a3261c403f6c2",
+    "m_Id": 8,
+    "m_DisplayName": "Index",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_ShaderOutputName": "Index",
+    "m_StageCapability": 3,
+    "m_Value": 0.0,
+    "m_DefaultValue": 0.0,
+    "m_Labels": []
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.TangentMaterialSlot",
+    "m_ObjectId": "5ec6776fe2e84e33880a5bd2538f39ff",
+    "m_Id": 0,
+    "m_DisplayName": "Tangent",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_ShaderOutputName": "Tangent",
+    "m_StageCapability": 1,
+    "m_Value": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0
+    },
+    "m_DefaultValue": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0
+    },
+    "m_Labels": [],
+    "m_Space": 0
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+    "m_ObjectId": "5f52051bd3fc4d28b8ad98d42a7d902c",
+    "m_Id": 0,
+    "m_DisplayName": "Alpha",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_ShaderOutputName": "Alpha",
+    "m_StageCapability": 2,
+    "m_Value": 1.0,
+    "m_DefaultValue": 1.0,
+    "m_Labels": []
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.BlockNode",
+    "m_ObjectId": "81405bc7cd3b403084f67f20d0ae6128",
+    "m_Group": {
+        "m_Id": ""
+    },
+    "m_Name": "VertexDescription.Tangent",
+    "m_DrawState": {
+        "m_Expanded": true,
+        "m_Position": {
+            "serializedVersion": "2",
+            "x": 0.0,
+            "y": 0.0,
+            "width": 0.0,
+            "height": 0.0
+        }
+    },
+    "m_Slots": [
+        {
+            "m_Id": "5ec6776fe2e84e33880a5bd2538f39ff"
+        }
+    ],
+    "synonyms": [],
+    "m_Precision": 0,
+    "m_PreviewExpanded": true,
+    "m_PreviewMode": 0,
+    "m_CustomColors": {
+        "m_SerializableColors": []
+    },
+    "m_SerializedDescriptor": "VertexDescription.Tangent"
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+    "m_ObjectId": "82e7896d5feb42c08234cc6f6cb7deeb",
+    "m_Id": 0,
+    "m_DisplayName": "Alpha Clip Threshold",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_ShaderOutputName": "AlphaClipThreshold",
+    "m_StageCapability": 2,
+    "m_Value": 0.5,
+    "m_DefaultValue": 0.5,
+    "m_Labels": []
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.NormalMaterialSlot",
+    "m_ObjectId": "8a149b311b2f4582abb73779a51fe675",
+    "m_Id": 0,
+    "m_DisplayName": "Normal",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_ShaderOutputName": "Normal",
+    "m_StageCapability": 1,
+    "m_Value": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0
+    },
+    "m_DefaultValue": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0
+    },
+    "m_Labels": [],
+    "m_Space": 0
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+    "m_ObjectId": "a499e116a10f45d3bd92878664553e47",
+    "m_Id": 5,
+    "m_DisplayName": "G",
+    "m_SlotType": 1,
+    "m_Hidden": false,
+    "m_ShaderOutputName": "G",
+    "m_StageCapability": 2,
+    "m_Value": 0.0,
+    "m_DefaultValue": 0.0,
+    "m_Labels": []
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.BlockNode",
+    "m_ObjectId": "a95dcb0e96a54c4d840db730c39b85f1",
+    "m_Group": {
+        "m_Id": ""
+    },
+    "m_Name": "VertexDescription.Position",
+    "m_DrawState": {
+        "m_Expanded": true,
+        "m_Position": {
+            "serializedVersion": "2",
+            "x": 0.0,
+            "y": 0.0,
+            "width": 0.0,
+            "height": 0.0
+        }
+    },
+    "m_Slots": [
+        {
+            "m_Id": "ddbf28e67df34b3e94699689776967fc"
+        }
+    ],
+    "synonyms": [],
+    "m_Precision": 0,
+    "m_PreviewExpanded": true,
+    "m_PreviewMode": 0,
+    "m_CustomColors": {
+        "m_SerializableColors": []
+    },
+    "m_SerializedDescriptor": "VertexDescription.Position"
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.ColorRGBMaterialSlot",
+    "m_ObjectId": "b1b6c0604bf340b19d2e20e7a3eb2fef",
+    "m_Id": 0,
+    "m_DisplayName": "Base Color",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_ShaderOutputName": "BaseColor",
+    "m_StageCapability": 2,
+    "m_Value": {
+        "x": 0.5,
+        "y": 0.5,
+        "z": 0.5
+    },
+    "m_DefaultValue": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0
+    },
+    "m_Labels": [],
+    "m_ColorMode": 0,
+    "m_DefaultColor": {
+        "r": 0.5,
+        "g": 0.5,
+        "b": 0.5,
+        "a": 1.0
+    }
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.SampleTexture2DArrayNode",
+    "m_ObjectId": "b2364fc986c64073b365c1c40324e06b",
+    "m_Group": {
+        "m_Id": ""
+    },
+    "m_Name": "Sample Texture 2D Array",
+    "m_DrawState": {
+        "m_Expanded": true,
+        "m_Position": {
+            "serializedVersion": "2",
+            "x": -361.5999755859375,
+            "y": 111.19998168945313,
+            "width": 220.79998779296876,
+            "height": 373.5999755859375
+        }
+    },
+    "m_Slots": [
+        {
+            "m_Id": "d37b39bed08a4d1caa38665bd767abe0"
+        },
+        {
+            "m_Id": "f57043081ca2492690104aecdaa1a60c"
+        },
+        {
+            "m_Id": "a499e116a10f45d3bd92878664553e47"
+        },
+        {
+            "m_Id": "281be7f828cf4b37ae65e70310e39440"
+        },
+        {
+            "m_Id": "e8bb7d6b93494d1e8bf31a60407bca8b"
+        },
+        {
+            "m_Id": "de003f6462ee4a7eb460130a90b2283f"
+        },
+        {
+            "m_Id": "3e9baa45064a473da42a3261c403f6c2"
+        },
+        {
+            "m_Id": "326c08eaebfe45e192d21f17a1d2fc6b"
+        },
+        {
+            "m_Id": "057a60894da74d73ae47e2bdf0df650f"
+        }
+    ],
+    "synonyms": [],
+    "m_Precision": 0,
+    "m_PreviewExpanded": true,
+    "m_PreviewMode": 0,
+    "m_CustomColors": {
+        "m_SerializableColors": []
+    }
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot",
+    "m_ObjectId": "d37b39bed08a4d1caa38665bd767abe0",
+    "m_Id": 0,
+    "m_DisplayName": "RGBA",
+    "m_SlotType": 1,
+    "m_Hidden": false,
+    "m_ShaderOutputName": "RGBA",
+    "m_StageCapability": 2,
+    "m_Value": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0,
+        "w": 0.0
+    },
+    "m_DefaultValue": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0,
+        "w": 0.0
+    },
+    "m_Labels": []
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.Universal.ShaderGraph.UniversalUnlitSubTarget",
+    "m_ObjectId": "d472d226c35a4c08a7e9703935339970"
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.BlockNode",
+    "m_ObjectId": "dbd206debbb74ad5bb79a06425747d4b",
+    "m_Group": {
+        "m_Id": ""
+    },
+    "m_Name": "SurfaceDescription.Alpha",
+    "m_DrawState": {
+        "m_Expanded": true,
+        "m_Position": {
+            "serializedVersion": "2",
+            "x": 0.0,
+            "y": 0.0,
+            "width": 0.0,
+            "height": 0.0
+        }
+    },
+    "m_Slots": [
+        {
+            "m_Id": "5f52051bd3fc4d28b8ad98d42a7d902c"
+        }
+    ],
+    "synonyms": [],
+    "m_Precision": 0,
+    "m_PreviewExpanded": true,
+    "m_PreviewMode": 0,
+    "m_CustomColors": {
+        "m_SerializableColors": []
+    },
+    "m_SerializedDescriptor": "SurfaceDescription.Alpha"
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.PositionMaterialSlot",
+    "m_ObjectId": "ddbf28e67df34b3e94699689776967fc",
+    "m_Id": 0,
+    "m_DisplayName": "Position",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_ShaderOutputName": "Position",
+    "m_StageCapability": 1,
+    "m_Value": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0
+    },
+    "m_DefaultValue": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0
+    },
+    "m_Labels": [],
+    "m_Space": 0
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Texture2DArrayInputMaterialSlot",
+    "m_ObjectId": "de003f6462ee4a7eb460130a90b2283f",
+    "m_Id": 1,
+    "m_DisplayName": "Texture Array",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_ShaderOutputName": "Texture Array",
+    "m_StageCapability": 3,
+    "m_BareResource": false,
+    "m_TextureArray": {
+        "m_SerializedTexture": "{\"textureArray\":{\"instanceID\":0}}",
+        "m_Guid": ""
+    }
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+    "m_ObjectId": "e8bb7d6b93494d1e8bf31a60407bca8b",
+    "m_Id": 7,
+    "m_DisplayName": "A",
+    "m_SlotType": 1,
+    "m_Hidden": false,
+    "m_ShaderOutputName": "A",
+    "m_StageCapability": 2,
+    "m_Value": 0.0,
+    "m_DefaultValue": 0.0,
+    "m_Labels": []
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+    "m_ObjectId": "f57043081ca2492690104aecdaa1a60c",
+    "m_Id": 4,
+    "m_DisplayName": "R",
+    "m_SlotType": 1,
+    "m_Hidden": false,
+    "m_ShaderOutputName": "R",
+    "m_StageCapability": 2,
+    "m_Value": 0.0,
+    "m_DefaultValue": 0.0,
+    "m_Labels": []
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.BlockNode",
+    "m_ObjectId": "fb68d3a346844dc5af8968c7eb897955",
+    "m_Group": {
+        "m_Id": ""
+    },
+    "m_Name": "VertexDescription.Normal",
+    "m_DrawState": {
+        "m_Expanded": true,
+        "m_Position": {
+            "serializedVersion": "2",
+            "x": 0.0,
+            "y": 0.0,
+            "width": 0.0,
+            "height": 0.0
+        }
+    },
+    "m_Slots": [
+        {
+            "m_Id": "8a149b311b2f4582abb73779a51fe675"
+        }
+    ],
+    "synonyms": [],
+    "m_Precision": 0,
+    "m_PreviewExpanded": true,
+    "m_PreviewMode": 0,
+    "m_CustomColors": {
+        "m_SerializableColors": []
+    },
+    "m_SerializedDescriptor": "VertexDescription.Normal"
+}
+
diff --git a/Assets/New Shader Graph.shadergraph.meta b/Assets/New Shader Graph.shadergraph.meta
new file mode 100644
index 0000000..bfa5771
--- /dev/null
+++ b/Assets/New Shader Graph.shadergraph.meta	
@@ -0,0 +1,10 @@
+fileFormatVersion: 2
+guid: 5a65178bc3630194a863527583c254db
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 11500000, guid: 625f186215c104763be7675aa2d941aa, type: 3}
diff --git a/Assets/PlayerController/PlayerJump.cs b/Assets/PlayerController/PlayerJump.cs
deleted file mode 100644
index 996be47..0000000
--- a/Assets/PlayerController/PlayerJump.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-using UnityEngine;
-using System.Collections;
-
-public class PlayerJump : MonoBehaviour {
-    private Rigidbody _rigidbody;
-    private CapsuleCollider _capsuleCollider;
-    public float JumpStrength = 7;
-
-    // Use this for initialization
-	void Start () {
-	    _rigidbody = GetComponent<Rigidbody>();
-	    _capsuleCollider = GetComponent<CapsuleCollider>();
-	}
-
-    void Update()
-    {
-        if (Input.GetButtonDown("Jump"))
-        {
-            RaycastHit hit;
-            if (Physics.Raycast(transform.position, Vector3.down, out hit, _capsuleCollider.height / 2.0f + 0.1f))
-            {
-                if (_rigidbody.velocity.y < 0.1f)
-                    _rigidbody.velocity += Vector3.up * JumpStrength;
-            }
-        }
-    }
-}
diff --git a/Assets/PlayerController/PlayerMouselook.cs b/Assets/PlayerController/PlayerMouselook.cs
deleted file mode 100644
index 707b3b3..0000000
--- a/Assets/PlayerController/PlayerMouselook.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-using System;
-using UnityEngine;
-using System.Collections;
-
-public class PlayerMouselook : MonoBehaviour {
-    private Transform _rotatePivot;
-    public float LookSensitivity = 1.0f;
-
-    // Use this for initialization
-	void Start ()
-	{
-        Cursor.visible = false;
-        Cursor.lockState = CursorLockMode.Locked;
-	    _rotatePivot = transform.Find("RotatePivot");
-	}
-	
-	// Update is called once per frame
-	void Update ()
-	{
-	    var horizDeltaAngle = Input.GetAxis("Mouse X")* LookSensitivity;
-        var vertDeltaAngle = Input.GetAxis("Mouse Y")* LookSensitivity;
-
-        var newVertAngle = _rotatePivot.transform.localEulerAngles.x - vertDeltaAngle;
-        newVertAngle = (newVertAngle > 180) ? newVertAngle - 360 : newVertAngle;
-	    newVertAngle = Mathf.Clamp(newVertAngle, -80, 80);
-
-	    _rotatePivot.transform.localRotation = Quaternion.Euler(newVertAngle, 0, 0);
-
-	    var newHorizAngle = transform.localEulerAngles.y + horizDeltaAngle;
-        transform.localRotation = Quaternion.Euler(0, newHorizAngle, 0);
-	}
-
-    void OnGUI()
-    {
-        //GUILayout.Label("Horiz: " + angle);
-        //GUILayout.Label("Vert: " + transform.localEulerAngles.y);
-    }
-}
diff --git a/Assets/PlayerController/PlayerMovement.cs b/Assets/PlayerController/PlayerMovement.cs
deleted file mode 100644
index c21f742..0000000
--- a/Assets/PlayerController/PlayerMovement.cs
+++ /dev/null
@@ -1,54 +0,0 @@
-using UnityEngine;
-using System.Collections;
-
-[RequireComponent(typeof(Rigidbody))]
-public class PlayerMovement : MonoBehaviour {
-    private Camera _camera;
-    public AudioSource WalkSoundSource;
-
-    // Use this for initialization
-	void Start ()
-	{
-	    _camera = GetComponentInChildren<Camera>();
-	    _rigidBody = GetComponent<Rigidbody>();
-	}
-	
-	// Update is called once per frame
-    private float an = 0;
-    public int MaxSpeed = 2;
-    public float Acceleration = 1;
-    private float _lastWalkPlayTime = 0;
-    private Rigidbody _rigidBody;
-
-    void FixedUpdate ()
-    {
-        var realMaxSpeed = MaxSpeed;
-        if (Input.GetButton("Run"))
-            realMaxSpeed *= 2;
-        var forward = Input.GetAxis("Vertical");
-        var strafe = Input.GetAxis("Horizontal");
-        var newVel = Vector3.ClampMagnitude((transform.forward * forward) + (transform.right * strafe), 1) * realMaxSpeed;
-
-        an += newVel.magnitude * 2;
-        an = an % 360;
-        //if (Mathf.Abs(newVel.magnitude) > (MaxSpeed/2.0f))
-        //{
-        //}
-        //else
-        //{
-        //    newVel *= 0.9f;
-        //}
-        if (newVel.magnitude > 0.1f)
-        {
-            if (Time.time > _lastWalkPlayTime + Mathf.Pow(0.9f, newVel.magnitude)) {
-                _lastWalkPlayTime = Time.time;
-                WalkSoundSource.pitch = Random.Range(0.9f, 1.5f);
-                WalkSoundSource.Play();
-            }
-        }
-        newVel.y = _rigidBody.velocity.y;
-        _rigidBody.velocity = newVel;
-
-        _camera.transform.localPosition = new Vector3(0, Mathf.Sin(an * Mathf.Deg2Rad) / 20.0f, 0);
-	}
-}
diff --git a/Assets/PlayerController/step.wav b/Assets/PlayerController/step.wav
deleted file mode 100644
index ccdc273..0000000
Binary files a/Assets/PlayerController/step.wav and /dev/null differ
diff --git a/Assets/PlayerController/step.wav.meta b/Assets/PlayerController/step.wav.meta
deleted file mode 100644
index 4a457a6..0000000
--- a/Assets/PlayerController/step.wav.meta
+++ /dev/null
@@ -1,24 +0,0 @@
-fileFormatVersion: 2
-guid: 37e385d770e88f04abc6067cfa231907
-timeCreated: 1519685935
-licenseType: Free
-AudioImporter:
-  externalObjects: {}
-  serializedVersion: 6
-  defaultSettings:
-    loadType: 0
-    sampleRateSetting: 0
-    sampleRateOverride: 44100
-    compressionFormat: 1
-    quality: 1
-    conversionMode: 0
-  platformSettingOverrides: {}
-  forceToMono: 0
-  normalize: 1
-  preloadAudioData: 1
-  loadInBackground: 0
-  ambisonic: 0
-  3D: 1
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/RepeatingAtlas.shader b/Assets/RepeatingAtlas.shader
deleted file mode 100644
index daf8a92..0000000
--- a/Assets/RepeatingAtlas.shader
+++ /dev/null
@@ -1,61 +0,0 @@
-Shader "Unlit/RepeatingAtlas"
-{
-	Properties
-	{
-		_MainTex ("Texture", 2D) = "white" {}
-	}
-	SubShader
-	{
-		Tags { "RenderType"="Opaque" }
-		LOD 100
-
-		Pass
-		{
-			CGPROGRAM
-			#pragma vertex vert
-			#pragma fragment frag
-			// make fog work
-			#pragma multi_compile_fog
-			
-			#include "UnityCG.cginc"
-
-			struct appdata
-			{
-				float4 vertex : POSITION;
-				float2 uv : TEXCOORD0;
-				float4 color : COLOR;
-			};
-
-			struct v2f
-			{
-				float2 uv : TEXCOORD0;
-				UNITY_FOG_COORDS(1)
-				float4 vertex : SV_POSITION;
-				float4 color : COLOR;
-			};
-
-			sampler2D _MainTex;
-			float4 _MainTex_ST;
-			
-			v2f vert (appdata v)
-			{
-				v2f o;
-				o.vertex = UnityObjectToClipPos(v.vertex);
-				o.uv = TRANSFORM_TEX(v.uv, _MainTex);
-				o.color = v.color;
-				UNITY_TRANSFER_FOG(o,o.vertex);
-				return o;
-			}
-			
-			fixed4 frag (v2f i) : SV_Target
-			{
-				// sample the texture
-				fixed4 col = tex2D(_MainTex, (i.uv * i.color.zw) % i.color.zw + i.color.xy);
-				// apply fog
-				UNITY_APPLY_FOG(i.fogCoord, col);
-				return col;
-			}
-			ENDCG
-		}
-	}
-}
diff --git a/Assets/RepeatingAtlasStandard.shader b/Assets/RepeatingAtlasStandard.shader
deleted file mode 100644
index b45ff73..0000000
--- a/Assets/RepeatingAtlasStandard.shader
+++ /dev/null
@@ -1,64 +0,0 @@
-Shader "Custom/RepeatingAtlasStandard" {
-	Properties {
-		_Color ("Color", Color) = (1,1,1,1)
-		_MainTex ("Albedo (RGB)", 2D) = "white" {}
-		_Glossiness ("Smoothness", Range(0,1)) = 0.5
-		_Metallic ("Metallic", Range(0,1)) = 0.0
-	}
-	SubShader {
-		Tags { "RenderType"="Opaque" }
-		LOD 200
-
-		CGPROGRAM
-		// Physically based Standard lighting model, and enable shadows on all light types
-		#pragma surface surf Lambert finalcolor:mycolor fullforwardshadows vertex:vert
-
-		// Use shader model 3.0 target, to get nicer looking lighting
-		#pragma target 3.5
-
-		sampler2D _MainTex;
-
-		struct Input {
-			float2 uv_MainTex : TEXCOORD0;
-			float4 color : COLOR;
-			float4 atlasCoord : TEXCOORD1;
-		};
-
-		half _Glossiness;
-		half _Metallic;
-		fixed4 _Color;
-
-		void vert(inout appdata_full v, out Input o)
-		{
-			o.uv_MainTex = v.texcoord;
-			o.color = v.color;
-			o.atlasCoord = v.texcoord1;
-		}
-
-		// Add instancing support for this shader. You need to check 'Enable Instancing' on materials that use the shader.
-		// See https://docs.unity3d.com/Manual/GPUInstancing.html for more information about instancing.
-		// #pragma instancing_options assumeuniformscaling
-		UNITY_INSTANCING_BUFFER_START(Props)
-			// put more per-instance properties here
-		UNITY_INSTANCING_BUFFER_END(Props)
-
-		float2 mmod(float2 x, float2 m) {
-			return fmod(fmod(x, m) + m, m);
-		}
-
-		void surf (Input i, inout SurfaceOutput o) {
-			// xy = pos in atlas
-			// zw = width / height in atlas
-			fixed4 c = tex2D(_MainTex, mmod(i.uv_MainTex * i.atlasCoord.zw, i.atlasCoord.zw) + i.atlasCoord.xy);
-			o.Albedo = c.rgb;
-			o.Alpha = c.a;
-		}
-
-		void mycolor(Input i, SurfaceOutput o, inout fixed4 color)
-		{
-			color *= i.color;
-		}
-		ENDCG
-	}
-	FallBack "Diffuse"
-}
diff --git a/Assets/Resources.meta b/Assets/Resources.meta
new file mode 100644
index 0000000..abad3cb
--- /dev/null
+++ b/Assets/Resources.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 67cafdd3240ae8647ab104575281ef36
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Resources/BillingMode.json b/Assets/Resources/BillingMode.json
new file mode 100644
index 0000000..6f4bfb7
--- /dev/null
+++ b/Assets/Resources/BillingMode.json
@@ -0,0 +1 @@
+{"androidStore":"GooglePlay"}
\ No newline at end of file
diff --git a/Assets/Resources/BillingMode.json.meta b/Assets/Resources/BillingMode.json.meta
new file mode 100644
index 0000000..801de67
--- /dev/null
+++ b/Assets/Resources/BillingMode.json.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: e0dcdb1753d984d4491127c2a31433e1
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Scene.unity b/Assets/Scene.unity
index 48fd554..e6efb7a 100644
Binary files a/Assets/Scene.unity and b/Assets/Scene.unity differ
diff --git a/Assets/Scripts.meta b/Assets/Scripts.meta
index 98464ff..be1dc0c 100644
--- a/Assets/Scripts.meta
+++ b/Assets/Scripts.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 48ba9f34816345e4db98f273a8b4784a
+guid: ed69bc2bfd0e97e4e8df68821182aa07
 folderAsset: yes
 timeCreated: 1451685552
 licenseType: Free
diff --git a/Assets/Scripts/GOBManager.cs b/Assets/Scripts/GOBManager.cs
deleted file mode 100644
index 94faef4..0000000
--- a/Assets/Scripts/GOBManager.cs
+++ /dev/null
@@ -1,66 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using UnityEngine;
-
-namespace Assets.Scripts
-{
-    class GOBRecordEntry
-    {
-        public GOBStream GOBStream { get; set; }
-        public GOBRecord GOBRecord { get; set; }
-    }
-
-    public class GOBManager
-    {
-        private Dictionary<string, GOBRecordEntry> _recordDict;
-        private string _extractedPath;
-
-        public GOBManager(string gamePath, string[] gobFiles)
-        {
-            _extractedPath = Path.Combine(gamePath, "Extracted");
-
-            _recordDict = new Dictionary<string, GOBRecordEntry>();
-            foreach (var gobFile in gobFiles)
-            {
-                var gob = new GOBStream(Path.Combine(gamePath, gobFile));
-                foreach (var record in gob.Records)
-                {
-                    _recordDict.Add(record.Name.ToLower(), new GOBRecordEntry { GOBStream = gob, GOBRecord = record });
-                }
-            }
-        }
-
-        private bool ExistOnDisk(string name)
-        {
-            return File.Exists(Path.Combine(_extractedPath, name));
-        }
-
-        public Stream GetStream(string name)
-        {
-            var lowerName = name.ToLower();
-
-            if (ExistOnDisk(name))
-            {
-                Debug.Log("GOBManager [DISK]: Loading " + lowerName);
-                return new FileStream(Path.Combine(_extractedPath, name), FileMode.Open);
-            }
-
-            if(!_recordDict.ContainsKey(lowerName))
-                throw new Exception("Cannot find file in GOB: " + lowerName);
-
-            Debug.Log("GOBManager: Loading " + lowerName);
-            var recordEntry = _recordDict[lowerName];
-            return recordEntry.GOBStream.GetRecordStream(recordEntry.GOBRecord);
-        }
-
-        public bool Exists(string name)
-        {
-            if (ExistOnDisk(name))
-                return true;
-
-            return _recordDict.ContainsKey(name);
-        }
-    }
-}
\ No newline at end of file
diff --git a/Assets/Scripts/GOBStream.cs.meta b/Assets/Scripts/GOBStream.cs.meta
deleted file mode 100644
index 51476a6..0000000
--- a/Assets/Scripts/GOBStream.cs.meta
+++ /dev/null
@@ -1,12 +0,0 @@
-fileFormatVersion: 2
-guid: 8153f724fd92d834b82b533c79a70cc3
-timeCreated: 1451685605
-licenseType: Free
-MonoImporter:
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/Scripts/JKL/JKLParser.cs b/Assets/Scripts/JKL/JKLParser.cs
deleted file mode 100644
index cc0d3a6..0000000
--- a/Assets/Scripts/JKL/JKLParser.cs
+++ /dev/null
@@ -1,541 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.IO;
-using UnityEngine;
-
-namespace jksharp.jklviewer.JKL
-{
-    class JKLParser
-    {
-        private readonly JKL _jkl;
-        private string _line;
-        private List<string> _args;
-        private StreamReader _streamReader;
-
-        private bool Match(string match)
-        {
-            if (_line.StartsWith(match))
-            {
-                _line = _line.Remove(0, match.Length).Trim();
-                _args = new List<string>();
-                var buffer = "";
-                foreach (var c in _line)
-                {
-                    if (c == ' ' || c == '\t')
-                    {
-                        _args.Add(buffer);
-                        buffer = "";
-                        continue;
-                    }
-                    buffer += c;
-                }
-                _args.Add(buffer);
-                return true;
-            }
-            return false;
-        }
-
-        private void ReadLine()
-        {
-            do
-            {
-                _line = _streamReader.ReadLine();
-            } while (_line != null && (_line.StartsWith("#") || _line.Trim().Length == 0));
-            if (_line == null)
-                return;
-
-            _args = new List<string>(_line.Trim().Split(new[] {' ', '\t'}, StringSplitOptions.RemoveEmptyEntries));
-        }
-
-        public JKLParser(JKL jkl, Stream jklStream)
-        {
-            _jkl = jkl;
-            _streamReader = new StreamReader(jklStream);
-        }
-
-        public void Parse()
-        {
-            ReadLine();
-            while (!_streamReader.EndOfStream)
-            {
-                switch (_line.ToUpper())
-                {
-                    case "SECTION: JK":
-                    case "SECTION: COPYRIGHT":
-                        do
-                        {
-                            ReadLine();
-                        } while (!_line.StartsWith("SECTION: "));
-                        break;
-                    case "SECTION: HEADER":
-                        ParseHeader();
-                        break;
-                    case "SECTION: SOUNDS":
-                        ParseSounds();
-                        break;
-                    case "SECTION: MATERIALS":
-                        ParseMaterials();
-                        break;
-                    case "SECTION: GEORESOURCE":
-                        ParseGeoResource();
-                        break;
-                    case "SECTION: SECTORS":
-                        ParseSectors();
-                        //_streamReader.Dispose();
-                        //return;
-                        break;
-                    case "SECTION: MODELS":
-                        ParseModels();
-                        break;
-                    case "SECTION: TEMPLATES":
-                        ParseTemplates();
-                        break;
-                    case "SECTION: THINGS":
-                        ParseThings();
-                        break;
-                    default:
-                        ReadLine();
-                        break;
-                }
-            }
-        }
-
-        private void ParseThings()
-        {
-            ReadLine();
-            if (Match("World things"))
-            {
-                _jkl.Things = new List<JKLThing>();
-                while (true)
-                {
-                    ReadLine();
-                    if (_line == "end")
-                    {
-                        break;
-                    }
-
-                    var thing = new JKLThing();
-                    thing.Template = _jkl.Templates[_args[1]];
-                    thing.Name = _args[2];
-                    thing.X = float.Parse(_args[3]);
-                    thing.Y = float.Parse(_args[4]);
-                    thing.Z = float.Parse(_args[5]);
-                    thing.Pitch = float.Parse(_args[6]);
-                    thing.Yaw = float.Parse(_args[7]);
-                    thing.Roll = float.Parse(_args[8]);
-                    thing.SectorIdx = int.Parse(_args[9]);
-                    
-                    _jkl.Things.Add(thing);
-                }
-            }
-        }
-
-        private void ParseTemplates()
-        {
-            ReadLine();
-            if (Match("World templates"))
-            {
-                _jkl.Templates = new Dictionary<string, JKLTemplate>();
-                while (true)
-                {
-                    ReadLine();
-                    if (_line == "end")
-                    {
-                        break;
-                    }
-                    
-                    var name = _args[0];
-                    var basedOn = _args[1];
-                    var numParams = _args.Count - 2;
-                    var template = JKLTemplate.CreateNewBasedOn(basedOn == "none" ? null : _jkl.Templates[basedOn]);
-                    for (int i = 0; i < numParams; i++)
-                    {
-                        var argVal = _args[2 + i].Split('=');
-                        template.Parameters[argVal[0]] = argVal[1];
-                    }
-                    _jkl.Templates.Add(name, template);
-                }
-            }
-        }
-
-        private void ParseModels()
-        {
-            ReadLine();
-            if (Match("World models"))
-            {
-                _jkl.Models = new List<string>();
-                
-                while (true)
-                {
-                    ReadLine();
-                    if (_line == "end")
-                    {
-                        break;
-                    }
-                    _jkl.Models.Add(_args[1]);
-                }
-            }
-        }
-
-        private void ParseSectors()
-        {
-            Sector currentSector = null;
-            var currentSectorIdx = 0;
-            while (true)
-            {
-                ReadLine();
-                if (_line.StartsWith("SECTION: ", StringComparison.OrdinalIgnoreCase))
-                {
-                    if (currentSector != null)
-                    {
-                        _jkl.Sectors[currentSectorIdx] = currentSector;
-                    }
-                    break;
-                }
-
-                if (Match("World sectors"))
-                {
-                    var numSectors = int.Parse(_args[0]);
-                    _jkl.Sectors = new Sector[numSectors];
-                }
-                else if (Match("SECTOR"))
-                {
-                    // Store old sector, make new one
-                    if (currentSector != null)
-                    {
-                        _jkl.Sectors[currentSectorIdx] = currentSector;
-                    }
-                    currentSectorIdx = int.Parse(_args[0]);
-                    currentSector = new Sector();
-                }
-                else if (Match("FLAGS"))
-                {
-                    currentSector.Flags = (uint)ParseHex(_args[0]);
-                }
-                else if (Match("VERTICES"))
-                {
-                    var numVertices = int.Parse(_args[0]);
-                    currentSector.VertexIndices = new int[numVertices];
-                    for (int i = 0; i < numVertices; i++)
-                    {
-                        ReadLine();
-                        string[] args = _line.Split(new[] { '\t' }, StringSplitOptions.RemoveEmptyEntries);
-                        var sourceIdx = int.Parse(args[0].Replace(":", ""));
-                        var vertexIdx = int.Parse(args[1]);
-                        currentSector.VertexIndices[sourceIdx] = vertexIdx;
-                    }
-                }
-                else if (Match("SURFACES"))
-                {
-                    currentSector.SurfaceStartIdx = int.Parse(_args[0]);
-                    currentSector.SurfaceCount = int.Parse(_args[1]);
-
-                    for (int i = 0; i < currentSector.SurfaceCount; i++)
-                    {
-                        var surface = _jkl.WorldSurfaces[currentSector.SurfaceStartIdx + i];
-                        surface.Sector = currentSector;
-                    }
-                }
-            }
-        }
-
-        private void ParseGeoResource()
-        {
-            while (true)
-            {
-                ReadLine();
-                if (_line.StartsWith("SECTION: ", StringComparison.OrdinalIgnoreCase))
-                    break;
-                if (Match("World Colormaps"))
-                {
-                    _jkl.WorldColorMaps = new string[int.Parse(_args[0])];
-                    for (int i = 0; i < _jkl.WorldColorMaps.Length; i++)
-                    {
-                        ReadLine();
-                        string[] args = _line.Split(new[] { '\t' }, StringSplitOptions.RemoveEmptyEntries);
-                        var idx = int.Parse(args[0].Replace(":", ""));
-                        _jkl.WorldColorMaps[idx] = args[1];
-                    }
-                }
-                else if (Match("World vertices"))
-                {
-                    _jkl.WorldVertices = new Vector3[int.Parse(_args[0])];
-                    for (int i = 0; i < _jkl.WorldVertices.Length; i++)
-                    {
-                        ReadLine();
-                        string[] args = _line.Split(new[] { '\t' }, StringSplitOptions.RemoveEmptyEntries);
-                        var idx = int.Parse(args[0].Replace(":", ""));
-                        _jkl.WorldVertices[idx] = new Vector3(float.Parse(args[1]), float.Parse(args[2]), float.Parse(args[3]));
-                    }
-                }
-                else if (Match("World texture vertices"))
-                {
-                    _jkl.WorldTextureVertices = new Vector2[int.Parse(_args[0])];
-                    for (int i = 0; i < _jkl.WorldTextureVertices.Length; i++)
-                    {
-                        ReadLine();
-                        string[] args = _line.Split(new[] { '\t' }, StringSplitOptions.RemoveEmptyEntries);
-                        var idx = int.Parse(args[0].Replace(":", ""));
-                        _jkl.WorldTextureVertices[idx] = new Vector2(float.Parse(args[1]), float.Parse(args[2]));
-                    }
-                }
-                else if (Match("World adjoins"))
-                {
-                    _jkl.WorldAdjoins = new Adjoin[int.Parse(_args[0])];
-                    for (int i = 0; i < _jkl.WorldAdjoins.Length; i++)
-                    {
-                        ReadLine();
-                        string[] args = _line.Split(new[] { '\t' }, StringSplitOptions.RemoveEmptyEntries);
-                        var idx = int.Parse(args[0].Replace(":", ""));
-                        _jkl.WorldAdjoins[idx] = new Adjoin
-                        {
-                            Flags = (uint)ParseHex(args[1]),
-                            Mirror = int.Parse(args[2]),
-                            Distance = float.Parse(args[3])
-                        };
-                    }
-                }
-                else if (Match("World surfaces"))
-                {
-                    _jkl.WorldSurfaces = new WorldSurface[int.Parse(_args[0])];
-                    for (int i = 0; i < _jkl.WorldSurfaces.Length; i++)
-                    {
-                        ReadLine();
-                        string[] args = _line.Split(new[] { '\t' }, StringSplitOptions.RemoveEmptyEntries);
-                        var idx = int.Parse(args[0].Replace(":", ""));
-                        var matIdx = int.Parse(args[1]);
-                        var adjoinIdx = int.Parse(args[7]);
-                        Material material = matIdx == -1 ? null : _jkl.Materials[matIdx];
-                        Adjoin adjoin = adjoinIdx == -1 ? null : _jkl.WorldAdjoins[adjoinIdx];
-                        var surface = new WorldSurface
-                        {
-                            Material = material,
-                            SurfaceFlags = (uint)ParseHex(args[2]),
-                            FaceFlags = (uint)ParseHex(args[3]),
-                            Geo = int.Parse(args[4]),
-                            Light = int.Parse(args[5]),
-                            Tex = int.Parse(args[6]),
-                            Adjoin = adjoin,
-                            ExtraLight = float.Parse(args[8]),
-                            SurfaceVertexGroups = new SurfaceVertexGroup[int.Parse(args[9])],
-                            Sector = null
-                        };
-                        if(adjoin != null)
-                            adjoin.Surface = surface;
-
-                        _jkl.WorldSurfaces[idx] = surface;
-
-                        for (int k = 0; k < _jkl.WorldSurfaces[idx].SurfaceVertexGroups.Length; k++)
-                        {
-                            var surfaceVertexGroup = new SurfaceVertexGroup();
-                            var group = args[10 + k].Split(',');
-                            var vIdx = int.Parse(group[0]);
-                            var tvIdx = int.Parse(group[1]);
-                            if (vIdx == -1)
-                                throw new Exception("Null vertex??");
-
-                            surfaceVertexGroup.VertexIdx = vIdx;
-                            surfaceVertexGroup.TextureVertex = tvIdx == -1 ? null : (Vector2?)_jkl.WorldTextureVertices[tvIdx];
-
-                            _jkl.WorldSurfaces[idx].SurfaceVertexGroups[k] = surfaceVertexGroup;
-                        }
-                        _jkl.WorldSurfaces[idx].Intensities = new float[_jkl.WorldSurfaces[idx].SurfaceVertexGroups.Length];
-                        for (int k = 0; k < _jkl.WorldSurfaces[idx].SurfaceVertexGroups.Length; k++)
-                        {
-                            var intensityIdx = _jkl.WorldSurfaces[idx].SurfaceVertexGroups.Length + 10 + k;
-                            _jkl.WorldSurfaces[idx].Intensities[k] = float.Parse(args[intensityIdx]);
-
-                        }
-                    }
-
-                    // Surface normals
-                    for (int i = 0; i < _jkl.WorldSurfaces.Length; i++)
-                    {
-                        ReadLine();
-                        string[] args = _line.Split(new[] { '\t' }, StringSplitOptions.RemoveEmptyEntries);
-                        var idx = int.Parse(args[0].Replace(":", ""));
-                        _jkl.WorldSurfaces[idx].SurfaceNormal = new Vector3(float.Parse(args[1]), float.Parse(args[2]), float.Parse(args[3]));
-                    }
-                }
-            }
-        }
-
-        private static int ParseHex(string str)
-        {
-            return int.Parse(str.Replace("0x", ""), NumberStyles.AllowHexSpecifier);
-        }
-
-        private void ParseMaterials()
-        {
-            ReadLine();
-            if (Match("World materials"))
-            {
-                _jkl.Materials = new Material[int.Parse(_args[0])];
-                for (int i = 0; i < _jkl.Materials.Length; i++)
-                {
-                    ReadLine();
-                    if (_line == "end")
-                    {
-                        _jkl.ActualNumberOfMaterials = i;
-                        ReadLine();
-                        break;
-                    }
-                    var args = _line.Split('\t');
-                    var idx = int.Parse(args[0].Replace(":", ""));
-                    _jkl.Materials[idx] = new Material
-                    {
-                        Name = args[1],
-                        XTile = float.Parse(args[2]),
-                        YTile = float.Parse(args[3])
-                    };
-                }
-            }
-        }
-
-        private void ParseSounds()
-        {
-            ReadLine();
-            if (Match("World sounds"))
-            {
-                _jkl.Sounds = new string[int.Parse(_args[0])];
-                int i = 0;
-                while (true)
-                {
-                    ReadLine();
-                    if (_line == "end")
-                    {
-                        ReadLine();
-                        break;
-                    }
-                    _jkl.Sounds[i++] = _line;
-                }
-            }
-        }
-
-        private void ParseHeader()
-        {
-            while (true)
-            {
-                ReadLine();
-                if (_line.StartsWith("SECTION: "))
-                    break;
-
-                if (Match("Version"))
-                {
-                    _jkl.Version = int.Parse(_args[0]);
-                }
-                else if (Match("World Gravity"))
-                {
-                    _jkl.WorldGravity = float.Parse(_args[0]);
-                }
-                else if (Match("Ceiling Sky Z"))
-                {
-                    _jkl.CeilingSkyZ = float.Parse(_args[0]);
-                }
-                else if (Match("Horizon Distance"))
-                {
-                    _jkl.HorizonDistance = float.Parse(_args[0]);
-                }
-                else if (Match("Horizon Pixels per Rev"))
-                {
-                    _jkl.HorizonPixelsPerRev = float.Parse(_args[0]);
-                }
-                else if (Match("Horizon Sky Offset"))
-                {
-                    _jkl.HorizonSkyOffset = new Vector2(float.Parse(_args[0]), float.Parse(_args[1]));
-                }
-                else if (Match("Ceiling Sky Offset"))
-                {
-                    _jkl.CeilingSkyOffset = new Vector2(float.Parse(_args[0]), float.Parse(_args[1]));
-                }
-                else if (Match("MipMap Distances"))
-                {
-                    _jkl.MipMapDistances = new Vector4(float.Parse(_args[0]), float.Parse(_args[1]), float.Parse(_args[2]), float.Parse(_args[3]));
-                }
-                else if (Match("LOD Distances"))
-                {
-                    _jkl.LODDistances = new Vector4(float.Parse(_args[0]), float.Parse(_args[1]), float.Parse(_args[2]), float.Parse(_args[3]));
-                }
-                else if (Match("Perspective distance"))
-                {
-                    _jkl.PerspectiveDistance = float.Parse(_args[0]);
-                }
-                else if (Match("Gouraud distance"))
-                {
-                    _jkl.GouraudDistance = float.Parse(_args[0]);
-                }
-            }
-        }
-    }
-
-    internal class JKLThing
-    {
-        public JKLTemplate Template { get; set; }
-        public string Name { get; set; }
-        public float X { get; set; }
-        public float Y { get; set; }
-        public float Z { get; set; }
-        public float Pitch { get; set; }
-        public float Yaw { get; set; }
-        public float Roll { get; set; }
-        public int SectorIdx { get; set; }
-    }
-
-    internal class JKLTemplate
-    {
-        public Dictionary<string, string> Parameters { get; private set; }
-
-        private JKLTemplate()
-        {
-            Parameters = new Dictionary<string, string>();
-        }
-
-        public static JKLTemplate CreateNewBasedOn(JKLTemplate baseTemplate)
-        {
-            var template = new JKLTemplate();
-            if (baseTemplate != null)
-                template.Parameters = new Dictionary<string, string>(baseTemplate.Parameters);
-
-            return template;
-        }
-    }
-
-    internal class WorldSurface
-    {
-        public Material Material { get; set; }
-        public uint SurfaceFlags { get; set; }
-        public uint FaceFlags { get; set; }
-        public int Geo { get; set; }
-        public int Light { get; set; }
-        public int Tex { get; set; }
-        public Adjoin Adjoin { get; set; }
-        public float ExtraLight { get; set; }
-        public SurfaceVertexGroup[] SurfaceVertexGroups { get; set; }
-        public float[] Intensities { get; set; }
-        public Vector3 SurfaceNormal { get; set; }
-        public Sector Sector { get; set; }
-    }
-
-    internal class Sector
-    {
-        public uint Flags { get; set; }
-        public int SurfaceStartIdx { get; set; }
-        public int SurfaceCount { get; set; }
-        public int[] VertexIndices { get; set; }
-    }
-
-    internal class SurfaceVertexGroup
-    {
-        public int VertexIdx { get; set; }
-        public Vector2? TextureVertex { get; set; }
-    }
-
-    internal class Adjoin
-    {
-        public uint Flags { get; set; }
-        public int Mirror { get; set; }
-        public float Distance { get; set; }
-        public WorldSurface Surface { get; set; }
-    }
-}
diff --git a/Assets/Scripts/JKL/Material.cs b/Assets/Scripts/JKL/Material.cs
deleted file mode 100644
index b33d6aa..0000000
--- a/Assets/Scripts/JKL/Material.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-namespace jksharp.jklviewer.JKL
-{
-    internal class Material
-    {
-        public string Name { get; set; }
-        public float XTile { get; set; }
-        public float YTile { get; set; }
-
-        public override string ToString()
-        {
-            return Name;
-        }
-    }
-}
\ No newline at end of file
diff --git a/Assets/Scripts/JKL/Material.cs.meta b/Assets/Scripts/JKL/Material.cs.meta
deleted file mode 100644
index 0b80ba5..0000000
--- a/Assets/Scripts/JKL/Material.cs.meta
+++ /dev/null
@@ -1,12 +0,0 @@
-fileFormatVersion: 2
-guid: f5b60e8f71168d94e95065584a02219e
-timeCreated: 1451689215
-licenseType: Free
-MonoImporter:
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/Scripts/KEYParser.cs b/Assets/Scripts/KEYParser.cs
deleted file mode 100644
index 287267e..0000000
--- a/Assets/Scripts/KEYParser.cs
+++ /dev/null
@@ -1,188 +0,0 @@
-using Assets.Scripts;
-using System;
-using System.Collections.Generic;
-using System.IO;
-using UnityEngine;
-
-class KEYParser
-{
-    public string Name { get; private set; }
-
-    private StreamReader sr;
-    private string _line;
-    private string[] _args;
-
-    private void ReadLine()
-    {
-        while (!sr.EndOfStream)
-        {
-            _line = sr.ReadLine();
-            if (_line.StartsWith("#") || _line.Trim() == "")
-                continue;
-            _args = _line.Split(new[] { ' ', ',', '\t' }, StringSplitOptions.RemoveEmptyEntries);
-            break;
-        }
-    }
-
-    public AnimationClip Parse(_3DO threedo, Transform root, string filename, Stream dataStream)
-    {
-        var animationClip = new AnimationClip();
-        Name = Path.GetFileNameWithoutExtension(filename);
-
-        string section = "";
-        int numFrames = 0;
-        float fps = 1.0f;
-        int currentNodeIdx = 0;
-        string currentMeshName = null;
-        int numEntries;
-        AnimationCurve curveX, curveY, curveZ;
-        AnimationCurve curveXR, curveYR, curveZR, curveWR;
-        curveX = curveY = curveZ = curveXR = curveYR = curveZR = curveWR = null;
-
-        using (sr = new StreamReader(dataStream))
-        {
-            while (!sr.EndOfStream)
-            {
-                ReadLine();
-
-                if (_line == "")
-                    continue;
-                else if (_line.StartsWith("SECTION: "))
-                {
-                    section = _line;
-                }
-                else if (section == "SECTION: HEADER")
-                {
-                    switch (_args[0])
-                    {
-                        case "FRAMES":
-                            numFrames = int.Parse(_args[1]);
-                            break;
-                        case "FPS":
-                            fps = float.Parse(_args[1]);
-                            break;
-                    }
-                }
-                else if (section == "SECTION: KEYFRAME NODES")
-                {
-                    if (_args[0] == "NODES")
-                    {
-
-                    }
-                    else if (_args[0] == "NODE")
-                    {
-                        if (currentMeshName != null)
-                        {
-                            var transformPath = GetFullPathTo(root, threedo.HierarchyNodes[currentNodeIdx].Transform);
-                            animationClip.SetCurve(transformPath, typeof(Transform), "localPosition.x", curveX);
-                            animationClip.SetCurve(transformPath, typeof(Transform), "localPosition.y", curveY);
-                            animationClip.SetCurve(transformPath, typeof(Transform), "localPosition.z", curveZ);
-                            animationClip.SetCurve(transformPath, typeof(Transform), "localRotation.x", curveXR);
-                            animationClip.SetCurve(transformPath, typeof(Transform), "localRotation.y", curveYR);
-                            animationClip.SetCurve(transformPath, typeof(Transform), "localRotation.z", curveZR);
-                            animationClip.SetCurve(transformPath, typeof(Transform), "localRotation.w", curveWR);
-                        }
-
-                        currentNodeIdx = int.Parse(_args[1]);
-                        curveX = new AnimationCurve();
-                        curveY = new AnimationCurve();
-                        curveZ = new AnimationCurve();
-                        curveXR = new AnimationCurve();
-                        curveYR = new AnimationCurve();
-                        curveZR = new AnimationCurve();
-                        curveWR = new AnimationCurve();
-
-                        curveX.postWrapMode = WrapMode.Loop;
-                        curveY.postWrapMode = WrapMode.Loop;
-                        curveZ.postWrapMode = WrapMode.Loop;
-                        curveXR.postWrapMode = WrapMode.Loop;
-                        curveYR.postWrapMode = WrapMode.Loop;
-                        curveZR.postWrapMode = WrapMode.Loop;
-                    }
-                    else if (_args[0] == "MESH" && _args[1] == "NAME")
-                        currentMeshName = _args[2];
-                    else if (_args[0] == "ENTRIES")
-                    {
-                        numEntries = int.Parse(_args[1]);
-                    }
-                    else
-                    {
-                        // var entryNum = int.Parse(_args[0].Replace(":", ""));
-                        var frame = int.Parse(_args[1]);
-                        var flags = _args[2];
-                        var x = float.Parse(_args[3]);
-                        var y = float.Parse(_args[4]);
-                        var z = float.Parse(_args[5]);
-                        var pitch = float.Parse(_args[6]);
-                        var yaw = float.Parse(_args[7]);
-                        var roll = float.Parse(_args[8]);
-
-
-                        curveX.AddKey(frame / fps, -x);
-                        curveY.AddKey(frame / fps, z);
-                        curveZ.AddKey(frame / fps, -y);
-
-                        if (curveX.length == 1)
-                        {
-                            curveX.AddKey(numFrames / fps, -x);
-                            curveY.AddKey(numFrames / fps, z);
-                            curveZ.AddKey(numFrames / fps, -y);
-                        }
-
-                        var quaternion = Quaternion.Euler(pitch, -yaw, roll);
-                                   
-                        curveXR.AddKey(frame / fps, quaternion.x);
-                        curveYR.AddKey(frame / fps, quaternion.y);
-                        curveZR.AddKey(frame / fps, quaternion.z);
-                        curveWR.AddKey(frame / fps, quaternion.w);
-
-                        if (curveXR.length == 1)
-                        {
-                            curveXR.AddKey(numFrames / fps, quaternion.x);
-                            curveYR.AddKey(numFrames / fps, quaternion.y);
-                            curveZR.AddKey(numFrames / fps, quaternion.z);
-                            curveWR.AddKey(numFrames / fps, quaternion.w);
-                        }
-
-
-                        ReadLine();
-
-                        // Skip delta frames
-                    }
-                }
-            }
-        }
-
-        if (currentMeshName != null)
-        {
-            var transformPath = GetFullPathTo(root, threedo.HierarchyNodes[currentNodeIdx].Transform);
-            animationClip.SetCurve(transformPath, typeof(Transform), "localPosition.x", curveX);
-            animationClip.SetCurve(transformPath, typeof(Transform), "localPosition.y", curveY);
-            animationClip.SetCurve(transformPath, typeof(Transform), "localPosition.z", curveZ);
-            animationClip.SetCurve(transformPath, typeof(Transform), "localRotation.x", curveXR);
-            animationClip.SetCurve(transformPath, typeof(Transform), "localRotation.y", curveYR);
-            animationClip.SetCurve(transformPath, typeof(Transform), "localRotation.z", curveZR);
-            animationClip.SetCurve(transformPath, typeof(Transform), "localRotation.w", curveWR);
-        }
-
-        animationClip.legacy = true;
-        animationClip.name = Name;
-        animationClip.EnsureQuaternionContinuity();
-        animationClip.wrapMode = WrapMode.Loop;
-        return animationClip;
-    }
-
-    private string GetFullPathTo(Transform root, Transform transformToFind)
-    {
-        if (transformToFind == root)
-            return "";
-
-        var path = transformToFind.name;
-        while (transformToFind.parent != root && transformToFind.parent != null)
-        {
-            path = transformToFind.parent.name + "/" + path;
-            transformToFind = transformToFind.parent;
-        }
-        return path;
-    }
-}
\ No newline at end of file
diff --git a/Assets/Scripts/MATParser.cs b/Assets/Scripts/MATParser.cs
deleted file mode 100644
index 41c8eda..0000000
--- a/Assets/Scripts/MATParser.cs
+++ /dev/null
@@ -1,133 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.IO;
-using System.Linq;
-using System.Net.Mime;
-using System.Reflection;
-using System.Text;
-using UnityEngine;
-
-namespace Assets.Scripts
-{
-    public class MAT
-    {
-        public Texture2D[] Textures { get; set; }
-
-        public void ParseMat(CMP cmp, Stream dataStream)
-        {
-            var transparentColor = new Color32(0, 0, 0, 0);
-
-            using (var br = new BinaryReader(dataStream))
-            {
-                var rectList = new List<Rect>();
-
-                var matHdr = br.ReadChars(4);
-                var version = br.ReadInt32();
-                var type = br.ReadInt32();
-                var numTextures = br.ReadInt32();
-                var numTextures1 = br.ReadInt32();
-                var zero = br.ReadInt32();
-                var eight = br.ReadInt32();
-                for (int i = 0; i <= 11; i++)
-                {
-                    br.ReadInt32();
-                }
-
-                Textures = new Texture2D[numTextures];
-                for (int i = 0; i < numTextures; i++)
-                {
-                    var texType = br.ReadUInt32();
-                    var colorNum = br.ReadUInt32();
-                    for (int j = 0; j <= 3; j++)
-                    {
-                        var unk = br.ReadUInt32(); //0x3F800000
-                    }
-                    if (type == 0)
-                    {
-                        Textures[i] = new Texture2D(8, 8, TextureFormat.ARGB32, false);
-                        var pixels = new Color32[64];
-                        var color = cmp.GetColor((byte)colorNum);
-                        for (int xy = 0; xy < 64; xy++)
-                        {
-                            pixels[xy] = color;
-                        }
-                        Textures[i].SetPixels32(pixels);
-                    }
-                    else if (type == 2)
-                    {
-                        for (int j = 0; j <= 1; j++)
-                        {
-                            var unk = br.ReadUInt32(); //unknown
-                        }
-                        var longint = br.ReadUInt32(); // 0xBFF78482
-                        var currentTxNum = br.ReadUInt32();
-                    }
-                    else
-                    {
-                        throw new NotImplementedException();
-                    }
-                }
-
-                if (type == 2)
-                {
-                    for (int i = 0; i < numTextures; i++)
-                    {
-                        var sizeX = br.ReadUInt32();
-                        var sizeY = br.ReadUInt32();
-                        var transparent = br.ReadUInt32(); //1 = color 0 is transparent, else 0
-                        br.ReadUInt32(); // pad1
-                        br.ReadUInt32(); // pad2
-                        var numMipMaps = br.ReadUInt32();
-
-                        Textures[i] = new Texture2D((int)sizeX, (int)sizeY, TextureFormat.ARGB32, true);
-
-                        for (int j = 0; j < numMipMaps; j++)
-                        {
-                            var data = br.ReadBytes((int)(sizeX * sizeY));
-                            if (j == 0)
-                                Textures[i].SetPixels32(data.Select(x => (x == 0 && transparent == 1) ? transparentColor : cmp.GetColor(x)).ToArray());
-                            sizeX /= 2;
-                            sizeY /= 2;
-                            if (sizeX == 0 || sizeY == 0)
-                                break;
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    public class CMP
-    {
-        public Color32[] Palette { get; set; }
-        public byte[] LightLevels { get; set; }
-        public byte[] Transparency { get; set; }
-
-        public void ParseCMP(Stream dataStream)
-        {
-            using (var br = new BinaryReader(dataStream))
-            {
-                var cmpHdr = br.ReadChars(4);
-                var version = br.ReadInt32();
-                var transp = br.ReadInt32();
-                br.ReadBytes(52);
-                Palette = new Color32[256];
-                for (int i = 0; i < 256; i++)
-                {
-                    Palette[i] = new Color32(br.ReadByte(), br.ReadByte(), br.ReadByte(), 255);
-                }
-                LightLevels = br.ReadBytes(256);
-                if (transp != 0)
-                    Transparency = br.ReadBytes(256);
-            }
-        }
-
-        public Color32 GetColor(byte val)
-        {
-            var col = Palette[val];
-            col.a = Transparency[val];
-            return col;
-        }
-    }
-}
diff --git a/Assets/Scripts/MATParser.cs.meta b/Assets/Scripts/MATParser.cs.meta
deleted file mode 100644
index aa1dd9e..0000000
--- a/Assets/Scripts/MATParser.cs.meta
+++ /dev/null
@@ -1,12 +0,0 @@
-fileFormatVersion: 2
-guid: b7ce6d871786c764d83f2c5d6b19c9a1
-timeCreated: 1451700138
-licenseType: Free
-MonoImporter:
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/Scripts/MovePlayer.cs b/Assets/Scripts/MovePlayer.cs
deleted file mode 100644
index 5b2db7e..0000000
--- a/Assets/Scripts/MovePlayer.cs
+++ /dev/null
@@ -1,52 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-
-[RequireComponent(typeof(MoveSlideCapsule))]
-public class MovePlayer : MonoBehaviour {
-
-    public float Friction = 0.1f;
-    public float Acceleration = 5;
-    public float MaxVelocity = 5;
-    public float JumpVelocity = 5;
-
-    private MoveSlideCapsule _moveSlide;
-
-
-    // Use this for initialization
-	void Start ()
-	{
-	    _moveSlide = GetComponent<MoveSlideCapsule>();
-	}
-	
-	// Update is called once per frame
-	void Update ()
-	{
-	    if (_moveSlide.IsGrounded)
-	    {
-	        var horizontal = Input.GetAxis("Horizontal");
-	        var vertical = Input.GetAxis("Vertical");
-
-	        if (horizontal == 0 && vertical == 0)
-	        {
-	            _moveSlide.Velocity *= Mathf.Pow(Friction, Time.deltaTime);
-	        }
-	        else
-	        {
-	            var acceleration = horizontal * Vector3.right * Acceleration + vertical * Vector3.forward * Acceleration;
-	            var newVelocity = _moveSlide.Velocity + acceleration * Time.deltaTime;
-
-	            var realVelY = newVelocity.y;
-	            newVelocity.y = 0;
-	            newVelocity = Vector3.ClampMagnitude(newVelocity, MaxVelocity);
-	            newVelocity.y = realVelY;
-	            _moveSlide.Velocity = newVelocity;
-	        }
-
-	        if (Input.GetButton("Jump"))
-	        {
-	            _moveSlide.Velocity += Vector3.up * JumpVelocity;
-	        }
-	    }
-	}
-}
diff --git a/Assets/Scripts/Sith.cs b/Assets/Scripts/Sith.cs
deleted file mode 100644
index 8dfbf2a..0000000
--- a/Assets/Scripts/Sith.cs
+++ /dev/null
@@ -1,343 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.IO;
-using System.Linq;
-using Assets.Scripts;
-using jksharp.jklviewer.JKL;
-using UnityEngine;
-using Material = UnityEngine.Material;
-
-public class Sith : MonoBehaviour
-{
-    public Texture2D Atlas;
-    public Material StandardMaterial;
-
-    public string JKLToLoad;
-    public string GamePath;
-    private GOBManager _gobManager;
-
-
-    private class TexInfo
-    {
-        public Rect[] Rects;
-        public Vector2[] Sizes;
-    }
-
-    private class ThreedoLoadResult
-    {
-        public _3DO Threedo { get; set; }
-        public GameObject GameObject { get; set; }
-    }
-
-    private CMP _cmp;
-    private readonly Dictionary<string, TexInfo> _materialLookup = new Dictionary<string, TexInfo>();
-    private readonly Dictionary<string, ThreedoLoadResult> _3DOCache = new Dictionary<string, ThreedoLoadResult>();
-
-    private void LoadTextures(IEnumerable<string> matFilenames)
-    {
-        var textures = new Dictionary<string, Texture2D[]>();
-
-        foreach (var matFilename in matFilenames)
-        {
-            if (textures.ContainsKey(matFilename.ToLower()))
-            {
-                Debug.LogWarning("Texture " + matFilename + " defined twice.");
-                continue;
-            }
-            var mat = new MAT();
-            var matPath = @"3do\mat\" + matFilename;
-            if (!_gobManager.Exists(matPath))
-                matPath = @"mat\" + matFilename;
-
-            mat.ParseMat(_cmp, _gobManager.GetStream(matPath));
-            textures.Add(matFilename.ToLower(), new[] { mat.Textures[0] });
-        }
-
-        var rects = Atlas.PackTextures(textures.Values.SelectMany(x => x).ToArray(), 0);
-
-        var rectsOffset = 0;
-        foreach (var matFilename in textures.Keys)
-        {
-            var numTextures = textures[matFilename].Length;
-            var subrects = new Rect[numTextures];
-
-            Array.Copy(rects, rectsOffset, subrects, 0, subrects.Length);
-
-            var sizes = new List<Vector2>();
-            foreach (var texture2D in textures[matFilename])
-            {
-                sizes.Add(new Vector2(texture2D.width, texture2D.height));
-            }
-
-            _materialLookup[matFilename] = new TexInfo
-            {
-                Rects = subrects,
-                Sizes = sizes.ToArray()
-            };
-
-            rectsOffset += numTextures;
-        }
-    }
-
-    // Use this for initialization
-    void Start()
-    {
-        CultureInfo.CurrentCulture = CultureInfo.GetCultureInfo("en-us");
-
-        _gobManager = new GOBManager(GamePath, new[] { Path.Combine(GamePath, "Resource\\Res1hi.gob"), Path.Combine(GamePath, "Resource\\Res2.gob"), Path.Combine(GamePath, "Episode\\JK1.GOB") });
-
-        _cmp = new CMP();
-        Atlas = new Texture2D(256, 256, TextureFormat.ARGB32, true);
-        StandardMaterial.mainTexture = Atlas;
-
-        if (!string.IsNullOrEmpty(JKLToLoad))
-        {
-            var jkl = new JKL();
-            var jklParser = new JKLParser(jkl, _gobManager.GetStream(@"jkl\" + JKLToLoad)); //new FileStream(@"Extracted\jkl\" + JKLToLoad, FileMode.Open));
-            jklParser.Parse();
-
-            _cmp.ParseCMP(_gobManager.GetStream(@"misc\cmp\" + jkl.WorldColorMaps[0]));
-            LoadTextures(jkl.Materials.Take(jkl.ActualNumberOfMaterials).Select(m => m.Name).ToArray());
-            BuildMapSectors(jkl);
-
-            foreach (var thing in jkl.Things)
-            {
-                if (thing.Template.Parameters.ContainsKey("model3d"))
-                {
-                    var modelFilename = thing.Template.Parameters["model3d"];
-
-                    _3DO threedo;
-                    GameObject thingGameObject;
-                    if (_3DOCache.ContainsKey(modelFilename))
-                    {
-                        var threedoLoadResult = _3DOCache[modelFilename];
-                        threedo = threedoLoadResult.Threedo;
-                        thingGameObject = Instantiate(threedoLoadResult.GameObject);
-                    }
-                    else
-                    {
-                        var threedoLoadResult = Load3DO(modelFilename);
-                        threedo = threedoLoadResult.Threedo;
-                        thingGameObject = threedoLoadResult.GameObject;
-                    }
-
-                    thingGameObject.transform.position = new Vector3(thing.X * 10, thing.Z * 10, thing.Y * 10);
-                    thingGameObject.transform.rotation = Quaternion.Euler(thing.Pitch, thing.Yaw, thing.Roll);
-
-                    if (thing.Template.Parameters.ContainsKey("puppet"))
-                    {
-                        var puppetFilename = thing.Template.Parameters["puppet"];
-                        var puppet = PUPPETParser.Parse(_gobManager.GetStream(@"misc\pup\" + puppetFilename));
-                        var kp = new KEYParser();
-
-                        if (puppet.Modes.ContainsKey(0) && puppet.Modes[0].ContainsKey("stand"))
-                        {
-                            var keyFilename = puppet.Modes[0]["stand"].KeyFile;
-                            var animClip = kp.Parse(threedo, thingGameObject.transform, keyFilename,
-                                _gobManager.GetStream(@"3do\key\" + keyFilename));
-
-                            var anim = thingGameObject.GetComponent<Animation>();
-                            if (anim == null)
-                            {
-                                anim = thingGameObject.AddComponent<Animation>();
-                                anim.AddClip(animClip, animClip.name);
-                            }
-                            anim.Play(animClip.name);
-                        }
-                    }
-                }
-
-
-            }
-        }
-    }
-
-    private void BuildMapSectors(JKL jkl)
-    {
-        for (var sectorIdx = 0; sectorIdx < jkl.Sectors.Length; sectorIdx++)
-        {
-            var sector = jkl.Sectors[sectorIdx];
-            var go = new GameObject("Sector " + sectorIdx);
-            go.transform.SetParent(transform, false);
-
-            var meshFilter = go.AddComponent<MeshFilter>();
-            var meshRenderer = go.AddComponent<MeshRenderer>();
-            meshRenderer.sharedMaterial = StandardMaterial;
-
-            var mesh = new Mesh();
-
-            var vertices = new List<Vector3>();
-            var triangles = new List<int>();
-            var normals = new List<Vector3>();
-            var uvs = new List<Vector2>();
-            var atlasPosSize = new List<Vector4>();
-            var intensities = new List<Color>();
-
-            for (int i = 0; i < sector.SurfaceCount; i++)
-            {
-                var surfaceIdx = sector.SurfaceStartIdx + i;
-
-                var surface = jkl.WorldSurfaces[surfaceIdx];
-                if (surface.Adjoin != null)
-                    continue;
-
-                var viStart = vertices.Count;
-                for (var s = 0; s < surface.SurfaceVertexGroups.Length; s++)
-                {
-                    SurfaceVertexGroup t = surface.SurfaceVertexGroups[s];
-                    var vertIndex = t.VertexIdx;
-                    var vert = new Vector3(jkl.WorldVertices[vertIndex].x, jkl.WorldVertices[vertIndex].z,
-                        jkl.WorldVertices[vertIndex].y);
-                    vertices.Add(vert);
-                    normals.Add(new Vector3(surface.SurfaceNormal.x, surface.SurfaceNormal.z, surface.SurfaceNormal.y));
-
-                    var intensity = Mathf.Clamp01(surface.Intensities[s]);
-                    intensities.Add(new Color(intensity, intensity, intensity));
-
-                    var uv = t.TextureVertex;
-                    if (uv.HasValue)
-                    {
-                        var material = _materialLookup[surface.Material.Name.ToLower()];
-
-                        var uv2 = uv.Value;
-                        atlasPosSize.Add(new Vector4(material.Rects[0].x, material.Rects[0].y, material.Rects[0].width,
-                            material.Rects[0].height));
-
-                        uv2.x = uv2.x / material.Sizes[0].x;
-                        uv2.y = uv2.y / material.Sizes[0].y;
-
-                        uvs.Add(uv2);
-                    }
-                    else
-                    {
-                        uvs.Add(Vector2.zero);
-                        atlasPosSize.Add(new Vector4(0, 0, 0, 0));
-                    }
-                }
-
-                var numTriangles = surface.SurfaceVertexGroups.Length - 3 + 1;
-                for (var t = 1; t <= numTriangles; t++)
-                {
-                    triangles.Add(viStart + t);
-                    triangles.Add(viStart);
-                    triangles.Add(viStart + t + 1);
-                }
-            }
-
-            mesh.SetVertices(vertices);
-            mesh.SetUVs(0, uvs);
-            mesh.SetUVs(1, atlasPosSize);
-            mesh.SetColors(intensities);
-            mesh.SetNormals(normals);
-            mesh.SetTriangles(triangles, 0);
-
-            meshFilter.sharedMesh = mesh;
-
-            var collider = go.AddComponent<MeshCollider>();
-            collider.cookingOptions = MeshColliderCookingOptions.WeldColocatedVertices |
-                                      MeshColliderCookingOptions.EnableMeshCleaning |
-                                      MeshColliderCookingOptions.CookForFasterSimulation;
-
-            collider.sharedMesh = mesh;
-        }
-    }
-
-    private ThreedoLoadResult Load3DO(string filename)
-    {
-        var threedo = new _3DO();
-        threedo.Load3DO(filename, _gobManager.GetStream(@"3do\" + filename));
-
-        var geoset = threedo.Geosets.First();
-        var root = new GameObject(threedo.Name);
-        var gameObjects = new List<GameObject>();
-        foreach (var hierarchyNode in threedo.HierarchyNodes)
-        {
-            var go = new GameObject(hierarchyNode.NodeName);
-            hierarchyNode.Transform = go.transform;
-            if (hierarchyNode.Mesh != -1)
-            {
-                var tdMesh = geoset.Meshes[hierarchyNode.Mesh];
-                go.AddComponent<MeshFilter>().sharedMesh = Build3DOMesh(threedo, tdMesh, hierarchyNode);
-                go.AddComponent<MeshRenderer>().sharedMaterial = StandardMaterial;
-            }
-            gameObjects.Add(go);
-        }
-        for (int index = 0; index < threedo.HierarchyNodes.Length; index++)
-        {
-            var hierarchyNode = threedo.HierarchyNodes[index];
-            var go = gameObjects[index];
-            var parent = hierarchyNode.Parent == -1 ? root : gameObjects[hierarchyNode.Parent];
-            go.transform.position = hierarchyNode.Translation;
-            go.transform.SetParent(parent.transform, false);
-        }
-
-        root.transform.localScale = new Vector3(10, 10, 10);
-        //root.SetActive(false);
-
-        var result = new ThreedoLoadResult
-        {
-            Threedo = threedo,
-            GameObject = root
-        };
-        _3DOCache.Add(filename, result);
-        return result;
-    }
-
-    private Mesh Build3DOMesh(_3DO threedo, _3DOMesh tdMesh, HierarchyNode hierarchyNode)
-    {
-        var mesh = new Mesh();
-        var vertices = new List<Vector3>();
-        var uvs = new List<Vector2>();
-        var normals = new List<Vector3>();
-        var triangles = new List<int>();
-        var atlasPosSize = new List<Vector4>();
-
-        for (var faceIndex = 0; faceIndex < tdMesh.Faces.Length; faceIndex++)
-        {
-            var face = tdMesh.Faces[faceIndex];
-            var viStart = vertices.Count;
-
-            var matName = threedo.Materials[face.Material].ToLower();
-            if (!_materialLookup.ContainsKey(matName))
-            {
-                throw new Exception("Material " + matName + " not cached. Cannot continue.");
-            }
-            var material = _materialLookup[matName];
-            foreach (VertexGroup t in face.Vertices)
-            {
-                var vert = tdMesh.Vertices[t.VertexIndex];
-                var vert3 = new Vector3(-vert.x, vert.z, -vert.y);
-                vertices.Add(hierarchyNode.Pivot + vert3);
-                normals.Add(tdMesh.FaceNormals[faceIndex]);
-
-                var uv = tdMesh.TextureVertices[t.TextureIndex];
-                atlasPosSize.Add(new Vector4(material.Rects[0].x, material.Rects[0].y, material.Rects[0].width, material.Rects[0].height));
-
-                uv.x = uv.x / material.Sizes[0].x;
-                uv.y = uv.y / material.Sizes[0].y;
-
-                uvs.Add(uv);
-            }
-
-            var numTriangles = face.Vertices.Length - 3 + 1;
-            for (var t = 1; t <= numTriangles; t++)
-            {
-                triangles.Add(viStart + t);
-                triangles.Add(viStart);
-                triangles.Add(viStart + t + 1);
-            }
-        }
-
-        mesh.SetVertices(vertices);
-        mesh.SetUVs(0, uvs);
-        mesh.SetUVs(1, atlasPosSize);
-        mesh.SetNormals(normals);
-        mesh.SetTriangles(triangles, 0);
-
-
-        mesh.RecalculateBounds();
-        //mesh.RecalculateNormals();
-        return mesh;
-    }
-}
diff --git a/Assets/Scripts/SmackerPlayerRenderer.cs b/Assets/Scripts/SmackerPlayerRenderer.cs
deleted file mode 100644
index d899bce..0000000
--- a/Assets/Scripts/SmackerPlayerRenderer.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-using System.IO;
-using Assets.Scripts;
-using UnityEngine;
-using UnityEngine.UI;
-
-[RequireComponent(typeof(RawImage), typeof(AudioSource))]
-public class SmackerPlayerRenderer : MonoBehaviour
-{
-    public string SMKPath;
-
-    private RawImage _rawImage;
-    private SmackerPlayer _player;
-    private AudioSource _audioSource;
-
-    // Use this for initialization
-    void Start()
-    {
-        var buffer =
-            File.ReadAllBytes(SMKPath);
-
-        _player = new SmackerPlayer(buffer);
-
-        _rawImage = GetComponent<RawImage>();
-        _rawImage.texture = _player.Texture;
-
-        _audioSource = GetComponent<AudioSource>();
-        _audioSource.clip = _player.AudioClip;
-        _audioSource.Play();
-
-    }
-
-    private double _passedMs;
-
-    // Update is called once per frame
-    void Update()
-    {
-        _passedMs += Time.deltaTime * 1000;
-        if (_passedMs >= _player.MillisecondsPerFrame)
-        {
-            _passedMs = _passedMs - _player.MillisecondsPerFrame;
-            _player.RenderVideo();
-        }
-    }
-
-    void OnDestroy()
-    {
-        _player.Dispose();
-    }
-}
diff --git a/Assets/Scripts/_3DOLoader.cs.meta b/Assets/Scripts/_3DOLoader.cs.meta
deleted file mode 100644
index a7dc941..0000000
--- a/Assets/Scripts/_3DOLoader.cs.meta
+++ /dev/null
@@ -1,12 +0,0 @@
-fileFormatVersion: 2
-guid: d3f0b4348f228724483c713070a39c99
-timeCreated: 1451689215
-licenseType: Free
-MonoImporter:
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/Scripts/test.anim b/Assets/Scripts/test.anim
deleted file mode 100644
index e1bf0d2..0000000
Binary files a/Assets/Scripts/test.anim and /dev/null differ
diff --git a/Assets/Scripts/test.anim.meta b/Assets/Scripts/test.anim.meta
deleted file mode 100644
index afc6226..0000000
--- a/Assets/Scripts/test.anim.meta
+++ /dev/null
@@ -1,10 +0,0 @@
-fileFormatVersion: 2
-guid: 0a8da0394ab956f4f98a3a6af3b2c87f
-timeCreated: 1519583417
-licenseType: Free
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 7400000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/Shaders.meta b/Assets/Shaders.meta
new file mode 100644
index 0000000..a32bc41
--- /dev/null
+++ b/Assets/Shaders.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: a3d19a740d2d92d44bbc9449420a3d3b
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Shaders/BaseShader.cginc b/Assets/Shaders/BaseShader.cginc
new file mode 100644
index 0000000..23d8616
--- /dev/null
+++ b/Assets/Shaders/BaseShader.cginc
@@ -0,0 +1,129 @@
+int _Ijim;
+int _GeoMode;
+int _LightMode;
+int _ZWrite;
+sampler2D _MainTex;
+fixed4 _AmbientLight;
+fixed4 _ExtraLight;
+fixed4 _Tint;
+fixed4 _FaceExtraLight;
+
+struct Input 
+{
+    float2 uv_MainTex : TEXCOORD0;
+    float4 color : COLOR;
+    float3 normal: NORMAL;
+    float3 worldPos : POSITION; // don't change the name as using this name apparently automatically converts vertex pos to world space
+
+};
+
+struct SithSurface
+{
+    fixed3 Color; // vertex Color
+    fixed3 Albedo;
+    fixed3 Normal;
+    fixed3 Emission;
+    half Specular;
+    fixed Gloss;
+    fixed Alpha;
+};
+
+void vert(inout appdata_full v, out Input o)
+{
+    o.uv_MainTex = v.texcoord;
+    o.color      = v.color;
+    o.normal     = v.normal;
+    o.worldPos   = v.vertex;
+}
+
+fixed4 applyTint(fixed4 c)
+{
+    if (_Tint.r != 0.0 || _Tint.g != 0.0 || _Tint.b != 0.0) {
+        c.r += c.r * (_Tint.r - (0.5 * (_Tint.g + _Tint.b)));
+        c.g += c.g * (_Tint.g - (0.5 * (_Tint.r + _Tint.b)));
+        c.b += c.b * (_Tint.b - (0.5 * (_Tint.g + _Tint.r)));
+    }
+    return c;
+}
+
+fixed4 lcolor(Input i)
+{
+    fixed4 c = fixed4(1, 1, 1, 1);
+    switch (_LightMode)
+    {
+    case 0: // None
+    case 1: // Lit
+        break;
+    case 2: // Diffuse
+        if (_Ijim) {
+            c = _FaceExtraLight + _ExtraLight + _AmbientLight;
+        } else { // JKDF2 and MOTS
+            c = clamp(_FaceExtraLight, _AmbientLight + _ExtraLight, 1);
+        }
+        c = applyTint(c);
+        break;
+    case 3: //Gouraud
+        if (_Ijim) {
+            c = i.color + _FaceExtraLight + _ExtraLight + _AmbientLight;
+        } else { // JKDF2 and MOTS
+            c = clamp(i.color + _FaceExtraLight, _AmbientLight + _ExtraLight, 1);
+        }
+        c = applyTint(c);
+        break;
+    }
+    return clamp(c, 0, 1);
+}
+
+void surf(Input i, inout SithSurface o) 
+{
+    if (_GeoMode == 4) // Texture
+    {
+        fixed4 c = tex2D(_MainTex, i.uv_MainTex);
+        o.Albedo = c.rgb;
+        o.Alpha  = c.a;
+        o.Color  = i.color;
+    }
+    else if (_GeoMode == 3) // Solid
+    {
+        o.Albedo = lcolor(i).rgb;
+        o.Alpha  = 1.0;
+    }
+}
+
+void fcolor(Input i, SithSurface o, inout fixed4 color)
+{
+    if (_GeoMode == 4) { // texture
+        color *= lcolor(i);
+    }
+}
+
+fixed4 LightingBakedLight(SithSurface s, fixed3 lightDir, fixed atten) 
+{
+    return fixed4(s.Albedo, s.Alpha);
+}
+
+float2 CalculateCeilingSkyDistance(float TextureWidth, float TextureHeight, float3 Position, float3 CameraPosition, float3 Normal, float2 CeilingSkyOffset, float CeilingZ)
+{
+    // Note, multiply by 10 is done to match mesh scaling in engine
+    float3 vert = Position - CameraPosition;
+    float3 skyVert = normalize(vert);
+    
+    float3 ceiling = (0, 0, CeilingZ * 10);    
+    float3 diff = CameraPosition - ceiling;
+
+    float distanceToSphere = dot(diff, Normal);
+    float dott = -dot(skyVert, Normal);
+    
+    float sphereHitDistance = distanceToSphere / dott;
+    
+    skyVert *= sphereHitDistance;
+    skyVert += CameraPosition;
+    
+    float invWidth = 1 / (TextureWidth * 10);
+    float invHeight = 1 / (TextureHeight * 10);
+    
+    float u = invWidth *  skyVert.x * 16 + CeilingSkyOffset.x * 10;
+    float v = invHeight * skyVert.z * 16 + CeilingSkyOffset.y * 10;
+
+    return float2(u, v);
+}
\ No newline at end of file
diff --git a/Assets/Shaders/BaseShader.cginc.meta b/Assets/Shaders/BaseShader.cginc.meta
new file mode 100644
index 0000000..51ec3b1
--- /dev/null
+++ b/Assets/Shaders/BaseShader.cginc.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 8e4689fcae086d740be6e0f2e72a922c
+ShaderIncludeImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Shaders/SithCeilingSky.shader b/Assets/Shaders/SithCeilingSky.shader
new file mode 100644
index 0000000..1de9083
--- /dev/null
+++ b/Assets/Shaders/SithCeilingSky.shader
@@ -0,0 +1,46 @@
+// Upgrade NOTE: replaced '_Object2World' with 'unity_ObjectToWorld'
+
+Shader "Sith/CeilingSky"
+{
+    Properties
+    {
+        _MainTex ("Texture", 2D) = "white" {}
+        _CeilingSkyOffset ("Ceiling Sky Offset", Vector) = (0, 0, 0)
+        _SkyHeight ("Sky Height", Float) = 0
+
+        [Toggle(JKDF2_LIGHT_MODE)] _Ijim("JKDF2", Int) = 1
+        [Enum(UnityEngine.Rendering.CullMode)] _Culling("Cull Mode", Int) = 2
+        [Enum(NotDrawn,0,Vertex,1,Wireframe,2,Solid,3,Texture,4)] _GeoMode("Geometry Mode", Int) = 4
+        [Enum(None,0,Lit,1,Diffuse,2,Gouraud,3)] _LightMode("Light Mode", Int) = 3
+
+        [HideInInspector][Toggle(ZWRITE_ENABLED)] _ZWrite("", Int) = 1
+    }
+
+    CGINCLUDE
+        #include "BaseShader.cginc"
+    ENDCG
+
+    SubShader
+    {
+        Tags { "RenderType"="Opaque" }
+        
+        CGPROGRAM
+        //#pragma surface surf Lambert
+        #pragma surface skysurf BakedLight vertex:vert finalcolor:fcolor nolightmap noambient
+
+        float4 _CeilingSkyOffset;
+        float _SkyHeight;
+        half4 _MainTex_TexelSize;
+
+        void skysurf (Input i, inout SithSurface o)
+        {
+            float3 skyNormal = float3(0.0, -1.0, 0.0); // Downward direction
+            float2 newuv = CalculateCeilingSkyDistance(_MainTex_TexelSize.z, _MainTex_TexelSize.w, i.worldPos, _WorldSpaceCameraPos, skyNormal, _CeilingSkyOffset, _SkyHeight);
+
+            // Sample the main texture
+            o.Albedo = tex2D(_MainTex, newuv).rgb;
+        }
+        ENDCG
+    }
+    FallBack "Diffuse"
+}
\ No newline at end of file
diff --git a/Assets/RepeatingAtlas.shader.meta b/Assets/Shaders/SithCeilingSky.shader.meta
similarity index 62%
rename from Assets/RepeatingAtlas.shader.meta
rename to Assets/Shaders/SithCeilingSky.shader.meta
index a605e5c..0ecd4d8 100644
--- a/Assets/RepeatingAtlas.shader.meta
+++ b/Assets/Shaders/SithCeilingSky.shader.meta
@@ -1,10 +1,9 @@
 fileFormatVersion: 2
-guid: afa267e4288082c4fb13135661cd80c8
-timeCreated: 1519683281
-licenseType: Free
+guid: 3f245b7dcbdc48047a2a02cff804099b
 ShaderImporter:
   externalObjects: {}
   defaultTextures: []
+  nonModifiableTextures: []
   userData: 
   assetBundleName: 
   assetBundleVariant: 
diff --git a/Assets/Shaders/SithTexture.shader b/Assets/Shaders/SithTexture.shader
new file mode 100644
index 0000000..caa9fec
--- /dev/null
+++ b/Assets/Shaders/SithTexture.shader
@@ -0,0 +1,47 @@
+//Shader "Sith/TextureBak"
+Shader "Sith/Texture"
+{
+    Properties
+    {
+        [Toggle(JKDF2_LIGHT_MODE)] _Ijim("JKDF2", Int) = 1
+        [Enum(UnityEngine.Rendering.CullMode)] _Culling("Cull Mode", Int) = 2
+        [Enum(NotDrawn,0,Vertex,1,Wireframe,2,Solid,3,Texture,4)] _GeoMode("Geometry Mode", Int) = 4
+        [Enum(None,0,Lit,1,Diffuse,2,Gouraud,3)] _LightMode("Light Mode", Int) = 3
+
+        [HideInInspector][Toggle(ZWRITE_ENABLED)] _ZWrite("", Int) = 1
+
+        _MainTex("Albedo (RGB)", 2D) = "white" {}
+        _AmbientLight("Sector Ambient Light", Color) = (0,0,0,1)
+        _ExtraLight("Sector Extra Light", Color) = (0,0,0,1)
+        _Tint("Sector Tint", Color) = (0,0,0,1)
+        _FaceExtraLight("Face Extra Light", Color) = (0,0,0,1)
+    }
+
+    CGINCLUDE
+        #include "BaseShader.cginc"
+    ENDCG
+
+    SubShader{
+        Tags {"Queue" = "Geometry" "RenderType"="Opaque" "IgnoreProjector"="True" "PreviewType"="Plane" }
+        LOD 200
+        Cull[_Culling]
+        ZWrite[_ZWrite]
+        ZTest LEqual
+
+        CGPROGRAM
+
+        #pragma surface surf BakedLight vertex:vert finalcolor:fcolor nolightmap noambient
+        #pragma target 3.0
+
+        // Add instancing support for this shader. You need to check 'Enable Instancing' on materials that use the shader.
+        // See https://docs.unity3d.com/Manual/GPUInstancing.html for more information about instancing.
+        // #pragma instancing_options assumeuniformscaling
+        UNITY_INSTANCING_BUFFER_START(Props)
+            // put more per-instance properties here
+        UNITY_INSTANCING_BUFFER_END(Props)
+
+        ENDCG
+    }
+
+    FallBack "Diffuse"
+}
diff --git a/Assets/RepeatingAtlasStandard.shader.meta b/Assets/Shaders/SithTexture.shader.meta
similarity index 59%
rename from Assets/RepeatingAtlasStandard.shader.meta
rename to Assets/Shaders/SithTexture.shader.meta
index 721bc75..42c3d18 100644
--- a/Assets/RepeatingAtlasStandard.shader.meta
+++ b/Assets/Shaders/SithTexture.shader.meta
@@ -1,10 +1,10 @@
 fileFormatVersion: 2
-guid: ad555720d0af33c41a1f8bdd0a060388
-timeCreated: 1519683778
-licenseType: Free
+guid: d840d614848431048a9462370eeef5e0
 ShaderImporter:
   externalObjects: {}
   defaultTextures: []
+  nonModifiableTextures: []
+  preprocessorOverride: 0
   userData: 
   assetBundleName: 
   assetBundleVariant: 
diff --git a/Assets/Shaders/SithTransparent.shader b/Assets/Shaders/SithTransparent.shader
new file mode 100644
index 0000000..90d6380
--- /dev/null
+++ b/Assets/Shaders/SithTransparent.shader
@@ -0,0 +1,64 @@
+Shader "Sith/Transparent"
+{
+    Properties
+    {
+        [Toggle(JKDF2_LIGHT_MODE)] _Ijim("IJIM", Int) = 1
+        [Enum(UnityEngine.Rendering.CullMode)] _Culling("Cull Mode", Int) = 2
+        [Enum(NotDrawn,0,Vertex,1,Wireframe,2,Solid,3,Texture,4)] _GeoMode("Geometry Mode", Int) = 4
+        [Enum(None,0,Lit,1,Diffuse,2,Gouraud,3)] _LightMode("Light Mode", Int) = 3
+        _Alpha("Alpha", Range(0.0, 1.0)) = 1.0
+
+        [Toggle(ZWRITE_ENABLED)] _ZWrite("ZWrite", Int) = 1
+
+        _MainTex("Albedo (RGB)", 2D) = "white" {}
+        _AmbientLight("Sector Ambient Light", Color) = (0,0,0,1)
+        _ExtraLight("Sector Extra Light", Color) = (0,0,0,1)
+        _Tint("Sector Tint", Color) = (0,0,0,1)
+        _FaceExtraLight("Extra Light", Color) = (0,0,0,1)
+    }
+
+    CGINCLUDE
+        #include "BaseShader.cginc"
+        float _Alpha;
+
+        void fAlphaColor(Input i, SithSurface o, inout fixed4 color)
+        {
+            fcolor(i, o, color);
+            if (_GeoMode == 4) // texture
+            {
+                color.a *= _Alpha;
+                clamp(color, 0, 1);
+            }
+        }
+    ENDCG
+
+    SubShader{
+        Tags {"Queue" = "Transparent" "RenderType"="Transparent" "IgnoreProjector"="True" "PreviewType"="Plane" "PerformanceChecks" = "False" }
+        LOD 300
+        Cull[_Culling]
+        ZWrite Off
+
+         Pass {
+            ZWrite[_ZWrite]
+            ZTest LEqual
+            ColorMask 0    // but won't write color to frame buffer
+            //Offset 1,1
+        }
+
+        CGPROGRAM
+
+        #pragma surface surf BakedLight vertex:vert alpha:blend finalcolor:fAlphaColor nolightmap noambient
+        #pragma target 3.0
+
+        // Add instancing support for this shader. You need to check 'Enable Instancing' on materials that use the shader.
+        // See https://docs.unity3d.com/Manual/GPUInstancing.html for more information about instancing.
+        // #pragma instancing_options assumeuniformscaling
+        UNITY_INSTANCING_BUFFER_START(Props)
+            // put more per-instance properties here
+        UNITY_INSTANCING_BUFFER_END(Props)
+
+        ENDCG
+    }
+
+    FallBack "Diffuse"
+}
diff --git a/Assets/Shaders/SithTransparent.shader.meta b/Assets/Shaders/SithTransparent.shader.meta
new file mode 100644
index 0000000..d5c6530
--- /dev/null
+++ b/Assets/Shaders/SithTransparent.shader.meta
@@ -0,0 +1,10 @@
+fileFormatVersion: 2
+guid: fad51d93e90f0824c9d5575f171eb79d
+ShaderImporter:
+  externalObjects: {}
+  defaultTextures: []
+  nonModifiableTextures: []
+  preprocessorOverride: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Sith.meta b/Assets/Sith.meta
new file mode 100644
index 0000000..98464ff
--- /dev/null
+++ b/Assets/Sith.meta
@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: 48ba9f34816345e4db98f273a8b4784a
+folderAsset: yes
+timeCreated: 1451685552
+licenseType: Free
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Sith/Content.meta b/Assets/Sith/Content.meta
new file mode 100644
index 0000000..fd1ca15
--- /dev/null
+++ b/Assets/Sith/Content.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: a18771276e3f21c459f9d7e493299155
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Sith/Content/AssetStore.cs b/Assets/Sith/Content/AssetStore.cs
new file mode 100644
index 0000000..25a4d25
--- /dev/null
+++ b/Assets/Sith/Content/AssetStore.cs
@@ -0,0 +1,167 @@
+using Assets.Sith.Content.JKL;
+using Assets.Sith.Utility;
+using Assets.Sith.Vfs;
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using UnityEngine;
+using Material = UnityEngine.Material;
+
+namespace Assets.Sith.Content
+{
+    public class AssetStore : VirtualFileSystem
+    {
+        public LightMode DefaultLightMode = LightMode.Gouraud;
+
+        public AssetStore() 
+        {
+            CultureInfo.CurrentCulture = CultureInfo.InvariantCulture;//CultureInfo.GetCultureInfo("en-us");
+        }
+
+        public T Load<T>(string filename) where T: ISithAsset
+        {
+            filename = filename.ToLower();
+            if (typeof(T) == typeof(SPR))
+                return (T)(object)LoadSprite(filename);
+            else if (typeof(T) == typeof(Model3DO))
+                return (T)(object)LoadModel3DO(filename);
+            else if (typeof(T) == typeof(Puppet))
+                return (T)(object)LoadPuppet(filename);
+            else if (typeof(T) == typeof(CMP))
+                return (T)(object)LoadCMP(filename);
+            throw new Exception("Unsupported Asset");
+        }
+
+        public Material Load(string filename, LightMode lightMode, FaceFlag flags, CMP cmp)
+        {
+            return Load(filename, lightMode, flags, cmp, false);
+        }
+
+        public Material Load(string filename, LightMode lightMode, FaceFlag flags, CMP cmp, bool transparentShader)
+        {
+            filename = filename.ToLower();
+            //if (_materialCache.ContainsKey(filename)
+            // && _materialCache[filename].ContainsKey(lightMode))
+            //{
+            //    return _materialCache[filename][lightMode];
+            //}
+
+            var mat = new MAT();
+            if (_matCache.ContainsKey(filename))
+            {
+                mat = _matCache[filename];
+            }
+            else
+            {
+                var matPath = @"mat\" + filename;
+                if (!Exists(matPath))
+                {
+                    matPath = @"3do\mat\" + filename;
+                }
+
+                mat.Load(filename, GetStream(matPath), cmp);
+                _matCache.Add(filename, mat);
+            }
+
+            bool hasAlpha = /*(mat.colorMode == ColorMode.RGBA) && */(flags & FaceFlag.Textranslucent) != 0;
+            var m = new Material(GetShader(lightMode, transparentShader))
+            {
+                name = filename
+            };
+
+            if (mat.Textures.Length > 0) {
+                m.mainTexture = mat.Textures[0];
+            }
+
+            if (mat.ColorMode == ColorMode.RGBA || (flags & FaceFlag.Textranslucent) != 0)
+            {
+                m.renderQueue += 1000;
+            }
+
+            //if ((flags & FaceFlag.Textranslucent) != 0)
+            //{
+            //    m.renderQueue += 200;
+            //}
+            //m.EnableZWrite((mat.ColorMode != ColorMode.RGBA) || (flags & (FaceFlag.Textranslucent | FaceFlag.ZWriteOff)) != 0);
+            m.EnableZWrite((flags & (FaceFlag.Textranslucent | FaceFlag.ZWriteOff)) == 0);
+            //m.SetInt("_ZWrite", (mat.ColorMode != ColorMode.RGBA) || !hasAlpha ? 1 : 0);
+
+            //if (!_materialCache.ContainsKey(filename))
+            //{
+            //    _materialCache.Add(filename, new Dictionary<LightMode, UnityEngine.Material>());
+            //}
+
+            //_materialCache[filename].Add(lightMode, m);
+            return m;
+        }
+
+        private Shader GetShader(LightMode lm, bool hasAlpha)
+        {
+            switch (lm)
+            {
+                case LightMode.Unlit:
+                    //return hasAlpha ? Shader.Find("Unlit/Transparent") : Shader.Find("Unlit/Texture");
+                case LightMode.Lit:
+                case LightMode.Diffuse:
+                case LightMode.Gouraud:
+                    return hasAlpha ? Shader.Find("Sith/Transparent") : Shader.Find("Sith/Texture");
+            }
+            Debug.LogWarning($"GetShader: Unknown light mode \"{lm}\", using global light mode!");
+            return GetShader(DefaultLightMode, hasAlpha);
+        }
+
+        private CMP LoadCMP(string filename)
+        {
+            if (_cmpCache.ContainsKey(filename))
+                return _cmpCache[filename];
+
+            CMP cmp = new CMP();
+            cmp.Load(filename, GetStream(@"misc\cmp\" + filename));
+            _cmpCache[filename] = cmp;
+            return cmp;
+        }
+        private SPR LoadSprite(string filename)
+        {
+            filename = filename.ToLower();
+            var spr = new Assets.Sith.Content.SPR();
+            if (_sprCache.ContainsKey(filename))
+            {
+                spr = _sprCache[filename];
+            }
+            else
+            {
+                spr.Load(filename, GetStream($"misc\\spr\\{filename}"));
+                _sprCache.Add(filename, spr);
+            }
+            return spr;
+        }
+
+        private Model3DO LoadModel3DO(string filename)
+        {
+            if (_modelCache.ContainsKey(filename))
+               return _modelCache[filename];
+
+            var model = new Model3DO();
+            model.Load(filename, GetStream(@"3do\" + filename));
+            _modelCache[filename] = model;
+            return model;
+        }
+
+        private Puppet LoadPuppet(string filename)
+        {
+            if (_puppetCache.ContainsKey(filename))
+                return _puppetCache[filename];
+
+            var puppet = PUPPETParser.Parse(filename, GetStream(@"misc\pup\" + filename));
+            _puppetCache.Add(filename, puppet);
+            return puppet;
+        }
+
+        private static readonly Dictionary<string, Dictionary<LightMode, Material>> _materialCache = new Dictionary<string, Dictionary<LightMode, Material>>();
+        private static readonly Dictionary<string, CMP> _cmpCache = new Dictionary<string, CMP>();
+        private static readonly Dictionary<string, MAT> _matCache = new Dictionary<string, MAT>();
+        private static readonly Dictionary<string, SPR> _sprCache = new Dictionary<string, SPR>();
+        private static readonly Dictionary<string, Model3DO> _modelCache = new Dictionary<string, Model3DO>();
+        private static readonly Dictionary<string, Puppet> _puppetCache = new Dictionary<string, Puppet>();
+    }
+}
diff --git a/Assets/Sith/Content/AssetStore.cs.meta b/Assets/Sith/Content/AssetStore.cs.meta
new file mode 100644
index 0000000..3cf5d3e
--- /dev/null
+++ b/Assets/Sith/Content/AssetStore.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: de41ff51f2ff4dd48b9188614337a7e1
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Sith/Content/ISithAsset.cs b/Assets/Sith/Content/ISithAsset.cs
new file mode 100644
index 0000000..3ced467
--- /dev/null
+++ b/Assets/Sith/Content/ISithAsset.cs
@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Assets.Sith.Content
+{
+    public interface ISithAsset
+    {
+        public string Name { get; set; }
+    }
+}
diff --git a/Assets/Sith/Content/ISithAsset.cs.meta b/Assets/Sith/Content/ISithAsset.cs.meta
new file mode 100644
index 0000000..1a7a3ad
--- /dev/null
+++ b/Assets/Sith/Content/ISithAsset.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: ca94788204b5cba4fb8aeed216f32c49
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Scripts/JKL.meta b/Assets/Sith/Content/JKL.meta
similarity index 100%
rename from Assets/Scripts/JKL.meta
rename to Assets/Sith/Content/JKL.meta
diff --git a/Assets/Scripts/JKL/JKL.cs b/Assets/Sith/Content/JKL/JKL.cs
similarity index 61%
rename from Assets/Scripts/JKL/JKL.cs
rename to Assets/Sith/Content/JKL/JKL.cs
index 253658e..3ddf86c 100644
--- a/Assets/Scripts/JKL/JKL.cs
+++ b/Assets/Sith/Content/JKL/JKL.cs
@@ -1,10 +1,33 @@
 using System.Collections.Generic;
 using UnityEngine;
 
-namespace jksharp.jklviewer.JKL
+namespace Assets.Sith.Content.JKL
 {
+    class Fog
+    {
+        public bool Enabled { get; set; }
+        public Color Color { get; set; }
+        public float Start { get; set; }
+        public float End { get; set; }
+    }
+
+    public class Material
+    {
+        public string Name { get; set; }
+        public float XTile { get; set; }
+        public float YTile { get; set; }
+
+        public override string ToString()
+        {
+            return Name;
+        }
+    }
+
     class JKL
     {
+        public WorldType type;
+
+        public Fog Fog { get; set; }
         public float GouraudDistance { get; set; }
         public float PerspectiveDistance { get; set; }
         public Vector4 LODDistances { get; set; }
@@ -22,11 +45,11 @@ class JKL
         public Vector3[] WorldVertices { get; set; }
         public Vector2[] WorldTextureVertices { get; set; }
         public Adjoin[] WorldAdjoins { get; set; }
-        public WorldSurface[] WorldSurfaces { get; set; }
+        public Surface[] WorldSurfaces { get; set; }
         public Sector[] Sectors { get; set; }
         public int ActualNumberOfMaterials { get; set; }
         public List<string> Models { get; set; }
-        public Dictionary<string, JKLTemplate> Templates { get; set; }
-        public List<JKLThing> Things { get; set; }
+        public Dictionary<string, Thing> Templates { get; set; }
+        public List<Thing> Things { get; set; }
     }
 }
\ No newline at end of file
diff --git a/Assets/Scripts/JKL/JKL.cs.meta b/Assets/Sith/Content/JKL/JKL.cs.meta
similarity index 100%
rename from Assets/Scripts/JKL/JKL.cs.meta
rename to Assets/Sith/Content/JKL/JKL.cs.meta
diff --git a/Assets/Sith/Content/JKL/JKLParser.cs b/Assets/Sith/Content/JKL/JKLParser.cs
new file mode 100644
index 0000000..41ca78e
--- /dev/null
+++ b/Assets/Sith/Content/JKL/JKLParser.cs
@@ -0,0 +1,925 @@
+using Assets.Sith.Utility;
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.IO;
+using UnityEngine;
+
+#nullable enable 
+
+namespace Assets.Sith.Content.JKL
+{
+    class JKLParser
+    {
+        private readonly JKL _jkl;
+        private string _line;
+        private List<string> _args;
+        private StreamReader _streamReader;
+
+        private static readonly Dictionary<int, Material> ndyStaticMats = new()
+        {
+            [32969] = new Material { Name = "kit_ptch_sde.mat", XTile = 1, YTile = 1 },
+            [32970] = new Material { Name = "kit_ptch_top.mat", XTile = 1, YTile = 1 },
+            [33092] = new Material { Name = "dflt.mat", XTile = 1, YTile = 1 }, // 33092-> (8144 & ~8000) 324: dflt.mat in jones3dstatic.ndy
+            [33105] = new Material { Name = "vol_wall_logs_weathered.mat", XTile = 1, YTile = 1 }
+        };
+
+        private bool Match(string match)
+        {
+            if (_line.StartsWith(match, StringComparison.InvariantCultureIgnoreCase))
+            {
+                _line = _line.Remove(0, match.Length).Trim();
+                _args = new List<string>();
+                var buffer = "";
+                foreach (var c in _line)
+                {
+                    if (c == ' ' || c == '\t')
+                    {
+                        if (buffer.Length != 0)
+                            _args.Add(buffer);
+                        buffer = "";
+                        continue;
+                    }
+                    buffer += c;
+                }
+                _args.Add(buffer);
+                return true;
+            }
+            return false;
+        }
+
+        private void ReadLine()
+        {
+            do
+            {
+                _line = _streamReader.ReadLine()?.Trim() ?? null;
+            } while (_line != null && (_line.StartsWith("#") || _line.StartsWith("//") || _line.Length == 0));
+            if (_line != null)
+                _args = new List<string>(_line.Split(new[] {' ', '\t'}, StringSplitOptions.RemoveEmptyEntries));
+        }
+
+        public JKLParser(JKL jkl, Stream jklStream)
+        {
+            _jkl = jkl;
+            _streamReader = new StreamReader(jklStream);
+        }
+
+        public void Parse()
+        {
+            ReadLine();
+            while (!_streamReader.EndOfStream)
+            {
+                switch (_line.ToUpper())
+                {
+                    case "SECTION: JK":
+                    case "SECTION: COPYRIGHT":
+                        do
+                        {
+                            ReadLine();
+                        } while (!_line.StartsWith("SECTION: "));
+                        break;
+                    case "SECTION: HEADER":
+                        ParseHeader();
+                        break;
+                    case "SECTION: SOUNDS":
+                        ParseSounds();
+                        break;
+                    case "SECTION: MATERIALS":
+                        ParseMaterials();
+                        break;
+                    case "SECTION: GEORESOURCE":
+                        ParseGeoResource();
+                        break;
+                    case "SECTION: SECTORS":
+                        ParseSectors();
+                        //_streamReader.Dispose();
+                        //return;
+                        break;
+                    case "SECTION: MODELS":
+                        ParseModels();
+                        break;
+                    case "SECTION: TEMPLATES":
+                        ParseTemplates();
+                        break;
+                    case "SECTION: THINGS":
+                        ParseThings();
+                        break;
+                    default:
+                        ReadLine();
+                        break;
+                }
+            }
+        }
+
+        private void ParseThings()
+        {
+            ReadLine();
+            if (Match("World things"))
+            {
+                _jkl.Things = new List<Thing>();
+                while (true)
+                {
+                    ReadLine();
+                    if (_line == "end")
+                    {
+                        break;
+                    }
+
+                    int pos = 1;
+                    var thing = Thing.CreateBasedOn(_jkl.Templates[_args[pos++].ToLower()]);
+                    thing.Name = _args[pos++];
+                    var position = new Vector3
+                    (
+                        float.Parse(_args[pos++]),
+                        float.Parse(_args[pos++]),
+                        float.Parse(_args[pos++])
+                    );
+                    thing.Position    = Utils.GetUnityCoords(position);
+                    var pitch         = float.Parse(_args[pos++]);
+                    var yaw           = float.Parse(_args[pos++]);
+                    var roll          = float.Parse(_args[pos++]);
+                    thing.Orientation = Utils.FromThingOrientation(pitch, yaw, roll);
+                    thing.SectorIdx   = int.Parse(_args[pos++]);
+                    ParseThingParameters(_args.GetRange(pos, _args.Count - pos), ref thing);
+
+                    _jkl.Things.Add(thing);
+                }
+            }
+        }
+
+        private void ParseTemplates()
+        {
+            ReadLine();
+            if (Match("World templates"))
+            {
+                _jkl.Templates = new Dictionary<string, Thing>();
+                while (true)
+                {
+                    ReadLine();
+                    if (_line == "end")
+                    {
+                        break;
+                    }
+
+                    var name = _args[0];
+                    if (_jkl.Templates.ContainsKey(name))
+                    {
+                        Debug.LogWarning($"JKLParser: template '{name}' already exists in the Templates list, skipping...");
+                        continue;
+                    }
+
+                    var basedOn = _args[1].ToLower();
+                    var numParams = _args.Count - 2;
+                    var template = Thing.CreateBasedOn(basedOn == "none" ? null : _jkl.Templates[basedOn]);
+                    ParseThingParameters(_args.GetRange(2, _args.Count - 2), ref template);
+                    _jkl.Templates.Add(name.ToLower(), template);
+                }
+            }
+        }
+
+        private void ParseThingParameters(in List<string> rawParameters, ref Thing thing)
+        {
+            foreach (string value in rawParameters)
+            {
+                var argVal = value.Split('=');
+                if (argVal.Length == 2) // MOTS has the first param archlight intens. idx and not thing param
+                {
+                    thing.Parameters[argVal[0].ToLower()] = argVal[1].ToLower();
+                }
+            }
+        }
+
+        private void ParseModels()
+        {
+            ReadLine();
+            if (Match("World models"))
+            {
+                _jkl.Models = new List<string>();
+                
+                while (true)
+                {
+                    ReadLine();
+                    if (_line == "end")
+                    {
+                        break;
+                    }
+
+                    _jkl.Models.Add(_args[_args.Count - 1]);
+                }
+            }
+        }
+
+        private void ParseSectors()
+        {
+            Sector? currentSector = null;
+            var currentSectorIdx = 0;
+            while (true)
+            {
+                ReadLine();
+                if (_line.StartsWith("SECTION: ", StringComparison.OrdinalIgnoreCase))
+                {
+                    if (currentSector != null)
+                    {
+                        _jkl.Sectors[currentSectorIdx] = currentSector;
+                    }
+                    break;
+                }
+
+                if (Match("World sectors"))
+                {
+                    var numSectors = int.Parse(_args[0]);
+                    _jkl.Sectors = new Sector[numSectors];
+                }
+                else if (Match("SECTOR"))
+                {
+                    // Store old sector, make new one
+                    if (currentSector != null)
+                    {
+                        _jkl.Sectors[currentSectorIdx] = currentSector;
+                    }
+                    currentSectorIdx = int.Parse(_args[0]);
+                    currentSector = new Sector();
+                    currentSector.num = currentSectorIdx;
+                }
+                else if (Match("FLAGS"))
+                {
+                    currentSector.Flags = (uint)ParseHex(_args[0]);
+                }
+                else if (Match("AMBIENT LIGHT"))
+                {
+                    if (_jkl.Version == 1)
+                    {
+                        var intensity = Mathf.Clamp01(float.Parse(_args[0]));
+                        currentSector.AmbientLight = new Color(intensity, intensity, intensity);
+                    }
+                    else
+                    {
+                        currentSector.AmbientLight = new Color
+                        (
+                            Mathf.Clamp01(float.Parse(_args[0])),
+                            Mathf.Clamp01(float.Parse(_args[1])),
+                            Mathf.Clamp01(float.Parse(_args[2]))
+                        );
+                    }
+                }
+                else if (Match("EXTRA LIGHT"))
+                {
+                    if (_jkl.Version == 1)
+                    {
+                        var intensity = Mathf.Clamp01(float.Parse(_args[0]));
+                        currentSector.ExtraLight = new Color(intensity, intensity, intensity);
+                    }
+                    else
+                    {
+                        currentSector.ExtraLight = new Color
+                        (
+                            Mathf.Clamp01(float.Parse(_args[0])),
+                            Mathf.Clamp01(float.Parse(_args[1])),
+                            Mathf.Clamp01(float.Parse(_args[2]))
+                        );
+                    }
+                }
+                else if (Match("TINT"))
+                {
+                    currentSector.Tint = new Color
+                    (
+                        Mathf.Clamp01(float.Parse(_args[0])),
+                        Mathf.Clamp01(float.Parse(_args[1])),
+                        Mathf.Clamp01(float.Parse(_args[2]))
+                    );
+                }
+                else if (Match("AVERAGE LIGHT INTENSITY"))
+                {
+                    currentSector.AvgLightIntensity = new Color
+                    (
+                        Mathf.Clamp01(float.Parse(_args[0])),
+                        Mathf.Clamp01(float.Parse(_args[1])),
+                        Mathf.Clamp01(float.Parse(_args[2]))
+                    );
+                }
+                else if (Match("AVERAGE LIGHT POSITION"))
+                {
+                    currentSector.AvgLightPosition = new Vector3
+                    (
+                        float.Parse(_args[0]),
+                        float.Parse(_args[1]),
+                        float.Parse(_args[2])
+                    );
+                }
+                else if (Match("AVERAGE LIGHT FALLOFF"))
+                {
+                    currentSector.AvgLightFalloff = new Vector2
+                    (
+                        float.Parse(_args[0]),
+                        float.Parse(_args[1])
+                    );
+                }
+                else if (Match("BOUNDBOX"))
+                {
+                    var min = new Vector3
+                    (
+                        float.Parse(_args[0]),
+                        float.Parse(_args[1]),
+                        float.Parse(_args[2])
+                    );
+                    var max = new Vector3
+                    (
+                        float.Parse(_args[3]),
+                        float.Parse(_args[4]),
+                        float.Parse(_args[5])
+                    );
+
+                    if (currentSector.Bounds == null)
+                    {
+                        currentSector.Bounds = new Bounds(new Vector3(), new Vector3());
+                    }
+                    currentSector.Bounds.min = min;
+                    currentSector.Bounds.max = max;
+                    currentSector.Bounds.size = max - min;
+                }
+                else if (Match("COLLIDEBOX"))
+                {
+                    var min = new Vector3
+                    (
+                        float.Parse(_args[0]),
+                        float.Parse(_args[1]),
+                        float.Parse(_args[2])
+                    );
+                    var max = new Vector3
+                    (
+                        float.Parse(_args[3]),
+                        float.Parse(_args[4]),
+                        float.Parse(_args[5])
+                    );
+
+                    currentSector.CollideBounds = new Bounds(new Vector3(), max - min);
+                    if (currentSector.Bounds != null)
+                    {
+                        currentSector.CollideBounds.center = currentSector.Bounds.center;
+                    }
+                }
+                else if (Match("SOUND"))
+                {
+                    currentSector.Sound = new Sector.AmbientSound();
+                    currentSector.Sound.File = _args[0];
+                    currentSector.Sound.Volume = Mathf.Clamp01(float.Parse(_args[1]));
+                }
+                else if (Match("THRUST"))
+                {
+                    currentSector.Thrust = new Vector3
+                    (
+                        float.Parse(_args[0]),
+                        float.Parse(_args[1]),
+                        float.Parse(_args[2])
+                    );
+                }
+                else if (Match("CENTER"))
+                {
+                    var center = new Vector3
+                    (
+                        float.Parse(_args[0]),
+                        float.Parse(_args[1]),
+                        float.Parse(_args[2])
+                    );
+
+                    if (currentSector.Bounds == null)
+                    {
+                        currentSector.Bounds = new Bounds(new Vector3(), new Vector3());
+                    }
+                    currentSector.Bounds.center = center;
+
+                    if (currentSector.CollideBounds != null)
+                    {
+                        currentSector.CollideBounds.center = center;
+                    }
+                }
+                else if (Match("RADIUS"))
+                {
+                    currentSector.Radius = float.Parse(_args[0]);
+                }
+                else if (Match("VERTICES"))
+                {
+                    var numVertices = int.Parse(_args[0]);
+                    currentSector.VertexIndices = new int[numVertices];
+                    for (int i = 0; i < numVertices; i++)
+                    {
+                        ReadLine();
+                        string[] args = _line.Split(new[] { '\t', ' ' }, StringSplitOptions.RemoveEmptyEntries);
+                        var sourceIdx = int.Parse(args[0].Replace(":", ""));
+                        var vertexIdx = int.Parse(args[1]);
+                        currentSector.VertexIndices[sourceIdx] = vertexIdx;
+                    }
+                }
+                else if (Match("SURFACES"))
+                {
+                    currentSector.SurfaceStartIdx = int.Parse(_args[0]);
+                    currentSector.SurfaceCount = int.Parse(_args[1]);
+
+                    for (int i = 0; i < currentSector.SurfaceCount; i++)
+                    {
+                        var surface = _jkl.WorldSurfaces[currentSector.SurfaceStartIdx + i];
+                        surface.Sector = currentSector;
+                    }
+                }
+            }
+        }
+
+        private Material? GetMaterialByIdx(int idx)
+        {
+            Material? mat = null;
+            if (idx == -1 || idx >= _jkl.Materials.Length)
+            {
+                if (_jkl.Version != 1 && ndyStaticMats.ContainsKey(idx))
+                {
+                    // IJIM
+                    mat = ndyStaticMats[idx];
+                }
+            }
+            else
+            {
+                mat = _jkl.Materials[idx];
+            }
+            return mat;
+        }
+
+        private void ParseGeoResource()
+        {
+            while (true)
+            {
+                ReadLine();
+                if (_line.StartsWith("SECTION: ", StringComparison.OrdinalIgnoreCase))
+                    break;
+                if (Match("World Colormaps"))
+                {
+                    _jkl.WorldColorMaps = new string[int.Parse(_args[0])];
+                    for (int i = 0; i < _jkl.WorldColorMaps.Length; i++)
+                    {
+                        ReadLine();
+                        string[] args = _line.Split(new[] { '\t', ' ' }, StringSplitOptions.RemoveEmptyEntries);
+                        var idx = int.Parse(args[0].Replace(":", ""));
+                        _jkl.WorldColorMaps[idx] = args[1];
+                    }
+                }
+                else if (Match("World vertices"))
+                {
+                    _jkl.WorldVertices = new Vector3[int.Parse(_args[0])];
+                    for (int i = 0; i < _jkl.WorldVertices.Length; i++)
+                    {
+                        ReadLine();
+                        string[] args = _line.Split(new[] { '\t', ' ' }, StringSplitOptions.RemoveEmptyEntries);
+                        var idx = int.Parse(args[0].Replace(":", ""));
+                        _jkl.WorldVertices[idx] = new Vector3(float.Parse(args[1]), float.Parse(args[2]), float.Parse(args[3]));
+                    }
+                }
+                else if (Match("World texture vertices"))
+                {
+                    _jkl.WorldTextureVertices = new Vector2[int.Parse(_args[0])];
+                    for (int i = 0; i < _jkl.WorldTextureVertices.Length; i++)
+                    {
+                        ReadLine();
+                        string[] args = _line.Split(new[] { '\t', ' ' }, StringSplitOptions.RemoveEmptyEntries);
+                        var idx = int.Parse(args[0].Replace(":", ""));
+                        _jkl.WorldTextureVertices[idx] = new Vector2(float.Parse(args[1]), float.Parse(args[2]));
+                    }
+                }
+                else if (Match("World adjoins"))
+                {
+                    _jkl.WorldAdjoins = new Adjoin[int.Parse(_args[0])];
+                    for (int i = 0; i < _jkl.WorldAdjoins.Length; i++)
+                    {
+                        ReadLine();
+                        string[] args = _line.Split(new[] { '\t', ' ' }, StringSplitOptions.RemoveEmptyEntries);
+                        var idx = int.Parse(args[0].Replace(":", ""));
+                        _jkl.WorldAdjoins[idx] = new Adjoin
+                        {
+                            Flags = (uint)ParseHex(args[1]),
+                            Mirror = int.Parse(args[2]),
+                            Distance = float.Parse(args[3])
+                        };
+                    }
+                }
+                else if (Match("World surfaces"))
+                {
+                    _jkl.WorldSurfaces = new Surface[int.Parse(_args[0])];
+                    for (int i = 0; i < _jkl.WorldSurfaces.Length; i++)
+                    {
+                        ReadLine();
+                        string[] args = _line.Split(new[] { '\t', ' ' }, StringSplitOptions.RemoveEmptyEntries);
+                        uint argsPos  = 0;
+                        var idx       = int.Parse(args[argsPos++].Replace(":", ""));
+                        var matIdx    = int.Parse(args[argsPos++]);
+                        var surfflags = Convert.ToUInt32(args[argsPos++], 16);
+                        var faceflags = (FaceFlag)Convert.ToUInt32(args[argsPos++], 16);
+                        var geoMode   = (GeoMode)uint.Parse(args[argsPos++]);
+                        var lightMode = (LightMode)uint.Parse(args[argsPos++]);
+                        var texMode   = int.Parse(args[argsPos++]); // not used
+                        var adjoinIdx = int.Parse(args[argsPos++]);
+
+                        if (geoMode > GeoMode.Textured)
+                        {
+                            Debug.LogWarning($"JKLParser: Invalid GeoMode '{geoMode}' for surface '{idx}'");
+                            geoMode = GeoMode.Textured;
+                        }
+                        else if( lightMode > LightMode.Gouraud)
+                        {
+                            Debug.LogWarning($"JKLParser: Invalid LightMode '{geoMode}' for surface '{idx}'");
+                            lightMode = LightMode.Gouraud;
+                        }
+
+                        var material = GetMaterialByIdx(matIdx);
+                        if (material != null && !material.Name.EndsWith(".mat", StringComparison.InvariantCultureIgnoreCase))
+                        {
+                            Debug.LogError($"JKLParser: Invalid material name '{material.Name}' in the list of materials");
+                            material = null;
+                        }
+                        else if (material == null && matIdx > -1)
+                        {
+                            Debug.LogWarning($"JKLParser: Material with idx={matIdx} was not found in the list of materials");
+                        }
+
+                        if (material == null && geoMode > GeoMode.Solid)
+                        {
+                            geoMode = GeoMode.Solid;
+                        }
+
+                        Adjoin? adjoin = adjoinIdx == -1 ? null : _jkl.WorldAdjoins[adjoinIdx];
+                        var surface = new Surface
+                        {
+                            Material = material,
+                            SurfaceFlags = surfflags,// (uint)ParseHex(args[2]),
+                            FaceFlags = faceflags, //(uint)ParseHex(args[3]),
+                            GeoMode   = geoMode,//int.Parse(args[4]),
+                            LightMode = lightMode, //int.Parse(args[5]),
+                            //Tex = int.Parse(args[6]),
+                            Adjoin = adjoin,
+                            //ExtraLight = float.Parse(args[8]),
+                            //SurfaceVertexGroups = new SurfaceVertexGroup[int.Parse(_jkl.Version == 1 ? args[9] : args[12])],
+                            Sector = null
+                        };
+
+                        if(adjoin != null)
+                            adjoin.Surface = surface;
+
+                        if (_jkl.Version == 1)
+                        {
+                            var intensity = Mathf.Clamp01(float.Parse(args[argsPos++]));
+                            surface.ExtraLight = new Color(intensity, intensity, intensity);
+                        }
+                        else
+                        {
+                            surface.ExtraLight = new Color
+                            (
+                                Mathf.Clamp01(float.Parse(args[argsPos++])),
+                                Mathf.Clamp01(float.Parse(args[argsPos++])),
+                                Mathf.Clamp01(float.Parse(args[argsPos++])),
+                                Mathf.Clamp01(float.Parse(args[argsPos++]))
+                            );
+                        }
+
+                        surface.SurfaceVertexGroups = new SurfaceVertexGroup[int.Parse(args[argsPos++])];
+                        _jkl.WorldSurfaces[idx] = surface;
+
+                        // Parse polygon vertex & UV indices
+                        var numVertexGroups = _jkl.WorldSurfaces[idx].SurfaceVertexGroups.Length;
+                        for (int k = 0; k < _jkl.WorldSurfaces[idx].SurfaceVertexGroups.Length; k++)
+                        {
+                            var surfaceVertexGroup = new SurfaceVertexGroup();
+                            var group = args[argsPos++].Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
+                            var vIdx = int.Parse(group[0]);
+                            if (vIdx == -1)
+                                throw new Exception("Null vertex??");
+
+                            int tvIdx;
+                            if (group.Length > 1)
+                                tvIdx = int.Parse(group[1]);
+                            else // there was and additional space(s) separating the two indices
+                                tvIdx = int.Parse(args[argsPos++]);
+
+                            surfaceVertexGroup.VertexIdx = vIdx;
+                            surfaceVertexGroup.TextureVertex = tvIdx == -1 ? null : (Vector2?)_jkl.WorldTextureVertices[tvIdx];
+
+                            _jkl.WorldSurfaces[idx].SurfaceVertexGroups[k] = surfaceVertexGroup;
+                        }
+
+                        // Parse vertex colors
+                        _jkl.WorldSurfaces[idx].VertColors = new Color[numVertexGroups];
+                        bool rgbColors = (args.Length - argsPos) != numVertexGroups;
+                        if (rgbColors && _jkl.Version == 1)
+                        {
+                            _jkl.type = WorldType.MOTS;
+                        }
+                        
+                        for (int k = 0; k < numVertexGroups; k++)                        {
+                            Color vcolor;
+                            
+                            if (rgbColors)
+                            {
+                                var alpha = surface.ExtraLight.a; // IJIM
+                                if (_jkl.type == WorldType.MOTS)
+                                    alpha = Mathf.Clamp01(float.Parse(args[argsPos++]));
+                                vcolor = new Color
+                                (
+                                    Mathf.Clamp01(float.Parse(args[argsPos++])),
+                                    Mathf.Clamp01(float.Parse(args[argsPos++])),
+                                    Mathf.Clamp01(float.Parse(args[argsPos++])),
+                                    alpha
+                                );
+                            }
+                            else // JKDF2
+                            {
+                                var intensity = Mathf.Clamp01(float.Parse(args[argsPos++]));
+                                vcolor = new Color(intensity, intensity, intensity);
+                            }
+                            _jkl.WorldSurfaces[idx].VertColors[k] = vcolor;
+                        }
+                    }
+
+                    // Surface normals
+                    for (int i = 0; i < _jkl.WorldSurfaces.Length; i++)
+                    {
+                        ReadLine();
+                        string[] args = _line.Split(new[] { '\t', ' ' }, StringSplitOptions.RemoveEmptyEntries);
+                        var idx = int.Parse(args[0].Replace(":", ""));
+                        _jkl.WorldSurfaces[idx].SurfaceNormal = new Vector3(float.Parse(args[1]), float.Parse(args[2]), float.Parse(args[3]));
+                    }
+                }
+            }
+        }
+
+        private static int ParseHex(string str)
+        {
+            return int.Parse(str.Replace("0x", ""), NumberStyles.AllowHexSpecifier);
+        }
+
+        private void ParseMaterials()
+        {
+            ReadLine();
+            if (Match("World materials"))
+            {
+                _jkl.Materials = new Material[int.Parse(_args[0])];
+                for (int i = 0; i < _jkl.Materials.Length; i++)
+                {
+                    ReadLine();
+                    if (_line == "end")
+                    {
+                        _jkl.ActualNumberOfMaterials = i;
+                        ReadLine();
+                        break;
+                    }
+
+                    var args = _line.Split(new[] { ':'}, StringSplitOptions.RemoveEmptyEntries);
+                    if (args.Length == 0)
+                    {
+                        throw new Exception("Invalid entry in the Materials section");
+                    }
+
+                    int pos = 0;
+                    var idx = i;                    
+                    if (args.Length > 1)
+                    {
+                        idx = int.Parse(args[pos++]);
+                    }
+
+                    int matNameEndIdx = args[pos].IndexOf(".mat", StringComparison.InvariantCultureIgnoreCase);
+                    if (matNameEndIdx == -1)
+                    {
+                        throw new Exception("Invalid material file name in the Materials section");
+                    }
+
+                    matNameEndIdx += 4;
+                    var filename = args[pos].Substring(0, matNameEndIdx).Trim();
+                    float xTile = 1.0f;
+                    float yTile = 1.0f;
+                    if (_jkl.Version == 1)
+                    {
+                        args = args[pos].Substring(matNameEndIdx).Split(new[] { ' ', '\t' }, StringSplitOptions.RemoveEmptyEntries);
+                        xTile = float.Parse(args[0]);
+                        yTile = float.Parse(args[1]);
+                    }
+
+                    _jkl.Materials[idx] = new Material
+                    {
+                        Name  = filename,
+                        XTile = xTile,
+                        YTile = yTile
+                    };
+                }
+            }
+        }
+
+        private void ParseSounds()
+        {
+            ReadLine();
+            if (Match("World sounds"))
+            {
+                _jkl.Sounds = new string[int.Parse(_args[0])];
+                int i = 0;
+                while (true)
+                {
+                    ReadLine();
+                    if (_line == "end")
+                    {
+                        ReadLine();
+                        break;
+                    }
+                    _jkl.Sounds[i++] = _line;
+                }
+            }
+        }
+
+        private void ParseHeader()
+        {
+            while (true)
+            {
+                ReadLine();
+                if (_line.StartsWith("SECTION: "))
+                    break;
+
+                if (Match("Version"))
+                {
+                    _jkl.Version = int.Parse(_args[0]);
+                    _jkl.type = _jkl.Version == 1 ? WorldType.JKDF2 : WorldType.IJIM;
+                }
+                else if (Match("World Gravity"))
+                {
+                    _jkl.WorldGravity = float.Parse(_args[0]);
+                }
+                else if (Match("Ceiling Sky Z"))
+                {
+                    _jkl.CeilingSkyZ = float.Parse(_args[0]);
+                }
+                else if (Match("Horizon Distance"))
+                {
+                    _jkl.HorizonDistance = float.Parse(_args[0]);
+                }
+                else if (Match("Horizon Pixels per Rev"))
+                {
+                    _jkl.HorizonPixelsPerRev = float.Parse(_args[0]);
+                }
+                else if (Match("Horizon Sky Offset"))
+                {
+                    _jkl.HorizonSkyOffset = new Vector2(float.Parse(_args[0]), float.Parse(_args[1]));
+                }
+                else if (Match("Ceiling Sky Offset"))
+                {
+                    _jkl.CeilingSkyOffset = new Vector2(float.Parse(_args[0]), float.Parse(_args[1]));
+                }
+                else if (Match("MipMap Distances"))
+                {
+                    _jkl.MipMapDistances = new Vector4(float.Parse(_args[0]), float.Parse(_args[1]), float.Parse(_args[2]), float.Parse(_args[3]));
+                }
+                else if (Match("LOD Distances"))
+                {
+                    _jkl.LODDistances = new Vector4(float.Parse(_args[0]), float.Parse(_args[1]), float.Parse(_args[2]), float.Parse(_args[3]));
+                }
+                else if (Match("Perspective distance"))
+                {
+                    _jkl.PerspectiveDistance = float.Parse(_args[0]);
+                }
+                else if (Match("Gouraud distance"))
+                {
+                    _jkl.GouraudDistance = float.Parse(_args[0]);
+                }
+                else if (Match("Fog"))
+                {
+                    _jkl.Fog = new Fog();
+                    _jkl.Fog.Enabled = Convert.ToBoolean(int.Parse(_args[0]));
+                    _jkl.Fog.Color = new Color(float.Parse(_args[1]), float.Parse(_args[2]), float.Parse(_args[3]), float.Parse(_args[4]));
+                    _jkl.Fog.Start = float.Parse(_args[5]);
+                    _jkl.Fog.End = float.Parse(_args[6]);
+                }
+            }
+        }
+    }
+
+    internal class Thing : ICloneable
+    {
+        public string Name { get; set; }
+        public Vector3 Position { get; set; }
+        public Quaternion Orientation { get; set; }
+        public int SectorIdx { get; set; }
+        public Dictionary<string, string> Parameters { get; private set; }
+        public Thing Template;
+
+        public Thing()
+        {
+            Parameters = new Dictionary<string, string>();
+        }
+
+        public static Thing CreateBasedOn(Thing template)
+        {
+            var thing = new Thing();
+            if (template != null)
+            {
+                thing = (Thing)template.Clone();
+                thing.Template = template;
+            }
+            return thing;
+        }
+
+        /*DeepCopy clone*/
+        public object Clone()
+        {
+            Thing clone = (Thing)this.MemberwiseClone();
+            clone.Parameters = new Dictionary<string, string>(this.Parameters);
+            return clone;
+        }
+    }
+
+    public enum WorldType : uint
+    {
+        JKDF2 = 0,
+        MOTS  = 1,
+        IJIM  = 2,
+    };
+
+    [Flags]
+    public enum FaceFlag : uint
+    {
+        Normal         = 0x00,
+        DoubleSided    = 0x01, // Disables face backface culling.
+        Textranslucent = 0x02, // Polygon has translucent texture (adjoin surface & 3DO model polygon)
+        TexClamp_x     = 0x04, // Mapped texture is clamped in x instead of being repeated (IJIM & maybe MOTS)
+        TexClamp_y     = 0x08, // Mapped texture is clamped in y instead of being repeated (IJIM & maybe MOTS)
+        TexFilterNone  = 0x10, // Disables bilinear texture filtering for the polygon texture. (Sets to point filter aka nearest)
+        ZWriteOff      = 0x20, // Disables ZWrite for face
+        IjimFogEnabled = 0x100 // (IJIM specific) Enables fog rendering for the face polygon.
+                               //   Note: This flag is set by default for all surfaces but sky surfaces.
+    };
+
+    public enum GeoMode : uint
+    {
+        NotDrawn    = 0,
+        Vertex      = 1,
+        Wireframe   = 2,
+        Solid       = 3,
+        Textured    = 4
+    };
+
+    public enum LightMode : uint
+    {
+        Unlit   = 0,
+        Lit     = 1,
+        Diffuse = 2,
+        Gouraud = 3
+    }
+
+    public class Surface
+    {
+        public Material? Material { get; set; }
+        public uint SurfaceFlags { get; set; }
+        public FaceFlag FaceFlags { get; set; }
+        public GeoMode GeoMode { get; set; }
+        public LightMode LightMode { get; set; }
+        public Adjoin? Adjoin { get; set; }
+        public Color ExtraLight { get; set; }
+        public SurfaceVertexGroup[] SurfaceVertexGroups { get; set; }
+        public Color[] VertColors { get; set; }
+        public Vector3 SurfaceNormal { get; set; }
+        public Sector Sector { get; set; }
+    }
+
+    public class Sector
+    {
+        [Serializable]
+        public class AmbientSound
+        {
+            [SerializeField]
+            public string File;
+            [SerializeField]
+            public float Volume;
+        }
+
+        public int num;
+
+        public uint Flags { get; set; }
+        public int SurfaceStartIdx { get; set; }
+        public int SurfaceCount { get; set; }
+        public int[] VertexIndices { get; set; }
+        public Color AmbientLight;
+        public Color ExtraLight;
+        public Color? Tint;
+        public Color? AvgLightIntensity;
+        public Vector3? AvgLightPosition;
+        public Vector2? AvgLightFalloff;
+        public Bounds Bounds;
+        public Bounds CollideBounds; // optional
+        public float Radius;
+        public AmbientSound? Sound; // optional
+        public Vector3? Thrust;
+    }
+
+    public class SurfaceVertexGroup
+    {
+        public int VertexIdx { get; set; }
+        public Vector2? TextureVertex { get; set; }
+    }
+
+    public class Adjoin
+    {
+        public uint Flags { get; set; }
+        public int Mirror { get; set; }
+        public float Distance { get; set; }
+        public Surface Surface { get; set; }
+    }
+}
diff --git a/Assets/Scripts/JKL/JKLParser.cs.meta b/Assets/Sith/Content/JKL/JKLParser.cs.meta
similarity index 100%
rename from Assets/Scripts/JKL/JKLParser.cs.meta
rename to Assets/Sith/Content/JKL/JKLParser.cs.meta
diff --git a/Assets/Sith/Content/KEY.cs b/Assets/Sith/Content/KEY.cs
new file mode 100644
index 0000000..e1869fa
--- /dev/null
+++ b/Assets/Sith/Content/KEY.cs
@@ -0,0 +1,209 @@
+using Assets.Sith;
+using Assets.Sith.Utility;
+using System;
+using System.IO;
+using UnityEngine;
+
+namespace Assets.Sith.Content
+{
+    class KEY
+    {
+        public string Name { get; private set; }
+
+        private string _line;
+        private string[] _args;
+
+        private void ReadLine(in StreamReader sr)
+        {
+            while (!sr.EndOfStream)
+            {
+                _line = sr.ReadLine();
+                if (_line.StartsWith("#") || _line.Trim() == "")
+                    continue;
+                _args = _line.Split(new[] { ' ', ',', '\t' }, StringSplitOptions.RemoveEmptyEntries);
+                break;
+            }
+        }
+
+        public AnimationClip Load(string filename, Stream dataStream, Model3DO model, Transform root)
+        {
+            var animationClip = new AnimationClip
+            {
+                name = filename
+            };
+            Name = filename;// Path.GetFileNameWithoutExtension(filename);
+
+            string section = "";
+            int numFrames = 0;
+            float fps = 1.0f;
+            int currentNodeIdx = 0;
+            string currentMeshName = null;
+            int numEntries;
+            AnimationCurve curveX, curveY, curveZ;
+            AnimationCurve curveXR, curveYR, curveZR, curveWR;
+            curveX = curveY = curveZ = curveXR = curveYR = curveZR = curveWR = null;
+
+            using (var sr = new StreamReader(dataStream))
+            {
+                while (!sr.EndOfStream)
+                {
+                    ReadLine(sr);
+
+                    if (_line == "")
+                        continue;
+                    else if (_line.StartsWith("SECTION: "))
+                    {
+                        section = _line;
+                    }
+                    else if (section == "SECTION: HEADER")
+                    {
+                        switch (_args[0])
+                        {
+                            case "FRAMES":
+                                numFrames = int.Parse(_args[1]);
+                                break;
+                            case "FPS":
+                                fps = float.Parse(_args[1]);
+                                break;
+                        }
+                    }
+                    else if (section == "SECTION: KEYFRAME NODES")
+                    {
+                        if (_args[0] == "NODES")
+                        {
+
+                        }
+                        else if (_args[0] == "NODE")
+                        {
+                            if (currentMeshName != null)
+                            {
+                                var transformPath = GetFullPathTo(root, model.HierarchyNodes[currentNodeIdx].Transform);
+                                //var transformPath = GetFullPathTo(root, root.transform.Find(currentMeshName));
+                                animationClip.SetCurve(transformPath, typeof(Transform), "localPosition.x", curveX);
+                                animationClip.SetCurve(transformPath, typeof(Transform), "localPosition.y", curveY);
+                                animationClip.SetCurve(transformPath, typeof(Transform), "localPosition.z", curveZ);
+                                animationClip.SetCurve(transformPath, typeof(Transform), "localRotation.x", curveXR);
+                                animationClip.SetCurve(transformPath, typeof(Transform), "localRotation.y", curveYR);
+                                animationClip.SetCurve(transformPath, typeof(Transform), "localRotation.z", curveZR);
+                                animationClip.SetCurve(transformPath, typeof(Transform), "localRotation.w", curveWR);
+                            }
+
+                            currentNodeIdx = int.Parse(_args[1]);
+                            curveX = new AnimationCurve();
+                            curveY = new AnimationCurve();
+                            curveZ = new AnimationCurve();
+                            curveXR = new AnimationCurve();
+                            curveYR = new AnimationCurve();
+                            curveZR = new AnimationCurve();
+                            curveWR = new AnimationCurve();
+
+                            curveX.postWrapMode = WrapMode.Loop;
+                            curveY.postWrapMode = WrapMode.Loop;
+                            curveZ.postWrapMode = WrapMode.Loop;
+                            curveXR.postWrapMode = WrapMode.Loop;
+                            curveYR.postWrapMode = WrapMode.Loop;
+                            curveZR.postWrapMode = WrapMode.Loop;
+                        }
+                        else if (_args[0] == "MESH" && _args[1] == "NAME")
+                        {
+                            currentMeshName = _args[2];
+                        }
+                        else if (_args[0] == "ENTRIES")
+                        {
+                            numEntries = int.Parse(_args[1]);
+                        }
+                        else
+                        {
+                            // var entryNum = int.Parse(_args[0].Replace(":", ""));
+                            var frame = int.Parse(_args[1]);
+                            var flags = _args[2];
+                            var x = float.Parse(_args[3]);
+                            var y = float.Parse(_args[4]);
+                            var z = float.Parse(_args[5]);
+                            var pitch = float.Parse(_args[6]);
+                            var yaw   = float.Parse(_args[7]);
+                            var roll  = float.Parse(_args[8]);
+
+                            curveX.AddKey(frame / fps, x);
+                            curveY.AddKey(frame / fps, z);
+                            curveZ.AddKey(frame / fps, y);
+
+                            //if (curveX.length == 1)
+                            //{
+                            //    curveX.AddKey(numFrames / fps, x);
+                            //    curveY.AddKey(numFrames / fps, z);
+                            //    curveZ.AddKey(numFrames / fps, y);
+                            //}
+
+                            var quaternion = Utils.FromMeshOrientation(pitch, yaw, roll);
+
+                            curveXR.AddKey(frame / fps, quaternion.x);
+                            curveYR.AddKey(frame / fps, quaternion.y);
+                            curveZR.AddKey(frame / fps, quaternion.z);
+                            curveWR.AddKey(frame / fps, quaternion.w);
+
+                            //if (curveXR.length == 1)
+                            //{
+                            //    curveXR.AddKey(numFrames / fps, quaternion.x);
+                            //    curveYR.AddKey(numFrames / fps, quaternion.y);
+                            //    curveZR.AddKey(numFrames / fps, quaternion.z);
+                            //    curveWR.AddKey(numFrames / fps, quaternion.w);
+                            //}
+
+                            ReadLine(sr);
+
+                            // Skip delta frames
+                        }
+                    }
+                }
+            }
+
+            if (currentMeshName != null)
+            {
+                var transformPath = GetFullPathTo(root, model.HierarchyNodes[currentNodeIdx].Transform);
+                //var transformPath = GetFullPathTo(root, root.transform.Find(currentMeshName));
+                animationClip.SetCurve(transformPath, typeof(Transform), "localPosition.x", curveX);
+                animationClip.SetCurve(transformPath, typeof(Transform), "localPosition.y", curveY);
+                animationClip.SetCurve(transformPath, typeof(Transform), "localPosition.z", curveZ);
+                animationClip.SetCurve(transformPath, typeof(Transform), "localRotation.x", curveXR);
+                animationClip.SetCurve(transformPath, typeof(Transform), "localRotation.y", curveYR);
+                animationClip.SetCurve(transformPath, typeof(Transform), "localRotation.z", curveZR);
+                animationClip.SetCurve(transformPath, typeof(Transform), "localRotation.w", curveWR);
+            }
+
+            animationClip.legacy = true;
+            animationClip.name = Name;
+            animationClip.EnsureQuaternionContinuity();
+            animationClip.wrapMode = WrapMode.Loop;
+            return animationClip;
+        }
+
+        private string GetFullPathTo(Transform root, Transform transformToFind)
+        {
+            if (transformToFind == root)
+                return "";
+
+            var path = transformToFind.name;
+            while (transformToFind.parent != root && transformToFind.parent != null)
+            {
+                path = transformToFind.parent.name + "/" + path;
+                transformToFind = transformToFind.parent;
+            }
+            return path;
+        }
+
+        //private string GetFullPathTo(Transform root, string meshName)
+        //{
+        //    if (root.name == meshName)
+        //        return "";
+
+        //    var path = transformToFind.name;
+        //    while (transformToFind.parent != root && transformToFind.parent != null)
+        //    {
+        //        path = transformToFind.parent.name + "/" + path;
+        //        transformToFind = transformToFind.parent;
+        //    }
+        //    return path;
+        //}
+    }
+}
\ No newline at end of file
diff --git a/Assets/Sith/Content/KEY.cs.meta b/Assets/Sith/Content/KEY.cs.meta
new file mode 100644
index 0000000..f59bacc
--- /dev/null
+++ b/Assets/Sith/Content/KEY.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 28bcd593bdc300a47a320591fcfd8e12
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Sith/Content/MAT.cs b/Assets/Sith/Content/MAT.cs
new file mode 100644
index 0000000..df37b84
--- /dev/null
+++ b/Assets/Sith/Content/MAT.cs
@@ -0,0 +1,276 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Threading.Tasks;
+using UnityEngine;
+
+namespace Assets.Sith.Content
+{
+    public enum ColorMode : UInt32
+    {
+        Indexed = 0,
+        RGB     = 1,
+        RGBA    = 2
+    }
+
+    public enum MatType : UInt32
+    {
+        Color   = 0,
+        Texture = 2
+    };
+
+    public class MAT : ISithAsset
+    {
+        const int ColorTexWidth  = 64;
+        const int ColorTexHeight = 64;
+        const int ColorTexSize   = ColorTexWidth * ColorTexHeight;
+
+        public string Name { get; set; }
+        public ColorMode ColorMode { get; set; }
+        public Texture2D[] Textures { get; set; }
+
+        public void Load(string name, Stream dataStream, CMP cmp)
+        {
+            Name = name;
+            using (var br = new BinaryReader(dataStream))
+            {
+                var matHdr = br.ReadInt32();
+                if (matHdr != 0x2054414D) // 'MAT '
+                {
+                    throw new Exception("Unknown or invalid MAT file");
+                }
+
+                var version = br.ReadInt32();
+                var type    = (MatType)br.ReadInt32();
+                if (type != MatType.Color && type != MatType.Texture)
+                {
+                    throw new Exception($"Unsupported MAT file type: {type}");
+                }
+
+                var celCount = br.ReadInt32();
+                var texCount = br.ReadInt32();
+
+                var cf = new ColorFormat
+                {
+                    Mode     = (ColorMode)br.ReadUInt32(),
+                    BPP      = br.ReadUInt32(),
+                    RedBPP   = br.ReadUInt32(),
+                    GreenBPP = br.ReadUInt32(),
+                    BlueBPP  = br.ReadUInt32(),
+                    RedShl   = br.ReadUInt32(),
+                    GreenShl = br.ReadUInt32(),
+                    BlueShl  = br.ReadUInt32(),
+                    RedShr   = br.ReadUInt32(),
+                    GreenShr = br.ReadUInt32(),
+                    BlueShr  = br.ReadUInt32(),
+                    AlphaBPP = br.ReadUInt32(),
+                    AlphaShl = br.ReadUInt32(),
+                    AlphaShr = br.ReadUInt32()
+                };
+
+                if (cf.BPP % 8 != 0 && cf.BPP <= 32) 
+                {
+                    throw new Exception("MAT file contains invalid BPP size");
+                }
+
+                if (cf.Mode < ColorMode.Indexed || cf.Mode > ColorMode.RGBA)
+                {
+                    throw new Exception("MAT file contains invalid color mode");
+                }
+                ColorMode = cf.Mode;
+
+                Textures = new Texture2D[celCount];
+                for (int i = 0; i < celCount; i++)
+                {
+                    var texType  = br.ReadUInt32();
+                    var colorNum = br.ReadUInt32();
+                    for (int j = 0; j < 4; j++)
+                    {
+                        var unk = br.ReadUInt32(); //0x3F800000
+                    }
+
+                    if (type == MatType.Color)
+                    {
+                        Textures[i] = new Texture2D(ColorTexWidth, ColorTexHeight);
+                        var pixels  = new Color32[ColorTexSize];
+                        var color   = cmp.GetColor((byte)colorNum);
+                        for (int xy = 0; xy < ColorTexSize; xy++)
+                        {
+                            pixels[xy] = color;
+                        }
+                        Textures[i].SetPixels32(pixels);
+                    }
+                    else if (type == MatType.Texture)
+                    {
+                        for (int j = 0; j <= 1; j++)
+                        {
+                            var unk = br.ReadUInt32(); //unknown
+                        }
+                        var longint = br.ReadUInt32(); // 0xBFF78482
+                        var currentTxNum = br.ReadUInt32();
+                    }
+                }
+
+                if (type == MatType.Texture)
+                {
+                    var transparentColor = new Color32(0, 0, 0, 0);
+                    for (int i = 0; i < texCount; i++)
+                    {
+                        var width       = br.ReadUInt32();
+                        var height      = br.ReadUInt32();
+                        var transparent = br.ReadUInt32(); //1 = color 0 is transparent, else 0
+                        br.ReadUInt32(); // Could be alpha color num in case of transparent texture
+                        br.ReadUInt32(); // pad2
+                        var mipmapLevels = br.ReadUInt32();
+                        int pixSize = (int)cf.BPP /8;
+
+                        for (int j = 0; j < mipmapLevels; j++)
+                        {
+                            int texSize = (int)(width * height * pixSize);
+                            if (j == 0)
+                            {
+                                var tex = new Texture2D((int)width, (int)height);
+                                Textures[i] = tex;
+                                tex.alphaIsTransparency = (cf.Mode == ColorMode.RGBA);
+                                if (cf.Mode == ColorMode.Indexed)
+                                {
+                                    var data = br.ReadBytes(texSize);
+                                    tex.SetPixels32(data.Select(x => (x == 0 && transparent == 1) ? transparentColor : cmp.GetColor(x)).ToArray());
+                                }
+                                else
+                                {
+                                    int padSize = 0;
+                                    if (pixSize < 4)
+                                    {
+                                        padSize = 4 - pixSize;
+                                    }
+                                    var data = new byte[texSize + padSize];
+                                    br.Read(data, 0, texSize);
+
+                                    var pixdata = new Color32[width * height];
+                                    var stride  = pixSize * width;
+
+                                    double invPixSize = 1 / (double)pixSize;
+                                    Parallel.For(0, height, y =>  // Note, parallel for loop is not much faster than sequential for loop (1 sec diff, loading 03_shs.ndy)
+                                    {
+                                        var strideRow = y * stride;
+                                        var row = y * width;
+                                        for (int x = 0; x < stride; x += pixSize)
+                                        {
+                                            var pix = BitConverter.ToInt32(data, (int)(strideRow + x));
+                                            pixdata[((int)(x * invPixSize) + row)] = DecodePixel(pix, cf);
+                                        }
+                                    });
+
+                                    tex.SetPixels32(pixdata);
+                                }
+                                tex.Apply();
+                            }
+                            else
+                            {
+                                br.BaseStream.Position += texSize;
+                            }
+
+                            width  >>= 1;
+                            height >>= 1;
+                            if (width == 0 || height == 0)
+                                break;
+                        }
+                    }
+                }
+            }
+        }
+
+        struct ColorFormat
+        {
+            public ColorMode Mode { get; set; }
+            public uint BPP { get; set; } // bits per pixel
+
+            public uint RedBPP { get; set; }
+            public uint GreenBPP { get; set; }
+            public uint BlueBPP { get; set; }
+
+            public uint RedShl { get; set; }
+            public uint GreenShl { get; set; }
+            public uint BlueShl { get; set; }
+
+            public uint RedShr { get; set; }
+            public uint GreenShr { get; set; }
+            public uint BlueShr { get; set; }
+
+            public uint AlphaBPP { get; set; }
+            public uint AlphaShl { get; set; }
+            public uint AlphaShr { get; set; }
+        }
+
+        static uint GetColorMask(uint bpc)
+        {
+            return 0xFFFFFFFF >> (32 - (int)bpc);
+        }
+
+        static Color32 DecodePixel(int p, ColorFormat cf)
+        {
+            int r = ((p >> (int)cf.RedShl) & (int)GetColorMask(cf.RedBPP)) << (int)cf.RedShr;
+            int g = ((p >> (int)cf.GreenShl) & (int)GetColorMask(cf.GreenBPP)) << (int)cf.GreenShr;
+            int b = ((p >> (int)cf.BlueShl) & (int)GetColorMask(cf.BlueBPP)) << (int)cf.BlueShr;
+            int a = 255;
+            if (cf.AlphaBPP > 0)
+            {
+                a = ((p >> (int)cf.AlphaShl) & (int)GetColorMask(cf.AlphaBPP)) << (int)cf.AlphaShr;
+                if (cf.AlphaBPP == 1)
+                {
+                    a = a > 0 ? 255 : 0;
+                }
+            }
+            return new Color32((byte)r, (byte)g, (byte)b, (byte)a); // TODO: clamp to 0-255 before casting to byte
+        }
+    }
+
+    public class CMP : ISithAsset
+    {
+        public string Name { get; set; }
+        public Color32[] Palette { get; set; }
+        public List<byte[]> LightLevels { get; set; }
+        public List<byte[]> Transparency { get; set; }
+
+        public void Load(string name, Stream dataStream)
+        {
+            Name = name;
+            using var br = new BinaryReader(dataStream);
+            var cmpHdr   = br.ReadChars(4);
+            var version  = br.ReadInt32();
+            var flags    = br.ReadInt32();
+            br.ReadBytes(52); // Skip Tint and unknown parts
+
+            Palette = new Color32[256];
+            for (int i = 0; i < 256; i++)
+            {
+                Palette[i] = new Color32(br.ReadByte(), br.ReadByte(), br.ReadByte(), 255);
+            }
+
+            LightLevels = new List<byte[]>(64);
+            for (int i = 0; i < 64; i++)
+                LightLevels.Add(br.ReadBytes(256));
+
+            if ((flags & 0x04) != 0)
+            {
+                // Don't know how to parse
+            }
+
+            if ((flags & 0x01) != 0)
+            {
+                Transparency = new List<byte[]>(256);
+                for (int i = 0; i < 256; i++)
+                    Transparency.Add(br.ReadBytes(256));
+
+            }
+        }
+
+        public Color32 GetColor(byte val)
+        {
+            var col = Palette[val];
+            return col;
+        }
+    }
+}
diff --git a/Assets/Sith/Content/MAT.cs.meta b/Assets/Sith/Content/MAT.cs.meta
new file mode 100644
index 0000000..b61f087
--- /dev/null
+++ b/Assets/Sith/Content/MAT.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: e91d38c76a2132941b15eb18e87a30ee
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Scripts/_3DOLoader.cs b/Assets/Sith/Content/Model3DO.cs
similarity index 56%
rename from Assets/Scripts/_3DOLoader.cs
rename to Assets/Sith/Content/Model3DO.cs
index 1e76fbd..758333b 100644
--- a/Assets/Scripts/_3DOLoader.cs
+++ b/Assets/Sith/Content/Model3DO.cs
@@ -1,16 +1,16 @@
-using System;
-using System.Collections.Generic;
+using Assets.Sith.Utility;
+using System;
 using System.IO;
-using System.Linq;
-using System.Text;
 using UnityEngine;
 
-namespace Assets.Scripts
+namespace Assets.Sith.Content
 {
-    class _3DO
+    class Model3DO : ISithAsset
     {
+        public float Version;
         public string[] Materials { get; set; }
         public float Radius { get; set; }
+        public Vector3 InsertOffset { get; set; }
         public Geoset[] Geosets { get; set; }
         public string Name { get; set; }
         public HierarchyNode[] HierarchyNodes { get; set; }
@@ -31,13 +31,14 @@ private void ReadLine()
             }
         }
 
-        public void Load3DO(string fileName, Stream dataStream)
+        public void Load(string fileName, Stream dataStream)
         {
-            Name = Path.GetFileNameWithoutExtension(fileName);
+            Name = Path.GetFileName(fileName);
 
             string section = "";
             Geoset currentGeoset = null;
-            _3DOMesh currentMesh = null;
+            Mesh3DO currentMesh = null;
+            bool rgbColors = false;
 
             using (sr = new StreamReader(dataStream))
             {
@@ -49,6 +50,18 @@ public void Load3DO(string fileName, Stream dataStream)
                     {
                         section = _line;
                     }
+                    else if (section == "SECTION: HEADER")
+                    {
+                        if (_line.StartsWith("3DO"))
+                        {
+                            Version = float.Parse(_line.Split(' ')[1]);
+                            rgbColors = Version > 2.1;
+                            if (Version < 2.1f || Version > 2.3f)
+                            {
+                                throw new Exception("Unsupported 3DO file version: " + Version.ToString());
+                            }
+                        }
+                    }
                     else if (section == "SECTION: MODELRESOURCE")
                     {
                         if (_line.StartsWith("MATERIALS"))
@@ -57,6 +70,10 @@ public void Load3DO(string fileName, Stream dataStream)
                         }
                         else
                         {
+                            if (_args.Length == 1)
+                            {
+                                _args = _args[0].Split(':');
+                            }
                             var idx = int.Parse(_args[0].Replace(":", ""));
                             var name = _args[1];
                             Materials[idx] = name;
@@ -76,6 +93,13 @@ public void Load3DO(string fileName, Stream dataStream)
                                 Radius = value;
                             }
                         }
+                        else if (_line.StartsWith("INSERT OFFSET"))
+                        {
+                            var x = float.Parse(_args[2]);
+                            var y = float.Parse(_args[3]);
+                            var z = float.Parse(_args[4]);
+                            InsertOffset = new Vector3(x, y, z);
+                        }
                         else if (_line.StartsWith("GEOSETS"))
                         {
                             Geosets = new Geoset[int.Parse(_args[1])];
@@ -87,12 +111,12 @@ public void Load3DO(string fileName, Stream dataStream)
                         }
                         else if (_line.StartsWith("MESHES"))
                         {
-                            currentGeoset.Meshes = new _3DOMesh[int.Parse(_args[1])];
+                            currentGeoset.Meshes = new Mesh3DO[int.Parse(_args[1])];
                         }
                         else if (_line.StartsWith("MESH"))
                         {
                             var newMesh = int.Parse(_args[1]);
-                            currentMesh = currentGeoset.Meshes[newMesh] = new _3DOMesh();
+                            currentMesh = currentGeoset.Meshes[newMesh] = new Mesh3DO();
                         }
                         else if (_line.StartsWith("NAME"))
                         {
@@ -100,7 +124,8 @@ public void Load3DO(string fileName, Stream dataStream)
                         }
                         else if (_line.StartsWith("VERTICES"))
                         {
-                            currentMesh.Vertices = new Vector4[int.Parse(_args[1])];
+                            currentMesh.Vertices = new Vector3[int.Parse(_args[1])];
+                            currentMesh.VertColors = new Color[currentMesh.Vertices.Length];
                             for (int i = 0; i < currentMesh.Vertices.Length; i++)
                             {
                                 ReadLine();
@@ -108,8 +133,23 @@ public void Load3DO(string fileName, Stream dataStream)
                                 var x = float.Parse(_args[1]);
                                 var y = float.Parse(_args[2]);
                                 var z = float.Parse(_args[3]);
-                                var intensity = float.Parse(_args[4]);
-                                currentMesh.Vertices[idx] = new Vector4(x, y, z, intensity);
+                                currentMesh.Vertices[idx] = new Vector3(x, y, z);
+                                if (rgbColors)
+                                {
+                                    currentMesh.VertColors[idx] = new Color
+                                    (
+                                        Mathf.Clamp01(float.Parse(_args[4])),
+                                        Mathf.Clamp01(float.Parse(_args[5])),
+                                        Mathf.Clamp01(float.Parse(_args[5])),
+                                        Mathf.Clamp01(float.Parse(_args[6]))
+                                    );
+                                }
+                                else
+                                {
+                                    var intensity = Mathf.Clamp01(float.Parse(_args[4]));
+                                    currentMesh.VertColors[idx] = new Color(intensity, intensity, intensity, 1);
+                                }
+                                
                             }
                         }
                         else if (_line.StartsWith("TEXTURE VERTICES"))
@@ -143,21 +183,42 @@ public void Load3DO(string fileName, Stream dataStream)
                             for (int i = 0; i < currentMesh.Faces.Length; i++)
                             {
                                 ReadLine();
-                                var face = currentMesh.Faces[i] = new Face();
-                                var idx = int.Parse(_args[0].Replace(":", ""));
-                                face.Material = int.Parse(_args[1]);
-                                var type = _args[2];
-                                var geo = int.Parse(_args[3]);
-                                var light = int.Parse(_args[4]);
-                                var tex = int.Parse(_args[5]);
-                                var extraLight = float.Parse(_args[6]);
-                                var numVerts = int.Parse(_args[7]);
+                                int argsPos    = 0;
+                                var idx        = int.Parse(_args[argsPos++].Replace(":", ""));
+
+                                var face       = currentMesh.Faces[i] = new Face();
+                                face.Material  = int.Parse(_args[argsPos++]);
+                                face.FaceFlags = (JKL.FaceFlag)Convert.ToUInt32(_args[argsPos++], 16); // type aka face flags
+                                face.GeoMode   = (JKL.GeoMode)uint.Parse(_args[argsPos++]);
+                                face.LightMode = (JKL.LightMode)uint.Parse(_args[argsPos++]);
+                                var tex        = int.Parse(_args[argsPos++]);
+
+                                if (rgbColors)
+                                {
+                                    var extraLight = _args[argsPos++];
+                                    extraLight = extraLight.Trim(new[] { '(', ')' });
+                                    var rgb = extraLight.Split(new[]{ '/'});
+                                    face.ExtraLight = new Color
+                                    (
+                                        Mathf.Clamp01(float.Parse(rgb[0])),
+                                        Mathf.Clamp01(float.Parse(rgb[1])),
+                                        Mathf.Clamp01(float.Parse(rgb[2])),
+                                        Mathf.Clamp01(float.Parse(rgb[3]))
+                                    );
+                                }
+                                else
+                                {
+                                    var intensity = Mathf.Clamp01(float.Parse(_args[argsPos++]));
+                                    face.ExtraLight = new Color(intensity, intensity, intensity, 1);
+                                }
+
+                                var numVerts = int.Parse(_args[argsPos++]);
                                 face.Vertices = new VertexGroup[numVerts];
                                 for (int j = 0; j < numVerts * 2; j += 2)
                                 {
                                     var vIdx = j / 2;
-                                    var vvIdx = int.Parse(_args[8 + j + 0].Replace(",", ""));
-                                    var tvIdx = int.Parse(_args[8 + j + 1].Replace(",", ""));
+                                    var vvIdx = int.Parse(_args[argsPos + j + 0].Replace(",", ""));
+                                    var tvIdx = int.Parse(_args[argsPos + j + 1].Replace(",", ""));
                                     face.Vertices[vIdx] = new VertexGroup
                                     {
                                         VertexIndex = vvIdx,
@@ -188,37 +249,38 @@ public void Load3DO(string fileName, Stream dataStream)
                             for (int i = 0; i < HierarchyNodes.Length; i++)
                             {
                                 ReadLine();
-                                var idx = int.Parse(_args[0].Replace(":", ""));
-                                var flags = _args[1];
-                                var type = _args[2];
-                                var mesh = int.Parse(_args[3]);
-                                var parent = int.Parse(_args[4]);
-                                var child = int.Parse(_args[5]);
-                                var sibling = int.Parse(_args[6]);
+                                var idx         = int.Parse(_args[0].Replace(":", ""));
+                                var flags       = Convert.ToUInt32(_args[1], 16);
+                                var type        = Convert.ToUInt32(_args[2], 16);
+                                var mesh        = int.Parse(_args[3]);
+                                var parent      = int.Parse(_args[4]);
+                                var child       = int.Parse(_args[5]);
+                                var sibling     = int.Parse(_args[6]);
                                 var numChildren = int.Parse(_args[7]);
-                                var x = float.Parse(_args[8]);
-                                var y = float.Parse(_args[9]);
-                                var z = float.Parse(_args[10]);
-                                var pitch = float.Parse(_args[11]);
-                                var yaw = float.Parse(_args[12]);
-                                var roll = float.Parse(_args[13]);
-                                var pivotx = float.Parse(_args[14]);
-                                var pivoty = float.Parse(_args[15]);
-                                var pivotz = float.Parse(_args[16]);
-                                var hnodename = _args[17];
+                                var x           = float.Parse(_args[8]);
+                                var y           = float.Parse(_args[9]);
+                                var z           = float.Parse(_args[10]);
+                                var pitch       = float.Parse(_args[11]);
+                                var yaw         = float.Parse(_args[12]);
+                                var roll        = float.Parse(_args[13]);
+                                var pivotx      = float.Parse(_args[14]);
+                                var pivoty      = float.Parse(_args[15]);
+                                var pivotz      = float.Parse(_args[16]);
+                                var hnodename   = _args[17];
+
                                 HierarchyNodes[i] = new HierarchyNode
                                 {
-                                    Flags = flags,
-                                    Type = type,
-                                    Mesh = mesh,
-                                    Parent = parent,
-                                    Child = child,
-                                    Sibling = sibling,
+                                    Flags       = flags,
+                                    Type        = type,
+                                    Mesh        = mesh,
+                                    Parent      = parent,
+                                    Child       = child,
+                                    Sibling     = sibling,
                                     NumChildren = numChildren,
-                                    Translation = new Vector3(-x, z, -y),
-                                    Rotation = new Vector3(-pitch, roll, -yaw),
-                                    Pivot = new Vector3(-pivotx, pivotz, -pivoty),
-                                    NodeName = hnodename
+                                    Position    = new Vector3(x, y, z),
+                                    Orientation = Utils.FromMeshOrientation(pitch, yaw, roll),
+                                    Pivot       = new Vector3(pivotx, pivoty, pivotz),
+                                    NodeName    = hnodename
                                 };
                             }
                         }
@@ -230,25 +292,20 @@ public void Load3DO(string fileName, Stream dataStream)
 
     internal class HierarchyNode
     {
-        public string Flags { get; set; }
-        public string Type { get; set; }
+        public uint Flags { get; set; }
+        public uint Type { get; set; }
         public int Mesh { get; set; }
         public int Parent { get; set; }
         public int Child { get; set; }
         public int Sibling { get; set; }
         public int NumChildren { get; set; }
-        public Vector3 Translation { get; set; }
-        public Vector3 Rotation { get; set; }
+        public Vector3 Position { get; set; }
+        public Quaternion Orientation { get; set; }
         public Vector3 Pivot { get; set; }
         public string NodeName { get; set; }
         public Transform Transform { get; set; }
     }
 
-    class _3DOLoader
-    {
-
-    }
-
     internal class VertexGroup
     {
         public int VertexIndex { get; set; }
@@ -259,12 +316,17 @@ internal class Face
     {
         public VertexGroup[] Vertices { get; set; }
         public int Material { get; set; }
+        public JKL.FaceFlag FaceFlags;
+        public JKL.GeoMode GeoMode;
+        public JKL.LightMode LightMode;
+        public Color ExtraLight { get; set; }
     }
 
-    internal class _3DOMesh
+    internal class Mesh3DO
     {
         public float Radius { get; set; }
-        public Vector4[] Vertices { get; set; }
+        public Vector3[] Vertices { get; set; }
+        public Color[] VertColors { get; set; }
         public Vector2[] TextureVertices { get; set; }
         public Vector3[] VertexNormals { get; set; }
         public Face[] Faces { get; set; }
@@ -274,6 +336,6 @@ internal class _3DOMesh
 
     internal class Geoset
     {
-        public _3DOMesh[] Meshes { get; set; }
+        public Mesh3DO[] Meshes { get; set; }
     }
 }
diff --git a/Assets/Sith/Content/Model3DO.cs.meta b/Assets/Sith/Content/Model3DO.cs.meta
new file mode 100644
index 0000000..449c3b2
--- /dev/null
+++ b/Assets/Sith/Content/Model3DO.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 27c9c1d8dc3a55241911693d570526ea
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Scripts/PUPPETParser.cs b/Assets/Sith/Content/PUPPETParser.cs
similarity index 89%
rename from Assets/Scripts/PUPPETParser.cs
rename to Assets/Sith/Content/PUPPETParser.cs
index bc746e7..8389ef6 100644
--- a/Assets/Scripts/PUPPETParser.cs
+++ b/Assets/Sith/Content/PUPPETParser.cs
@@ -5,10 +5,11 @@
 using System.Linq;
 using System.Text;
 
-namespace Assets.Scripts
+namespace Assets.Sith.Content
 {
-    class Puppet
+    class Puppet : ISithAsset
     {
+        public string Name { get; set; }
         public Dictionary<int, Dictionary<string, PuppetSubMode>> Modes { get; set; }
     }
 
@@ -22,12 +23,13 @@ class PuppetSubMode
 
     static class PUPPETParser
     {
-        public static Puppet Parse(Stream dataStream)
+        public static Puppet Parse(string name, Stream dataStream)
         {
             using (var sr = new StreamReader(dataStream))
             {
                 var puppet = new Puppet
                 {
+                    Name  = name,
                     Modes = new Dictionary<int, Dictionary<string, PuppetSubMode>>()
                 };
 
@@ -81,7 +83,7 @@ private static string[] ReadArgs(this StreamReader sr)
             {
                 
                 var line = sr.ReadLine().ToLower().Trim();
-                if (line.StartsWith("#") || line == "")
+                if (line.StartsWith("#") || line.StartsWith("//") || line == "end" || line == "")
                     continue;
                 var args = line.Split(new[] { ' ', ',', '\t', '=' }, StringSplitOptions.RemoveEmptyEntries);
                 return args;
diff --git a/Assets/Scripts/PUPPETParser.cs.meta b/Assets/Sith/Content/PUPPETParser.cs.meta
similarity index 83%
rename from Assets/Scripts/PUPPETParser.cs.meta
rename to Assets/Sith/Content/PUPPETParser.cs.meta
index e1a60c6..a8f30bd 100644
--- a/Assets/Scripts/PUPPETParser.cs.meta
+++ b/Assets/Sith/Content/PUPPETParser.cs.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 241178f9e35e50d48915b6471bfbf43f
+guid: ecc515094a376084ba2ab87222742eef
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2
diff --git a/Assets/Sith/Content/Primitives.meta b/Assets/Sith/Content/Primitives.meta
new file mode 100644
index 0000000..a517562
--- /dev/null
+++ b/Assets/Sith/Content/Primitives.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: ef3620d0bab328040bb2ffa5bff94047
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Sith/Content/Primitives/RdFace.cs b/Assets/Sith/Content/Primitives/RdFace.cs
new file mode 100644
index 0000000..63af971
--- /dev/null
+++ b/Assets/Sith/Content/Primitives/RdFace.cs
@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Assets.Sith.Content.Primitives
+{
+    class RdFace
+    {
+    }
+}
diff --git a/Assets/Sith/Content/Primitives/RdFace.cs.meta b/Assets/Sith/Content/Primitives/RdFace.cs.meta
new file mode 100644
index 0000000..3439ce1
--- /dev/null
+++ b/Assets/Sith/Content/Primitives/RdFace.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 4b5418745dd77ed47adecb753e1f897d
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Sith/Content/SPR.cs b/Assets/Sith/Content/SPR.cs
new file mode 100644
index 0000000..369c840
--- /dev/null
+++ b/Assets/Sith/Content/SPR.cs
@@ -0,0 +1,89 @@
+using Assets.Sith.Utility;
+using System;
+using System.IO;
+using UnityEngine;
+
+namespace Assets.Sith.Content
+{    
+    public enum SPRType
+    {
+        FaceCamera     = 0,
+        RandomPosition = 1, // shift to random position if sprite is animating
+        Normal         = 2
+    }
+    class SPR : ISithAsset
+    {
+        public string Name { get; set; }
+        public string MatFile { get; private set; }
+        public SPRType Type { get; private set; }
+        public Vector2 Size { get; private set; }
+        public JKL.GeoMode GeoMode { get; private set; }
+        public JKL.LightMode LightMode { get; private set; }
+        public Color ExtraLight { get; private set; }
+        public Vector3 Offset { get; private set; }
+
+        private StreamReader sr;
+        private string _line;
+        private string[] _args;
+
+        private void ReadLine()
+        {
+            while (!sr.EndOfStream)
+            {
+                _line = sr.ReadLine();
+                if (_line.StartsWith("#") || _line.Trim() == "")
+                    continue;
+                _args = _line.Split(new[] { ' ', '\t' }, StringSplitOptions.RemoveEmptyEntries);
+                break;
+            }
+        }
+        public void Load(string fileName, Stream dataStream)
+        {
+            Name = Path.GetFileNameWithoutExtension(fileName);
+            using (sr = new StreamReader(dataStream))
+            {
+                ReadLine();
+                if (_args.Length != 11 && _args.Length != 14)
+                {
+                    throw new Exception($"Unknown or corrupted SPR file: {fileName}");
+                }
+
+                int pos     = 0;
+                MatFile     = _args[pos++];
+                Type        = (SPRType)int.Parse(_args[pos++]);
+                Size        = new Vector2(float.Parse(_args[pos++]), float.Parse(_args[pos++]));
+                GeoMode     = (JKL.GeoMode)uint.Parse(_args[pos++]);
+                LightMode   = (JKL.LightMode)uint.Parse(_args[pos++]);
+                var texMode = int.Parse(_args[pos++]);
+
+                if (_args.Length == 11)
+                {
+                    var intensity = Mathf.Clamp01(float.Parse(_args[pos++]));
+                    ExtraLight = new Color(intensity, intensity, intensity);
+                }
+                else
+                {
+                    ExtraLight = new Color
+                    (
+                        Mathf.Clamp01(float.Parse(_args[pos++])),
+                        Mathf.Clamp01(float.Parse(_args[pos++])),
+                        Mathf.Clamp01(float.Parse(_args[pos++])),
+                        Mathf.Clamp01(float.Parse(_args[pos++]))
+                    );
+                }
+
+                Offset = new Vector3
+                (
+                    float.Parse(_args[pos++]),
+                    float.Parse(_args[pos++]),
+                    float.Parse(_args[pos++])
+                );
+
+                if (Type > SPRType.Normal || Size.x <= 0 || Size.y <= 0)
+                {
+                    throw new Exception($"Bad sprite parameter in SPR file: {fileName}");
+                }
+            }
+        }
+    }
+}
diff --git a/Assets/Sith/Content/SPR.cs.meta b/Assets/Sith/Content/SPR.cs.meta
new file mode 100644
index 0000000..22472a3
--- /dev/null
+++ b/Assets/Sith/Content/SPR.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 68b53d922bd45354a8b1cabc09ac770f
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Scripts/SmackerPlayer.cs b/Assets/Sith/Content/SmackerPlayer.cs
similarity index 99%
rename from Assets/Scripts/SmackerPlayer.cs
rename to Assets/Sith/Content/SmackerPlayer.cs
index 838dd65..8c4941d 100644
--- a/Assets/Scripts/SmackerPlayer.cs
+++ b/Assets/Sith/Content/SmackerPlayer.cs
@@ -1,11 +1,9 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Runtime.InteropServices;
-using System.Text;
 using UnityEngine;
 
-namespace Assets.Scripts
+namespace Assets.Sith.Content
 {
     class SmackerPlayer : IDisposable
     {
diff --git a/Assets/Scripts/SmackerPlayer.cs.meta b/Assets/Sith/Content/SmackerPlayer.cs.meta
similarity index 71%
rename from Assets/Scripts/SmackerPlayer.cs.meta
rename to Assets/Sith/Content/SmackerPlayer.cs.meta
index 69cfbba..abbaf65 100644
--- a/Assets/Scripts/SmackerPlayer.cs.meta
+++ b/Assets/Sith/Content/SmackerPlayer.cs.meta
@@ -1,7 +1,5 @@
 fileFormatVersion: 2
-guid: 445c970dc1abc1949b7f164b2f2804bf
-timeCreated: 1520033346
-licenseType: Free
+guid: c004ff4b9e019694fa442b1a4af64cdf
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2
diff --git a/Assets/Sith/Content/SmackerPlayerRenderer.cs b/Assets/Sith/Content/SmackerPlayerRenderer.cs
new file mode 100644
index 0000000..4bc365f
--- /dev/null
+++ b/Assets/Sith/Content/SmackerPlayerRenderer.cs
@@ -0,0 +1,54 @@
+using System.Collections;
+using System.Collections.Generic;
+using System.IO;
+using Assets.Sith;
+using UnityEngine;
+using UnityEngine.UI;
+
+namespace Assets.Sith.Content
+{
+    [RequireComponent(typeof(RawImage), typeof(AudioSource))]
+    public class SmackerPlayerRenderer : MonoBehaviour
+    {
+        public string SMKPath;
+
+        private RawImage _rawImage;
+        private SmackerPlayer _player;
+        private AudioSource _audioSource;
+
+        // Use this for initialization
+        void Start()
+        {
+            var buffer =
+                File.ReadAllBytes(SMKPath);
+
+            _player = new SmackerPlayer(buffer);
+
+            _rawImage = GetComponent<RawImage>();
+            _rawImage.texture = _player.Texture;
+
+            _audioSource = GetComponent<AudioSource>();
+            _audioSource.clip = _player.AudioClip;
+            _audioSource.Play();
+
+        }
+
+        private double _passedMs;
+
+        // Update is called once per frame
+        void Update()
+        {
+            _passedMs += Time.deltaTime * 1000;
+            if (_passedMs >= _player.MillisecondsPerFrame)
+            {
+                _passedMs = _passedMs - _player.MillisecondsPerFrame;
+                _player.RenderVideo();
+            }
+        }
+
+        void OnDestroy()
+        {
+            _player.Dispose();
+        }
+    }
+}
diff --git a/Assets/Scripts/SmackerPlayerRenderer.cs.meta b/Assets/Sith/Content/SmackerPlayerRenderer.cs.meta
similarity index 71%
rename from Assets/Scripts/SmackerPlayerRenderer.cs.meta
rename to Assets/Sith/Content/SmackerPlayerRenderer.cs.meta
index c4fa186..6af439b 100644
--- a/Assets/Scripts/SmackerPlayerRenderer.cs.meta
+++ b/Assets/Sith/Content/SmackerPlayerRenderer.cs.meta
@@ -1,7 +1,5 @@
 fileFormatVersion: 2
-guid: ac71d8c1ad69bfe47b1812599389fafe
-timeCreated: 1520032750
-licenseType: Free
+guid: 07fc1328b017f1b40843e5954e21862c
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2
diff --git a/Assets/Sith/Game.meta b/Assets/Sith/Game.meta
new file mode 100644
index 0000000..c016deb
--- /dev/null
+++ b/Assets/Sith/Game.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: a871e4618efb32a45b588d661b15c8cd
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Sith/Game/Player.meta b/Assets/Sith/Game/Player.meta
new file mode 100644
index 0000000..6d72260
--- /dev/null
+++ b/Assets/Sith/Game/Player.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: bdb7fae362f86a640aefa28ddb89a106
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Sith/Game/Player/MovePlayer.cs b/Assets/Sith/Game/Player/MovePlayer.cs
new file mode 100644
index 0000000..e04047c
--- /dev/null
+++ b/Assets/Sith/Game/Player/MovePlayer.cs
@@ -0,0 +1,60 @@
+using Assets.Sith.Utility;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+[RequireComponent(typeof(MoveSlideCapsule))]
+public class MovePlayer : MonoBehaviour
+{
+
+    public float Friction     = 0.1f;
+    public float Acceleration = 5;
+    public float MaxVelocity  = 5;
+    public float JumpVelocity = 5;
+
+    private MoveSlideCapsule _moveSlide;
+    private Camera _camera;
+
+    // Use this for initialization
+    void Start()
+    {
+        _moveSlide = GetComponent<MoveSlideCapsule>();
+        _camera = GetComponentInChildren<Camera>();
+    }
+
+    // Update is called once per frame
+    void Update()
+    {
+        if (_moveSlide.IsGrounded)
+        {
+            var horizontal = Input.GetAxis("Horizontal");
+            var vertical = Input.GetAxis("Vertical");
+
+            if (horizontal == 0 && vertical == 0)
+            {
+                _moveSlide.Velocity *= Mathf.Pow(Friction, Time.deltaTime);
+            }
+            else
+            {
+                var acceleration = Acceleration * horizontal * Vector3.right + Acceleration * vertical * Vector3.forward;
+                var newVelocity  = _moveSlide.Velocity + acceleration * Time.deltaTime;
+
+                var maxVelocity     = Input.GetButton("Run") ? MaxVelocity * 2.0f : MaxVelocity;
+                var realVelY        = newVelocity.y;
+                newVelocity.y       = 0;
+                newVelocity         = Vector3.ClampMagnitude(newVelocity, maxVelocity);
+                newVelocity.y       = realVelY;
+                _moveSlide.Velocity = newVelocity;
+            }
+        }
+
+        if (Input.GetButton("Jump"))
+        {
+            _moveSlide.Velocity += Vector3.up * JumpVelocity;
+        }
+        else if (Input.GetButton("Crouch"))
+        {
+            _moveSlide.Velocity += Vector3.down * JumpVelocity;
+        }
+    }
+}
diff --git a/Assets/Scripts/MovePlayer.cs.meta b/Assets/Sith/Game/Player/MovePlayer.cs.meta
similarity index 100%
rename from Assets/Scripts/MovePlayer.cs.meta
rename to Assets/Sith/Game/Player/MovePlayer.cs.meta
diff --git a/Assets/Scripts/MoveSlideCapsule.cs b/Assets/Sith/Game/Player/MoveSlideCapsule.cs
similarity index 89%
rename from Assets/Scripts/MoveSlideCapsule.cs
rename to Assets/Sith/Game/Player/MoveSlideCapsule.cs
index 04fb141..e9eb041 100644
--- a/Assets/Scripts/MoveSlideCapsule.cs
+++ b/Assets/Sith/Game/Player/MoveSlideCapsule.cs
@@ -11,6 +11,7 @@ public class MoveSlideCapsule : MonoBehaviour
     public float SteepestSlope = 20;
     public Vector3 Velocity;
     public bool IsGrounded;
+    public bool UseGravity = true;
 
     // Use this for initialization
     void Start()
@@ -23,17 +24,17 @@ void Update()
     {
         if (IsGrounded)
             _worldVelocity = transform.TransformVector(Velocity);
-        _worldVelocity += Physics.gravity * Time.deltaTime;
+        _worldVelocity += (UseGravity ? Physics.gravity : Velocity) * Time.deltaTime;
 
         var newPos = transform.position + _worldVelocity * Time.deltaTime;
 
-        var halfHeight = _collider.height / 2;
+        var halfHeight = _collider.height;
         var wasGrounded = IsGrounded;
         IsGrounded = false;
 
         if (Velocity.y <= 0)
         {
-            var rayLength = Mathf.Max(halfHeight + LegHeight * 2, _worldVelocity.y);
+            var rayLength = Mathf.Max(halfHeight + LegHeight, _worldVelocity.y);
             RaycastHit hitInfo;
             if (Physics.Raycast(newPos, Vector3.down, out hitInfo, rayLength))
             {
@@ -42,7 +43,6 @@ void Update()
                     newPos.y = hitInfo.point.y + halfHeight + LegHeight;
 
                     var angle = Vector3.Angle(Vector3.up, hitInfo.normal);
-                    // Debug.Log("Surface angle = " + angle);
                     if (angle < SteepestSlope)
                     {
                         IsGrounded = true;
@@ -63,7 +63,7 @@ void Update()
 
         var velocityDirection = Vector3.zero;
 
-        while (true)
+        //while (true)// <- Bug; can enter infinite loop
         {
             var colliders = Physics.OverlapCapsule(capsuleBottom, capsuleTop, _collider.radius, 1);
             var hit = false;
@@ -80,8 +80,8 @@ void Update()
                     hit = true;
                 }
             }
-            if(!hit)
-                break;
+            //if(!hit)
+              //  break;
         }
 
         var velocityDisplacement =
diff --git a/Assets/Scripts/MoveSlideCapsule.cs.meta b/Assets/Sith/Game/Player/MoveSlideCapsule.cs.meta
similarity index 100%
rename from Assets/Scripts/MoveSlideCapsule.cs.meta
rename to Assets/Sith/Game/Player/MoveSlideCapsule.cs.meta
diff --git a/Assets/Sith/Game/Player/PlayerMouselook.cs b/Assets/Sith/Game/Player/PlayerMouselook.cs
new file mode 100644
index 0000000..5a8c3ef
--- /dev/null
+++ b/Assets/Sith/Game/Player/PlayerMouselook.cs
@@ -0,0 +1,108 @@
+using System;
+using UnityEngine;
+using System.Collections;
+using Assets.Sith.Utility;
+using Assets.Sith.Gui;
+using Assets.Sith.Game.Thing;
+
+public class PlayerMouselook : MonoBehaviour {
+    private Camera _camera;
+    private Bounds _bounds;
+    private SithThing _thing;
+
+    public float LookSensitivity = 1.0f;
+    public bool FirstPerson = true;
+
+    [ConditionalHide("FirstPerson", true)]
+    public Assets.Sith.Utility.Range PitchRange = new(-50, 70);
+
+    [ConditionalHide("FirstPerson", true, true)]
+    public Vector3 CameraOffset = new(0.0f, 0.65f, -2.0f);
+    [ConditionalHide("FirstPerson", true, true)]
+    public Vector3 CameraLookOffset = new (0.2f, 0.2f, 0.0f);
+    [ConditionalHide("FirstPerson", true, true)]
+    public float CameraFadeSpeed = 5.0f;
+
+    // Use this for initialization
+    void Start ()
+    {
+        _bounds = GetComponent<Collider>().bounds;
+        Cursor.visible = false;
+        Cursor.lockState = CursorLockMode.Locked;
+        _camera = GetComponentInChildren<Camera>();
+        _thing = GetComponent<SithThing>();
+    }
+
+    float previousOpacityInterp = 0f;
+    // Update is called once per frame
+    void Update()
+    {
+        var horizDeltaAngle = Input.GetAxis("Mouse X") * LookSensitivity;
+        var newHorizAngle = transform.localEulerAngles.y + horizDeltaAngle;
+        transform.localRotation = Quaternion.Euler(0, newHorizAngle, 0);
+        if (_camera)
+        {
+            if (FirstPerson)
+            {
+                var vertDeltaAngle = Input.GetAxis("Mouse Y") * LookSensitivity;
+                var newVertAngle = _camera.transform.localEulerAngles.x - vertDeltaAngle;
+                newVertAngle = (newVertAngle > 180) ? newVertAngle - 360 : newVertAngle;
+                newVertAngle = Mathf.Clamp(newVertAngle, PitchRange.Min, PitchRange.Max);
+                _camera.transform.localPosition = new Vector3(0, _bounds.size.y - 0.15f, 0.10f);
+                _camera.transform.transform.rotation = Utils.ToThingOrientation(Quaternion.Euler(newVertAngle, newHorizAngle, 0));
+            }
+            else
+            {
+                var fadeTime = CameraFadeSpeed * Time.deltaTime;
+
+                var offset = CameraOffset;
+                var origin = transform.position + new Vector3(0, offset.y, 0);
+                var maxdist = Mathf.Abs(offset.z);
+                var lookAtPlayer = true;
+                if (Physics.SphereCast(origin, _bounds.extents.z - 0.1f, transform.forward * -1, out RaycastHit hitInfo, maxdist))
+                {
+                    Debug.DrawLine(origin, hitInfo.point);
+                    var distance   = (hitInfo.distance - maxdist);
+                    var correction = Vector3.Normalize(offset) * distance;
+                    offset += correction;
+
+                    lookAtPlayer = hitInfo.distance >= 1.1f;
+                    if (!lookAtPlayer)
+                    {
+                        if (_thing.opacity != 0.0f)
+                        {
+                            previousOpacityInterp += fadeTime;
+                            _thing.opacity = Mathf.Lerp(1.0f, 0.0f, previousOpacityInterp);
+                        }
+                        else
+                            previousOpacityInterp = 0.0f;
+
+                    }
+                    else if (_thing.opacity != 1.0f)
+                    {
+                        previousOpacityInterp += fadeTime;
+                        _thing.opacity = _thing.opacity = Mathf.Lerp(0.0f, 1.0f, previousOpacityInterp);
+                    }
+                    else
+                        previousOpacityInterp = 0.0f;
+                }
+                else
+                {
+                    if (_thing.opacity != 1.0f)
+                    {
+                        previousOpacityInterp += fadeTime;
+                        _thing.opacity = _thing.opacity = Mathf.Lerp(0.0f, 1.0f, previousOpacityInterp);
+                    }
+                    else
+                        previousOpacityInterp = 0.0f;
+                }
+
+                _camera.transform.localPosition = Vector3.Lerp(_camera.transform.localPosition, offset, fadeTime);
+                if (lookAtPlayer)
+                {
+                    _camera.transform.LookAt(transform.position + CameraLookOffset);
+                }
+            }
+        }
+    }
+}
diff --git a/Assets/PlayerController/PlayerMouselook.cs.meta b/Assets/Sith/Game/Player/PlayerMouselook.cs.meta
similarity index 100%
rename from Assets/PlayerController/PlayerMouselook.cs.meta
rename to Assets/Sith/Game/Player/PlayerMouselook.cs.meta
diff --git a/Assets/Sith/Game/Player/PlayerMovement.cs b/Assets/Sith/Game/Player/PlayerMovement.cs
new file mode 100644
index 0000000..ec0eb9b
--- /dev/null
+++ b/Assets/Sith/Game/Player/PlayerMovement.cs
@@ -0,0 +1,154 @@
+using System.Collections;
+using UnityEngine;
+
+namespace Assets.Sith.Game.Player
+{
+    public class PlayerMovement : MonoBehaviour
+    {
+        public float Speed      = 10.0f;
+        public float JumpSpeed  = 6.0f;
+        public float MaxSlope   = 45f;
+       // public float StepHeight = 0.41f;
+        public float StepSmooth = 20f;
+
+        private Rigidbody _rb;
+        private float _groundDistance = 0.0f;
+        private bool _isGrounded      = false;
+        private CapsuleCollider _collider;
+
+        private void Start()
+        {
+            _groundDistance = GetComponent<Collider>().bounds.extents.y;
+            _collider       = GetComponent<CapsuleCollider>();
+            _rb             = GetComponent<Rigidbody>();
+        }
+
+        //private bool IsGrounded()
+        //{
+        //    return Physics.Raycast(transform.position, Vector3.down, GroundDistance);
+        //}
+
+        //void Update()
+        //{
+        //    //Movement = new Vector3(Input.GetAxis("Horizontal"), PlayerBody.velocity.y, Input.GetAxis("Vertical"));
+
+        //    //Vector3 move = transform.TransformDirection(Movement) * Speed;
+        //    //PlayerBody.velocity = new Vector3(move.x, PlayerBody.velocity.y, move.z);
+        //    //if (Input.GetButton("Jump") && IsGrounded())
+        //    //{
+        //    //    PlayerBody.AddForce(Vector3.up * JumpForce, ForceMode.Impulse);
+        //    //    //PlayerBody.velocity.y = JumpForce;
+        //    //}
+
+        //    _rb.velocity += Physics.gravity  * Time.deltaTime * 2 ;
+        //}
+
+        private void CheckGrounded()
+        {
+            _isGrounded    = false;
+            float height   = Mathf.Max(_collider.radius * 2f, _collider.height);
+            Vector3 bottom = transform.TransformPoint(_collider.center - Vector3.up * height / 2f);
+            float radius   = transform.TransformVector(_collider.radius, 0f, 0f).magnitude;
+            Ray ray        = new(bottom + transform.up * 0.01f, -transform.up);
+            if (Physics.Raycast(ray, out RaycastHit hit, radius * 5f))
+            {
+                float normalAngle = Vector3.Angle(hit.normal, transform.up);
+                if (normalAngle < MaxSlope)
+                {
+                    float maxDist = radius / Mathf.Cos(Mathf.Deg2Rad * normalAngle) - radius + .02f;
+                    if (hit.distance < maxDist)
+                        _isGrounded = true;
+                }
+            }
+        }
+
+        private void Move()
+        {
+            if (_isGrounded)
+            { 
+                Vector3 direction = new Vector3(Input.GetAxis("Horizontal"), 0, Input.GetAxis("Vertical"));
+                var acc = Input.GetButton("Run") ? Speed * 1.5f : Speed;
+                Vector3 vel = transform.TransformDirection(direction) * acc;
+                _rb.AddForce(vel * Time.fixedDeltaTime,  ForceMode.VelocityChange);
+            }
+        }
+
+        void Jump()
+        {
+            if (_isGrounded)
+            {
+                //_rb.velocity += transform.up * JumpSpeed;
+                _rb.AddForce(transform.up * JumpSpeed, ForceMode.VelocityChange);
+            }
+        }
+
+        void StepClimb()
+        {
+            if (!_isGrounded || _rb.velocity.z < 0.01f) return;
+            float StepHeight = 0.50f;
+            float height = Mathf.Max(_collider.radius * 2f, _collider.height);
+            Vector3 lowerPos = transform.TransformPoint(_collider.center - Vector3.up * height / 2f);
+            lowerPos.y += 0.21f;
+            Vector3 higherPos = new (lowerPos.x, lowerPos.y + StepHeight + 0.2f, lowerPos.z);
+
+            if (Physics.Raycast(lowerPos, transform.forward, out RaycastHit hit, _collider.radius + 0.1f))
+            {
+                Debug.DrawLine(lowerPos, hit.point);
+                if (Physics.Raycast(higherPos, transform.forward, out hit, _collider.radius + 10.0f))
+                {
+                    Debug.DrawLine(higherPos, hit.point);
+                    var hp = hit.point;
+                    //_rb.AddForce(Vector3.up * 5, ForceMode.VelocityChange);
+                    if (Physics.Raycast(hit.point, Vector3.up *-1, out hit, StepHeight))
+                    {
+
+                        var np = new Vector3(transform.position.x, hit.point.y + 0.05f, transform.position.z + _collider.radius * 1.5f);
+                        Debug.DrawLine(hp, np);
+                        _rb.position = np;
+                        //_rb.position += new Vector3(0f, height * 0.5f, _collider.radius + 0.1f);
+                        //_rb.position = new Vector3(_rb.position.x, hit.point.y, _rb.position.z);
+                    }
+                    //_rb.velocity += 2 * Speed * Time.fixedDeltaTime * Vector3.forward;
+                    //_rb.AddForce(transform.forward, ForceMode.VelocityChange );
+                }
+            }
+
+            //if (Physics.Raycast(lowerPos, transform.TransformDirection(1.5f, 0, 1), out hit, 0.1f))
+            //{
+            //    if (!Physics.Raycast(higherPos, transform.TransformDirection(1.5f, 0, 1), out hit, 0.2f))
+            //    {
+            //        _rb.position -= new Vector3(0f, -StepSmooth * Time.fixedDeltaTime, 0f);
+            //    }
+            //}
+
+            //if (Physics.Raycast(lowerPos, transform.TransformDirection(-1.5f, 0, 1), out hit, 0.1f))
+            //{
+            //    if (!Physics.Raycast(higherPos, transform.TransformDirection(-1.5f, 0, 1), out hit, 0.2f))
+            //    {
+            //        _rb.position -= new Vector3(0f, -StepSmooth * Time.fixedDeltaTime, 0f);
+            //    }
+            //}
+        }
+
+        //void Update()
+        //{
+        //    float hMove = Input.GetAxisRaw("Horizontal");
+        //    float vMove = Input.GetAxisRaw("Vertical");
+        //    MoveDir = (hMove * transform.right + vMove * transform.forward + new Vector3(0, PlayerBody.velocity.y, 0)).normalized;
+        //}
+
+        void FixedUpdate()
+        {
+            CheckGrounded();
+            Move();
+            StepClimb();
+
+            if (Input.GetButton("Jump"))
+            {
+                Jump();
+            }
+
+            _rb.AddForce(Physics.gravity, ForceMode.Acceleration);
+        }
+    }
+}
\ No newline at end of file
diff --git a/Assets/PlayerController/PlayerMovement.cs.meta b/Assets/Sith/Game/Player/PlayerMovement.cs.meta
similarity index 71%
rename from Assets/PlayerController/PlayerMovement.cs.meta
rename to Assets/Sith/Game/Player/PlayerMovement.cs.meta
index e7df045..2924622 100644
--- a/Assets/PlayerController/PlayerMovement.cs.meta
+++ b/Assets/Sith/Game/Player/PlayerMovement.cs.meta
@@ -1,7 +1,5 @@
 fileFormatVersion: 2
-guid: 10ae90e3807763346a117c280073c4b4
-timeCreated: 1519685861
-licenseType: Free
+guid: daa4d7c65f1c9da4c83860fb81def965
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2
diff --git a/Assets/Sith/Game/Player/PlayerMovementCharacter.cs b/Assets/Sith/Game/Player/PlayerMovementCharacter.cs
new file mode 100644
index 0000000..863fc8a
--- /dev/null
+++ b/Assets/Sith/Game/Player/PlayerMovementCharacter.cs
@@ -0,0 +1,99 @@
+using UnityEngine;
+using System.Collections;
+
+// This script moves the character controller forward
+// and sideways based on the arrow keys.
+// It also jumps when pressing space.
+// Make sure to attach a character controller to the same game object.
+// It is recommended that you make only one call to Move or SimpleMove per frame.
+
+public class PlayerMovementCharacter : MonoBehaviour
+{
+    private CharacterController controller;
+    private Vector3 playerVelocity;
+    private bool groundedPlayer;
+    public float AirDrag = 0.5f;
+    public float MaxThrust = 2.0f;
+    public float ExtraSpeed = 0.0f;
+    public float JumpSpeed = 1.2f;
+    public float Gravity = -9.81f;
+    public float SurfaceDrag = 0.3f;
+
+    private void Start()
+    {
+        controller = gameObject.GetComponent<CharacterController>();
+    }
+
+    void ApplyDrag(ref Vector3 vel, float drag, float mag, float msDeltaTime)
+    {
+        if(mag == 0.0f || vel.magnitude >= mag)
+        {
+            if (drag != 0.0f)
+            {
+                var ddrag = drag * msDeltaTime;
+                if (ddrag > 1.0f)
+                    ddrag = 1.0f;
+
+                vel += vel * -ddrag;
+                if ((vel.x < 0.0 ? -vel.x : vel.x) < 0.0000099999997f)
+                   vel.x = 0.0f;
+
+                if ((vel.y < 0.0 ? -vel.y : vel.y) < 0.0000099999997f)
+                    vel.y = 0.0f;
+
+                if ((vel.z < 0.0 ? -vel.z : vel.z) < 0.0000099999997f)
+                    vel.z = 0.0f;
+            }
+        }
+        else
+        {
+            vel = Vector3.zero;
+        }
+    }
+
+    void DoPlayerInAirPhysics()
+    {
+
+    }
+
+    void FixedUpdate()
+    {
+        groundedPlayer = controller.isGrounded;
+        if (groundedPlayer && playerVelocity.y < 0)
+        {
+            playerVelocity.y = 0f;
+        }
+
+        Vector3 move = transform.TransformVector(new (Input.GetAxis("Horizontal"), 0, Input.GetAxis("Vertical")));
+        var speed = Input.GetButton("Run") ? MaxThrust * 1.5f : MaxThrust;
+        playerVelocity = speed * Time.deltaTime * move;
+
+        //if (move != Vector3.zero)
+        //{
+        //    gameObject.transform.forward = move;
+        //}
+
+        // Changes the height position of the player..
+        if (Input.GetButtonDown("Jump") && groundedPlayer)
+        {
+            playerVelocity.y += JumpSpeed;///Mathf.Sqrt(jumpHeight * -3.0f * gravityValue);
+        }
+
+        groundedPlayer = (Vector3.Angle(Vector3.up, hitNormal) <= controller.slopeLimit);
+        if (!groundedPlayer)
+        {
+            playerVelocity.x = (1f - hitNormal.y) * hitNormal.x * (1f - SurfaceDrag);
+            playerVelocity.z = (1f - hitNormal.y) * hitNormal.z * (1f - SurfaceDrag);
+        }
+
+        playerVelocity.y += Gravity * Time.deltaTime;
+        //ApplyDrag(ref playerVelocity, AirDrag, 0.0f, Time.deltaTime);
+        controller.Move(playerVelocity);
+    }
+
+    Vector3 hitNormal;
+    void OnControllerColliderHit(ControllerColliderHit hit)
+    {
+        hitNormal = hit.normal;
+    }
+}
\ No newline at end of file
diff --git a/Assets/Sith/Game/Player/PlayerMovementCharacter.cs.meta b/Assets/Sith/Game/Player/PlayerMovementCharacter.cs.meta
new file mode 100644
index 0000000..1394262
--- /dev/null
+++ b/Assets/Sith/Game/Player/PlayerMovementCharacter.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 088c417da8b615c46a1ff52959c3b788
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Sith/Game/Sith.cs b/Assets/Sith/Game/Sith.cs
new file mode 100644
index 0000000..2b76d61
--- /dev/null
+++ b/Assets/Sith/Game/Sith.cs
@@ -0,0 +1,68 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.IO;
+using System.Linq;
+
+using Assets.Sith.Content;
+using Assets.Sith.Content.JKL;
+using Assets.Sith.Game.World;
+using Assets.Sith.Utility;
+using Assets.Sith.Vfs;
+using UnityEngine;
+using Material = UnityEngine.Material;
+
+
+namespace Assets.Sith.Game
+{
+    public sealed class SithAssets : Singleton<AssetStore> { }
+
+    public class Sith : MonoBehaviour
+    {
+        //public Texture2D Atlas;
+        //public Material StandardMaterial;
+
+        [Tooltip("JKL or NDY level to load.")]
+        public string Level;
+        public string GamePath;
+
+        void Start()
+        {
+            //RenderSettings.skybox = null;
+            //RenderSettings.sun = null;
+            //RenderSettings.ambientLight = Color.white;
+
+            SithAssets.Instance.AddSystemPath(GamePath);
+            SithAssets.Instance.AddSystemPath(Path.Combine(GamePath, "Resource"));
+            SithAssets.Instance.AddSystemPath(Path.Combine(GamePath, "Extracted"));
+
+            // JKDF2
+            SithAssets.Instance.AddGob(Path.Combine(GamePath, "Resource\\Res1hi.gob"));
+            SithAssets.Instance.AddGob(Path.Combine(GamePath, "Resource\\Res2.gob"));
+            SithAssets.Instance.AddGob(Path.Combine(GamePath, "Episode\\JK1.GOB"));
+            SithAssets.Instance.AddGob(Path.Combine(GamePath, "Episode\\JK1CTF.GOB"));
+            SithAssets.Instance.AddGob(Path.Combine(GamePath, "Episode\\JK1MP.GOB"));
+
+            // MOTS
+            SithAssets.Instance.AddGob(Path.Combine(GamePath, "Resource\\JKMRES.GOO"));
+            SithAssets.Instance.AddGob(Path.Combine(GamePath, "Resource\\JKMsndLO.goo"));
+            SithAssets.Instance.AddGob(Path.Combine(GamePath, "Episode\\JKM.GOO"));
+            SithAssets.Instance.AddGob(Path.Combine(GamePath, "Episode\\JKM_KFY.GOO"));
+            SithAssets.Instance.AddGob(Path.Combine(GamePath, "Episode\\JKM_MP.GOO"));
+            SithAssets.Instance.AddGob(Path.Combine(GamePath, "Episode\\Jkm_saber.GOO"));
+
+            // IJIM
+            SithAssets.Instance.AddGob(Path.Combine(GamePath, "Resource\\cd1.gob"));
+            SithAssets.Instance.AddGob(Path.Combine(GamePath, "Resource\\cd2.gob"));
+
+            if (!string.IsNullOrEmpty(Level))
+            {
+                var go = new GameObject("SithWorld");
+                var world = go.AddComponent<SithWorld>();
+
+                bool loadNdy = Path.GetExtension(Level).ToLower() == ".ndy";
+                world.Load((loadNdy ? @"ndy\" : @"jkl\") + Level);
+            }
+        }
+    }
+}
diff --git a/Assets/Scripts/Sith.cs.meta b/Assets/Sith/Game/Sith.cs.meta
similarity index 100%
rename from Assets/Scripts/Sith.cs.meta
rename to Assets/Sith/Game/Sith.cs.meta
diff --git a/Assets/Sith/Game/Thing.meta b/Assets/Sith/Game/Thing.meta
new file mode 100644
index 0000000..426b25a
--- /dev/null
+++ b/Assets/Sith/Game/Thing.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 79f84dbd09e555245a7b1e1188710252
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Sith/Game/Thing/SithThing.cs b/Assets/Sith/Game/Thing/SithThing.cs
new file mode 100644
index 0000000..2acb2f6
--- /dev/null
+++ b/Assets/Sith/Game/Thing/SithThing.cs
@@ -0,0 +1,55 @@
+using Assets.Sith.Gui;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using UnityEngine;
+
+namespace Assets.Sith.Game.Thing
+{
+    [SelectionBase, DisallowMultipleComponent]
+    public class SithThing : MonoBehaviour
+    {
+        public string Type { get => _type; set { _type = value; } }
+        public int Sector { get => _sector; set { _sector = value; } }
+
+        [ReadOnly]
+        [SerializeField]
+        private string _type;
+
+        [ReadOnly]
+        [SerializeField]
+        private int _sector;
+
+        [Range(0.0f, 1.0f)]
+        public float opacity = 1.0f;
+        private float _thingOpacity = 1.0f;
+        private float _update = 1.1f;
+
+        void Update()
+        {
+            _update += Time.deltaTime;
+            if (_update > 1.0f)
+            {
+                _update = 0.0f;
+            }
+
+            if (_thingOpacity != opacity)
+            {
+                var renderers = GetComponentsInChildren<Renderer>();
+                foreach (var r in renderers)
+                {
+                    //var mats = new Material[rend.materials.Length];
+                    for (var j = 0; j < r.materials.Length; j++)
+                    {
+                        var mat = r.materials[j];
+                        mat.SetFloat("_Alpha", opacity);
+                        mat.renderQueue = Mathf.Clamp(mat.renderQueue + (opacity < 1.0 ? + 1000 : -1000), 3000, 4000);
+                    }
+                }
+                _thingOpacity = opacity;
+            }
+        }
+    }
+}
diff --git a/Assets/Sith/Game/Thing/SithThing.cs.meta b/Assets/Sith/Game/Thing/SithThing.cs.meta
new file mode 100644
index 0000000..b4486fd
--- /dev/null
+++ b/Assets/Sith/Game/Thing/SithThing.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 6a2fb87730534ac43b40f9ea33b0dfa5
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Sith/Game/Thing/ThingGizmo.cs b/Assets/Sith/Game/Thing/ThingGizmo.cs
new file mode 100644
index 0000000..6970b81
--- /dev/null
+++ b/Assets/Sith/Game/Thing/ThingGizmo.cs
@@ -0,0 +1,26 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using UnityEngine;
+
+namespace Assets.Sith.Game.Thing
+{
+    [DisallowMultipleComponent]
+    public class ThingGizmo : MonoBehaviour
+    {
+        public bool show = true;
+        public Vector3 size = new Vector3(0.25f, 0.25f, 0.25f);
+        public Color color = Color.white;
+
+        void OnDrawGizmos()
+        {
+            if (show)
+            {
+                Gizmos.color = color;
+                Gizmos.DrawCube(transform.position, size);
+            }
+        }
+    }
+}
diff --git a/Assets/Sith/Game/Thing/ThingGizmo.cs.meta b/Assets/Sith/Game/Thing/ThingGizmo.cs.meta
new file mode 100644
index 0000000..fa9c0fa
--- /dev/null
+++ b/Assets/Sith/Game/Thing/ThingGizmo.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 699efab1c99654e4f829e545419cd35a
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Sith/Game/World.meta b/Assets/Sith/Game/World.meta
new file mode 100644
index 0000000..5011129
--- /dev/null
+++ b/Assets/Sith/Game/World.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 0383ed69e4122cf42a81761c87826c09
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Sith/Game/World/SithSector.cs b/Assets/Sith/Game/World/SithSector.cs
new file mode 100644
index 0000000..ea0dbbf
--- /dev/null
+++ b/Assets/Sith/Game/World/SithSector.cs
@@ -0,0 +1,256 @@
+using Assets.Sith.Content.JKL;
+using Assets.Sith.Gui;
+using Assets.Sith.Utility;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using UnityEditor;
+using UnityEngine;
+
+namespace Assets.Sith.Game.World
+{
+    //[ExcludeFromPreset, ExcludeFromObjectFactory]
+    [ExecuteAlways, DisallowMultipleComponent]
+    [Serializable]
+    public class SithSector : MonoBehaviour
+    {
+        [Notify] // Delayed
+        public int test;
+
+        [HexField, Tooltip("Sector flags")]
+        public int Flags;
+
+        [Space(10)]
+        public Color AmbientLight;
+        public Color ExtraLight;
+
+        [Tooltip("Enables blending sector tint color. (JKDF2 & MOTS)")]
+        public bool BlendTint = false;
+
+        [ConditionalHide("BlendTint", true)]
+        public Color Tint;
+
+        [Space(10)]
+        [SerializeField]
+        public Content.JKL.Sector.AmbientSound Sound; // optional
+        public Vector3 Thrust;
+
+        public Bounds BoundBox { get { return _boundBox; } }
+        public Vector3 Center { get { return _center; } }
+        public float Radius { get { return _radius; } }
+
+        [Header("Sector Geometry")]
+        [BoundsMinMaxViewAttribute]
+        [SerializeField]
+        private Bounds _boundBox;
+
+        [ReadOnly]
+        [SerializeField]
+        private Vector3 _center;
+
+        [ReadOnly]
+        [SerializeField]
+        private float _radius;
+
+        private Color _ambientLight;
+        private bool _updateAmbientLight;
+        private Color _extraLight;
+        private bool _updateExtraLight;
+        private Color _tint;
+        private bool _updateTint;
+
+        private float _update = 1.1f;
+
+        [HideInInspector]
+        public Mesh Mesh { get; private set; }
+
+        [HideInInspector]
+        public SithSurface[] Surfaces { get {
+            return gameObject.GetComponents<SithSurface>();
+        }}
+
+        public void SetMesh(Mesh mesh, UnityEngine.Material[] materials)
+        {
+            Mesh = mesh;
+            if (!TryGetComponent<MeshRenderer>(out var mr))
+            {
+                mr = gameObject.AddComponent<MeshRenderer>();
+            }
+            mr.sharedMaterials = materials;
+
+            if (!TryGetComponent<MeshFilter>(out var mf))
+            {
+                mf = gameObject.AddComponent<MeshFilter>();
+            }
+            mf.sharedMesh = Mesh;
+
+            _updateAmbientLight = true;
+            _updateExtraLight = true;
+            _updateTint = BlendTint;
+            UpdateLight();
+            UpdateBounds();
+            if (Mesh != null)
+            {
+                InitSurfaces();
+            }
+        }
+
+        void Start()
+        {
+            if (Mesh == null && TryGetComponent<MeshFilter>(out var mf))
+            {
+                Mesh = mf.sharedMesh;
+            }
+
+            _updateAmbientLight = true;
+            _updateExtraLight = true;
+            _updateTint = BlendTint;
+            UpdateLight();
+            UpdateBounds();
+        }
+
+        void Reset()
+        {
+            //_updateAmbientLight = true;
+            //_updateExtraLight   = true;
+            //_updateTint         = BlendTint;
+            //UpdateLight();
+            //UpdateBounds();
+
+            // Do not put in start function
+            if (Mesh == null && TryGetComponent<MeshFilter>(out var mf))
+            {
+                Mesh = mf.sharedMesh;
+                if (Mesh != null)
+                {
+                    InitSurfaces();
+                }
+            }
+        }
+
+        void Update()
+        {
+            _update += Time.deltaTime;
+            if (_update > 1.0f)
+            {
+                _update = 0.0f;
+            }
+
+            UpdateBounds();
+            UpdateLight();
+        }
+
+        private void OnDestroy()
+        {
+            ClearSurfaces();
+        }
+
+        private void ClearSurfaces()
+        {
+            foreach (SithSurface surf in gameObject.GetComponents<SithSurface>())
+            {
+                if (EditorApplication.isPlaying)
+                {
+                    Destroy(surf);
+                }
+                else
+                {
+                    DestroyImmediate(surf);
+                }
+            }
+        }
+
+        private void InitSurfaces()
+        {
+            if (!TryGetComponent<MeshCollider>(out var mc))
+            {
+                mc = gameObject.AddComponent<MeshCollider>();
+            }
+
+            mc.enabled = Mesh.vertices.Length > 0;
+            mc.material.dynamicFriction = 0.0f;
+            mc.material.staticFriction = 0.0f;
+            mc.material.bounciness = 0;
+            if (mc.enabled)
+            {
+                mc.sharedMesh = Instantiate(Mesh); // Duplicate mesh so the geomode and collision surface flags don't overlap
+                //collider.convex = true;
+                mc.cookingOptions = MeshColliderCookingOptions.WeldColocatedVertices |
+                                    MeshColliderCookingOptions.EnableMeshCleaning |
+                                    MeshColliderCookingOptions.CookForFasterSimulation;
+            }
+
+            // Clear any existing surface(s) first
+            ClearSurfaces();
+
+            // Add surfaces
+            if (Mesh != null)
+            {
+                for (var i = 0; i < Mesh.subMeshCount; i++)
+                {
+                    var surf = gameObject.AddComponent<SithSurface>();
+                    surf.num = i;
+                }
+            }
+        }
+
+        public void testChanged()
+        {
+            //EditorUtility.SetDirty(this);
+            Debug.Log($"In SithSector::testChanged: {test}");
+        }
+
+        void UpdateLight()
+        {
+            if (_updateAmbientLight || _updateExtraLight)
+            {
+                // Sector surfaces are only lit by extra light
+                if (_updateExtraLight)
+                {
+                    gameObject.SetSectorLight(Color.black, ExtraLight);
+                }
+
+                _ambientLight       = AmbientLight;
+                _updateAmbientLight = false;
+                _extraLight         = ExtraLight;
+                _updateExtraLight   = false;
+            }
+
+            if (_updateTint)
+            {
+                if (BlendTint || _tint != Color.black)
+                {
+                    var color = Tint;
+                    if (!BlendTint)
+                    {
+                        _tint = Color.black;
+                        color = _tint;
+                    }
+                    gameObject.SetSectorTint(color);
+                    if (BlendTint) _tint = Tint;
+                    _updateTint = false;
+                }
+            }
+        }
+
+        void UpdateBounds()
+        {
+            var mf = GetComponent<MeshFilter>();
+            if (mf != null && mf.sharedMesh != null)
+            {
+                _boundBox = mf.sharedMesh.bounds;
+                _center = mf.sharedMesh.bounds.center;
+                _radius = mf.sharedMesh.bounds.extents.magnitude;
+            }
+        }
+
+        private void OnValidate()
+        {
+            _updateAmbientLight = _ambientLight != AmbientLight;
+            _updateExtraLight   = _extraLight != ExtraLight;
+            _updateTint         = _tint != Tint || !BlendTint;
+        }
+    }
+}
diff --git a/Assets/Sith/Game/World/SithSector.cs.meta b/Assets/Sith/Game/World/SithSector.cs.meta
new file mode 100644
index 0000000..34a64d5
--- /dev/null
+++ b/Assets/Sith/Game/World/SithSector.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: aed4ce5bd3d66bf438437422a31a8c5e
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Sith/Game/World/SithSurface.cs b/Assets/Sith/Game/World/SithSurface.cs
new file mode 100644
index 0000000..28edc52
--- /dev/null
+++ b/Assets/Sith/Game/World/SithSurface.cs
@@ -0,0 +1,166 @@
+using Assets.Sith.Content.JKL;
+using Assets.Sith.Gui;
+using Assets.Sith.Utility;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using UnityEngine;
+
+namespace Assets.Sith.Game.World
+{
+    [FlagsAttribute]
+    public enum SurfaceFlag
+    {
+        Floor      = 0x1,
+        Collision  = 0x4,
+        HorizonSky = 0x200,
+        CeilingSky = 0x400
+    };
+
+    [ExecuteAlways, HideInInspector]
+    public class SithSurface : MonoBehaviour
+    {
+        [ReadOnly]
+        public int num = -1;
+
+        public SurfaceFlag flags = 0;
+        public GeoMode GeoMode = GeoMode.Textured;
+        public LightMode LightMode = LightMode.Gouraud;
+        public Color ExtraLight;
+
+        private SurfaceFlag _surfflags = (SurfaceFlag)(-1);
+        private GeoMode _geomode = GeoMode.Textured;
+        private LightMode _lightMode = LightMode.Gouraud;
+
+        private SithSector _sector;
+        private int[] _surfaceTiangles;
+
+        private Color _extraLight;
+        private bool _updateExtraLight = true;
+
+        private const SurfaceFlag _skyMask = SurfaceFlag.HorizonSky | SurfaceFlag.CeilingSky;
+
+        void Start()
+        {
+            _sector = gameObject.GetComponent<SithSector>();
+            if (TryGetComponent<MeshFilter>(out var mf))
+            {
+                // This solves the chicken-egg problem when entering the play mode. i.e. sector is inited after surface.
+                _surfaceTiangles = mf.sharedMesh.GetTriangles(num);
+            }
+        }
+
+        private void Update()
+        {
+            if (_surfflags != flags)
+            {
+                UpdateFlags();
+            }
+
+            if (_geomode != GeoMode)
+            {
+                UpdateGeomode();
+            }
+
+            if (_lightMode != LightMode)
+            {
+                UpdateLightMode();
+            }
+
+            if (_updateExtraLight)
+            {
+                var mat = GetMaterial();
+                if (mat != null)
+                {
+                    mat.SetFaceExtraLight(ExtraLight);
+                    
+                }
+                _extraLight = ExtraLight;
+                _updateExtraLight = false; // Note: if mat is null and later changes to instance, that instance won't have correct geomode set
+            }
+        }
+
+        private void EnableCollision(Boolean enable)
+        {
+            int[] triangles = null;
+            if (enable)
+            {
+                triangles = _surfaceTiangles;
+            }
+
+            var collider = GetComponent<MeshCollider>();
+            var mesh = collider.sharedMesh;
+            mesh.SetTriangles(triangles, num);
+            collider.sharedMesh = mesh;
+        }
+
+        private void UpdateGeomode()
+        {
+            int[] triangles = null;
+            switch (GeoMode)
+            {
+                case GeoMode.Solid:
+                case GeoMode.Textured:
+                    triangles = _surfaceTiangles;
+                    break;
+            }
+            _sector.Mesh.SetTriangles(triangles, num);
+
+            var mat = GetMaterial();
+            if (mat != null)
+            {
+                mat.SetGeoMode(GeoMode);
+            }
+            _geomode = GeoMode; // Note: if mat is null and later changes to instance, that instance won't have correct geomode set
+        }
+
+        private void UpdateLightMode()
+        {
+            if ((flags & _skyMask) != 0)
+            {
+                LightMode = LightMode.Unlit;
+            }
+
+            var mat = GetMaterial();
+            if (mat != null)
+            {
+                mat.SetLightMode(LightMode);
+            }
+            _lightMode = LightMode; // Note: if mat is null and later changes to instance, that instance won't have correct light mode set
+        }
+
+        private void OnValidate()
+        {
+            _updateExtraLight = _updateExtraLight || (_extraLight != ExtraLight);
+        }
+
+        private UnityEngine.Material GetMaterial()
+        {
+            UnityEngine.Material mat = null;
+            if (TryGetComponent<MeshRenderer>(out var mr))
+            {
+                mat = mr.sharedMaterials[num];
+            }
+            return mat;
+        }
+
+        private void UpdateFlags()
+        {
+            if ((flags & SurfaceFlag.Collision) != (_surfflags & SurfaceFlag.Collision))
+            {
+                EnableCollision((flags & SurfaceFlag.Collision) != 0);
+            }
+
+            if ((flags & _skyMask) != (_surfflags & _skyMask))
+            {
+                if ((flags & _skyMask) != 0)
+                {
+                    UpdateLightMode(); // Should set the surface to unlit
+                }
+            }
+            _surfflags = flags;
+        }
+    }
+}
diff --git a/Assets/Sith/Game/World/SithSurface.cs.meta b/Assets/Sith/Game/World/SithSurface.cs.meta
new file mode 100644
index 0000000..357315b
--- /dev/null
+++ b/Assets/Sith/Game/World/SithSurface.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 446cf8a8605b79e4795e2ab7398e2e20
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Sith/Game/World/SithWorld.cs b/Assets/Sith/Game/World/SithWorld.cs
new file mode 100644
index 0000000..19bc70a
--- /dev/null
+++ b/Assets/Sith/Game/World/SithWorld.cs
@@ -0,0 +1,709 @@
+using Assets.Sith.Content;
+using Assets.Sith.Content.JKL;
+using Assets.Sith.Game.Thing;
+using Assets.Sith.Game.Player;
+using Assets.Sith.Utility;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using UnityEngine;
+using UnityEngine.Rendering;
+using Material = UnityEngine.Material;
+
+namespace Assets.Sith.Game.World
+{
+    [ExecuteInEditMode, ExecuteAlways, DisallowMultipleComponent]
+    [RequireComponent(typeof(MeshFilter))]
+    public class SithWorld : MonoBehaviour
+    {
+        public GeoMode GeoMode = GeoMode.Textured;
+        public LightMode LightMode = LightMode.Gouraud;
+        public WorldType Type = WorldType.JKDF2;
+
+        public SithWorld() 
+        {
+            _geoMode   = GeoMode;
+            _lightMode = LightMode;
+        }
+
+        public void Load(string levelPath)
+        {
+            Clear();
+
+            this.name = name;
+            _cmp = new CMP();
+
+            var jkl       = new JKL();
+            var jklParser = new JKLParser(jkl, SithAssets.Instance.GetStream(levelPath));
+            jklParser.Parse();
+
+            _type = Type = jkl.type;
+            if (jkl.WorldColorMaps != null && jkl.WorldColorMaps.Length > 0)
+            {
+                _cmp = SithAssets.Instance.Load<CMP>(jkl.WorldColorMaps[0]);
+            }
+
+            //Physics.gravity = new Vector3(0, -jkl.WorldGravity, 0);
+
+            BuildWorldGeometry(jkl);
+            BuildThings(jkl);
+        }
+
+        private void Clear()
+        {
+            _modelCache.Clear();
+            foreach (Transform child in transform)
+            {
+                Destroy(child.gameObject);
+            }
+        }
+
+        private GeoMode _geoMode;
+        private LightMode _lightMode;
+        private WorldType _type;
+        bool _updateGeoMode   = false;
+        bool _updateLightMode = false;
+        bool _updateType      = false;
+        float _elapsed;
+
+        private void OnValidate()
+        {
+            _updateGeoMode  = _geoMode != GeoMode;
+            _updateLightMode = _lightMode != LightMode;
+            _updateType      = _type != Type;
+        }
+
+        void Update()
+        {
+            _elapsed += Time.deltaTime;
+
+            if (_updateGeoMode || _updateLightMode || _updateType)
+            {
+                _geoMode = GeoMode;
+                _lightMode = LightMode;
+                _type = Type;
+                var renderers = GetComponentsInChildren<Renderer>();
+                foreach (var r in renderers)
+                {
+                    for (var j = 0; j < r.materials.Length; j++)
+                    {
+                        r.materials[j].SetGeoMode(_geoMode);
+                        r.materials[j].SetLightMode(_lightMode);
+                        r.materials[j].EnableIjimShading(_type == WorldType.IJIM);
+                    }
+                }
+                _updateGeoMode   = false;
+                _updateLightMode = false;
+                _updateType      = false;
+            }
+        }
+
+        private string GetSectorNameByIdx(int idx)
+        {
+            return "sector " + idx;
+        }
+
+        private GameObject GetSectorObj(int idx)
+        {
+            var s = GameObject.Find(GetSectorNameByIdx(idx));
+            if (s == null || s.GetComponent<SithSector>() == null)
+            {
+                Debug.LogError($"GetSector: Invalid sector object idx={idx} in hierarchy");
+                return null;
+            }
+            return s;
+        }
+
+        private void BuildWorldGeometry(JKL jkl)
+        {
+            for (var sectorIdx = 0; sectorIdx < jkl.Sectors.Length; sectorIdx++)
+            {
+                var sector    = jkl.Sectors[sectorIdx];
+                var sectorObj = new GameObject(GetSectorNameByIdx(sectorIdx))
+                {
+                    isStatic = true
+                };
+                sectorObj.transform.localScale = Utils.Scale(sectorObj.transform.localScale);
+                sectorObj.transform.SetParent(transform, false);
+
+                var ss = sectorObj.AddComponent<SithSector>();
+                ss.Flags        = (int)sector.Flags;
+                ss.AmbientLight = sector.AmbientLight;
+                ss.ExtraLight   = sector.ExtraLight;
+                ss.BlendTint    = jkl.Version == 1;
+                ss.Tint         = sector.Tint ?? Color.white;
+                ss.Sound        = sector.Sound;
+                ss.Thrust       = sector?.Thrust ?? new Vector3();
+
+                var (mesh, materials) = BuildSectorMesh(sector, jkl);
+                ss.SetMesh(mesh, materials);
+
+                for (int i = 0; i < sector.SurfaceCount; i++)
+                {
+                    var surfaceIdx  = sector.SurfaceStartIdx + i;
+                    var jklSurf     = jkl.WorldSurfaces[surfaceIdx];
+                    var surf        = ss.Surfaces[i];
+                    surf.flags      = (SurfaceFlag)jklSurf.SurfaceFlags;
+                    surf.GeoMode    = jklSurf.GeoMode;
+                    surf.LightMode  = jklSurf.LightMode;
+                    surf.ExtraLight = jklSurf.ExtraLight;
+                }
+
+                //var meshRenderer = sectorObj.GetComponent<MeshRenderer>();
+                //meshRenderer.sharedMaterials = materials;
+
+                //var meshFilter = sectorObj.GetComponent<MeshFilter>();
+                //meshFilter.sharedMesh = mesh;
+
+                //var mc = sectorObj.AddComponent<MeshCollider>();
+                //mc.enabled = mesh.vertices.Length > 0;
+                //mc.material.dynamicFriction = 0.0f;
+                //mc.material.staticFriction = 0.0f;
+                //mc.material.bounciness = 0;
+                //if (mc.enabled)
+                //{
+                //    mc.sharedMesh = mesh;
+                //    //collider.convex = true;
+                //    mc.cookingOptions = MeshColliderCookingOptions.WeldColocatedVertices |
+                //                        MeshColliderCookingOptions.EnableMeshCleaning |
+                //                        MeshColliderCookingOptions.CookForFasterSimulation;
+                //}
+
+                if (jkl.type == WorldType.IJIM && sector.AvgLightIntensity.HasValue  && sector.AvgLightPosition.HasValue)
+                {
+                    float range = sector.AvgLightFalloff?.x /4 ?? mesh.bounds.extents.magnitude /2;
+                    var color = sector.AvgLightIntensity.Value;
+                    var avglamp = new GameObject("AvgIntensityLamp");
+                    avglamp.transform.SetParent(sectorObj.transform, false);
+                    var avglight        = avglamp.AddComponent<Light>();
+                    avglight.enabled    = false;
+                    avglight.type       = LightType.Point;
+                    avglight.renderMode = LightRenderMode.ForceVertex;
+                    avglight.range      = Utils.Scale(range);
+                    avglight.intensity  = sector.AvgLightFalloff?.y ?? 1.0f;
+                    avglight.color      = color;
+                    avglight.transform.localPosition = Utils.GetUnityCoords(sector.AvgLightPosition.Value);
+                }
+            }
+        }
+
+        Tuple<Mesh, Material[]> BuildSectorMesh(in Sector sector, in JKL jkl)
+        {
+            var vertices    = new List<Vector3>();
+            var submeshes   = new List<List<int>>();
+            var uvs         = new List<Vector2>();
+            var intensities = new List<Color>();
+            var mats        = new List<Material>();
+            var faceNormals = new Dictionary<int, List<Vector3>>(); // Face normals connected to the vertex
+
+            for (int i = 0; i < sector.SurfaceCount; i++)
+            {
+                var surfaceIdx = sector.SurfaceStartIdx + i;
+                var surface = jkl.WorldSurfaces[surfaceIdx];
+                //if (surface.GeoMode == GeoMode.NotDrawn) continue;
+                //bool visible = surface.GeoMode != GeoMode.NotDrawn;
+
+                var texScale = new Vector2(1, 1);
+                var matName = surface.Material?.Name;// visible ? surface.Material?.Name : null;
+                //if (matName != null)
+                {
+                    Material mat = null;
+                    //if (!mats.ContainsKey(matName))
+                    {
+                        var alphaShader = surface.Adjoin != null && (surface.FaceFlags & FaceFlag.Textranslucent) != 0;
+                        var lm = (surface.SurfaceFlags & 0x600) != 0 ? LightMode.Unlit : surface.LightMode; // 0x600 = (HorizonSky | CeilingSky)
+                        if (matName != null)
+                        {
+                            mat = SithAssets.Instance.Load(matName, lm, surface.FaceFlags, _cmp, alphaShader);
+                            mat.SetCullMode(CullMode.Back);
+                            //mat.SetGeoMode(surface.GeoMode);
+                            //mat.SetLightMode(lm);
+                            //mat.SetFaceExtraLight(surface.ExtraLight);
+                            mat.EnableIjimShading(_type == WorldType.IJIM);
+
+                            if ((surface.SurfaceFlags & 0x400) != 0)
+                            {
+                                mat.shader = Shader.Find("Sith/CeilingSky");
+                                mat.SetFloat("_SkyHeight", jkl.CeilingSkyZ);
+                                Vector4 skyOffset = jkl.CeilingSkyOffset;
+                                mat.SetVector("_CeilingSkyOffset", skyOffset);
+                            }
+                        }
+
+                        //if (alphaShader) // make sure the translucent adjoin surface is rendered last
+                        //{
+                        //   mat.renderQueue = 5000;
+                        //}
+
+                        mats.Add(mat);
+                    }
+                    if (jkl.Version == 1 && mat) // JKDF2 & MOTS
+                    {
+                        //Material mat = mats[matName];
+                        texScale.x = 1.0f / mat.mainTexture.width;
+                        texScale.y = 1.0f / mat.mainTexture.height;
+                    }
+                }
+                //else
+                //{
+                //    //continue;
+                //    //mats.Add(new Material(Shader.Find("Sith/NotDrawn")));
+                //    //mats[i] = new Material(Shader.Find("Sith/NotDrawn"));
+                //}
+
+                for (var s = 0; s < surface.SurfaceVertexGroups.Length; s++)
+                {
+                    SurfaceVertexGroup t = surface.SurfaceVertexGroups[s];
+                    vertices.Add(Utils.GetUnityCoords(jkl.WorldVertices[t.VertexIdx]));
+
+                    if (!faceNormals.ContainsKey(t.VertexIdx))
+                        faceNormals[t.VertexIdx] = new List<Vector3>();
+                    faceNormals[t.VertexIdx].Add(Utils.GetUnityCoords(surface.SurfaceNormal));
+                    intensities.Add(surface.VertColors[s]);
+
+                    var uv = t.TextureVertex;
+                    if (uv.HasValue && surface.Material != null)
+                    {
+                        uvs.Add(uv.Value * texScale);
+                    }
+                    else
+                    {
+                        uvs.Add(Vector2.zero);
+                    }
+                }
+
+                var viStart = vertices.Count - surface.SurfaceVertexGroups.Length;
+                submeshes.Add(Utils.GetTriangulationIndices(viStart, surface.SurfaceVertexGroups.Length));
+                //if (!submeshes.ContainsKey(matName))
+                //{
+                //    submeshes[matName] = new List<int>();
+                //}
+                //submeshes[matName].AddRange(Utils.GetTriangulationIndices(viStart, surface.SurfaceVertexGroups.Length));
+            }
+
+            // Calculate unweighted vertex normals
+            var mapVertNormals = new Dictionary<Vector3, Vector3>();
+            foreach (var kv in faceNormals)
+            {
+                var vn = new Vector3();
+                if (kv.Value.Count > 0)
+                {
+                    vn = new Vector3
+                    (
+                        kv.Value.Average(n => n.x),
+                        kv.Value.Average(n => n.y),
+                        kv.Value.Average(n => n.z)
+                    );
+                }
+                mapVertNormals[Utils.GetUnityCoords(jkl.WorldVertices[kv.Key])] = vn;
+            };
+
+            var vertexNormals = new List<Vector3>();
+            foreach (var v in vertices)
+            {
+                vertexNormals.Add(mapVertNormals[v]);
+            }
+
+            var mesh = new Mesh();
+            mesh.SetVertices(vertices);
+            mesh.subMeshCount = submeshes.Count;
+            for (var i = 0; i < submeshes.Count; i++)
+            {
+                mesh.SetTriangles(submeshes[i], i);
+            }
+
+            mesh.SetUVs(0, uvs);
+            mesh.SetColors(intensities);
+            mesh.SetNormals(vertexNormals);
+            mesh.RecalculateBounds();
+
+            mesh.RecalculateNormals();
+
+            return new Tuple<Mesh, Material[]>(mesh, mats.ToArray());
+        }
+        private void BuildThings(JKL jkl)
+        {
+            foreach (var thing in jkl.Things)
+            {
+                GameObject thingObj = new GameObject();
+                Model3DO model3DO = null;
+                ThreedoLoadResult modelLoadResult = null;
+                if (thing.Parameters.ContainsKey("model3d"))
+                {
+                    try
+                    {
+                        var modelFilename = thing.Parameters["model3d"];
+                        modelLoadResult = LoadModel(modelFilename);
+                        model3DO = modelLoadResult.Model;
+                        modelLoadResult.ModelObject.transform.SetParent(thingObj.transform, false);
+                    }
+                    catch (Exception e)
+                    {
+                        Debug.LogError($"Failed to load model {thing.Parameters["model3d"]}: {e.Message}");
+                    }
+                }
+                else if (thing.Parameters["type"] == "sprite")
+                {
+                    DestroyImmediate(thingObj);
+                    thingObj = CreateSpriteThing(thing);
+                }
+                else
+                {
+                    // Add inspector visual component
+                    thingObj.AddComponent<ThingGizmo>(); 
+                }
+
+                var moveSize = Utils.Scale(0.05f);
+                var modelRadius = model3DO?.Radius ?? Utils.Scale(0.2f);
+                if (jkl.Version == 1)
+                {
+                    modelRadius /= 2;
+                }
+
+                if (thing.Parameters["type"] == "actor" || thing.Parameters["type"] == "player")
+                {
+                    var rb  = thingObj.AddComponent<Rigidbody>();
+                    rb.mass = thing.Parameters.FloatOr("mass", 0.0f);
+                    rb.useGravity = Mathf.Abs(rb.mass) > 0.0000001f; // if zero (1.7E-07) disable gravity
+                    rb.useGravity = (thing.Parameters.IntOr("physflags", 0) & (0x80 | 0x2000)) == 0 && rb.useGravity; // Disable gravity for rb which should stick to the wall (0x80) or fly (0x2000)
+                    rb.drag = thing.Parameters.FloatOr("airdrag", 0.0f);
+                    rb.angularDrag = thing.Parameters.FloatOr("staticdrag", 0.0f);
+                    rb.maxAngularVelocity = thing.Parameters.FloatOr("maxrotvel", 0.0f) * Mathf.Deg2Rad;
+                    rb.collisionDetectionMode = CollisionDetectionMode.Continuous;
+                    rb.constraints = RigidbodyConstraints.FreezeRotationZ | RigidbodyConstraints.FreezeRotationY | RigidbodyConstraints.FreezeRotationX;
+                    //var cc = thingObj.AddComponent<CharacterController>(); // required for PlayerMovementCharacter
+                }
+
+                if (thing.Parameters.ContainsKey("collide"))
+                {
+                    var ctype = thing.Parameters.IntOr("collide");
+                    if (ctype == 1) // sphere collision
+                    {
+                        //modelLoadResult.ModelObject.transform.localPosition = Utils.Scale(Utils.GetUnityCoords(model3DO.InsertOffset));
+                        //thingObj.transform.localPosition = -modelLoadResult.ModelObject.transform.localPosition;
+
+                        var cc = thingObj.AddComponent<CapsuleCollider>();
+                        cc.direction = 1;
+                        cc.material.dynamicFriction = thing.Parameters.FloatOr("surfdrag", 0) * 0.10f;
+                        cc.material.staticFriction = thing.Parameters.FloatOr("staticdrag", 0);
+                        cc.material.bounciness = 0;
+
+                        moveSize = Utils.Scale(thing.Parameters.FloatOr("size", 0.05f));
+                        cc.radius = moveSize;
+                        //cc.center = new Vector3(0, Utils.Scale(modelRadius), 0);
+                        cc.height = Utils.Scale(modelRadius * 2);//Utils.Scale(thing.Parameters.FloatOr("collheight", modelRadius * 2));
+                    }
+                    else if (ctype == 3 && modelLoadResult != null) // face collision
+                    {
+                        var meshes = modelLoadResult.ModelObject.GetComponentsInChildren<MeshFilter>();
+                        foreach (var m in meshes)
+                        {
+                            if (m.sharedMesh != null)
+                            {
+                                var mc = m.gameObject.AddComponent<MeshCollider>();
+                                mc.sharedMesh = m.sharedMesh;
+                                if (thingObj.TryGetComponent(out Rigidbody rb))
+                                    rb.isKinematic = true;
+                                //mc.convex                   = m.sharedMesh.vertexCount > 3;
+                                mc.material.dynamicFriction = thing.Parameters.FloatOr("surfdrag", 0) * 0.10f;
+                                mc.material.staticFriction = thing.Parameters.FloatOr("staticdrag", 0);
+                            }
+                        }
+                    }
+
+                    if (model3DO != null && thing.Parameters.ContainsKey("puppet"))
+                    {
+                        var puppetFilename = thing.Parameters["puppet"];
+                        var puppet = SithAssets.Instance.Load<Puppet>(puppetFilename);
+                        if (puppet.Modes.ContainsKey(0) && puppet.Modes[0].ContainsKey("stand"))
+                        {
+                            var keyFilename = puppet.Modes[0]["stand"].KeyFile;
+                            var kp = new KEY();
+                            var animClip = kp.Load(
+                                keyFilename,
+                                SithAssets.Instance.GetStream(@"3do\key\" + keyFilename),
+                                model3DO,
+                                thingObj.transform
+                            );
+
+                            if (!thingObj.TryGetComponent<Animation>(out var anim))
+                            {
+                                anim = thingObj.AddComponent<Animation>();
+                                anim.AddClip(animClip, animClip.name);
+                            }
+                            anim.Play(animClip.name);
+                        }
+                    }
+                }
+
+                if (thing.Parameters["type"] == "player")
+                {
+                    if (GameObject.FindGameObjectWithTag("Player") == null && thingObj != null)
+                    {
+                        thingObj.tag   = "Player";
+                        thingObj.layer = 8;
+
+                        var pm       = thingObj.AddComponent<PlayerMovement>();
+                        pm.Speed     = Utils.Scale(thing.Parameters.FloatOr("maxvel", 1.0f));
+                        pm.JumpSpeed = thing.Parameters.FloatOr("jumpspeed", 1.5f) * 3;
+
+                        //var pm = thingObj.AddComponent<PlayerMovementCharacter>();
+                        //pm.AirDrag = thing.Parameters.FloatOr("airdrag", 0.0f);
+
+                        //var sc = thingObj.AddComponent<MoveSlideCapsule>();
+                        //sc.SteepestSlope = 45.0f;
+                        //sc.LegHeight     = moveSize /2 + 0.05f;
+
+                        //var movement = thingObj.AddComponent<MovePlayer>();
+                        //if (thing.Parameters.ContainsKey("staticdrag"))
+                        //    movement.Friction = float.Parse(thing.Parameters["staticdrag"]) / 10;
+                        //movement.Acceleration = 50;
+                        //if (thing.Parameters.ContainsKey("maxthrust"))
+                        //    movement.Acceleration = float.Parse(thing.Parameters["maxthrust"]) * jkl.WorldGravity;
+                        //movement.MaxVelocity  = 7;
+                        //if (thing.Parameters.ContainsKey("maxvel"))
+                        //    movement.MaxVelocity = float.Parse(thing.Parameters["maxvel"]) * jkl.WorldGravity;
+                        //movement.JumpVelocity = 7;
+                        //if (thing.Parameters.ContainsKey("jumpspeed"))
+                        //    movement.JumpVelocity = float.Parse(thing.Parameters["jumpspeed"]) * jkl.WorldGravity;
+
+                        var ml = thingObj.AddComponent<PlayerMouselook>();
+                        ml.FirstPerson = jkl.Version == 1;
+
+                        var camObj = new GameObject("camera");
+                        camObj.transform.SetParent(thingObj.transform, false);
+
+                        var cam = camObj.AddComponent<Camera>();
+                        cam.fieldOfView = 60;
+                        if (thing.Parameters.ContainsKey("fov"))
+                            cam.fieldOfView = float.Parse(thing.Parameters["fov"]) * 100;
+                        cam.nearClipPlane   = 0.1f;
+                        cam.backgroundColor = Color.black;
+                        cam.clearFlags      = CameraClearFlags.SolidColor;
+                        // cam.allowHDR = false;
+
+                        //var msc = thingGameObject.AddComponent<MoveSlideCapsule>();
+                        //msc.LegHeight = 1.0f;
+                        //msc.SteepestSlope = 45;
+
+                        //var mp = thingGameObject.AddComponent<MovePlayer>();
+                        //mp.Friction = 0.002f;
+                        //mp.Acceleration = 50;
+                        //mp.MaxVelocity = 1.0f;
+                        //mp.JumpVelocity = 1.2f;
+
+                        //var pml = thingGameObject.AddComponent<PlayerMouselook>();
+                        //pml.LookSensitivity = 2;
+                    }
+                }
+
+                // Place thing
+                thingObj.name = thing.Name;
+                thingObj.transform.position += Utils.Scale(thing.Position);
+                thingObj.transform.rotation = thing.Orientation;
+                thingObj.transform.SetParent(transform, false);
+
+                var st = thingObj.AddComponent<SithThing>();
+                st.Type   = thing.Parameters["type"];
+                st.Sector = thing.SectorIdx;
+
+                if (!thing.Parameters.ContainsKey("move") || thing.Parameters["move"] == "none")
+                {
+                    thingObj.isStatic = true;
+                }
+
+                var s = GetSectorObj(thing.SectorIdx);
+                if (s == null)
+                {
+                    Debug.LogError($"BuildThings: Thing '{thingObj.name}' defines invalid sector idx={thing.SectorIdx} ");
+                }
+                else
+                {
+                    var sector = s.GetComponent<SithSector>();
+                    thingObj.SetSectorLight(sector.AmbientLight, sector.ExtraLight);
+                    if (Type != WorldType.IJIM)
+                    {
+                        thingObj.SetSectorTint(sector.Tint);
+                    }
+                }
+            }
+        }
+
+        private ThreedoLoadResult LoadModel(string filename)
+        {
+            Model3DO model = SithAssets.Instance.Load<Model3DO>(filename);
+
+            var geoset = model.Geosets.First();
+            var root   = new GameObject(model.Name)
+            {
+                hideFlags = HideFlags.NotEditable
+            };
+
+            var gameObjects = new List<GameObject>();
+            foreach (var hierarchyNode in model.HierarchyNodes)
+            {
+                var go = new GameObject(hierarchyNode.NodeName);
+                hierarchyNode.Transform = go.transform;
+                if (hierarchyNode.Mesh != -1)
+                {
+                    var tdMesh = geoset.Meshes[hierarchyNode.Mesh];
+                    var mf = go.AddComponent<MeshFilter>();
+                    mf.sharedMesh = Build3DOMesh(model, tdMesh, hierarchyNode, out List<Material> materials);
+                    go.AddComponent<MeshRenderer>().sharedMaterials = materials.ToArray();
+                }
+                gameObjects.Add(go);
+            }
+
+            for (int index = 0; index < model.HierarchyNodes.Length; index++)
+            {
+                var hierarchyNode = model.HierarchyNodes[index];
+                var parent = hierarchyNode.Parent == -1 ? root : gameObjects[hierarchyNode.Parent];
+                var o = gameObjects[index];
+                o.transform.SetPositionAndRotation(Utils.GetUnityCoords(hierarchyNode.Position), hierarchyNode.Orientation);
+                o.transform.SetParent(parent.transform, false);
+                o.hideFlags = HideFlags.NotEditable;
+            }
+
+            root.transform.localScale    = Utils.Scale(root.transform.localScale);
+            //root.transform.localPosition = Utils.Scale(Utils.GetUnityCoords(model.InsertOffset));
+            var result = new ThreedoLoadResult
+            {
+                Model = model,
+                ModelObject = root
+            };
+
+            if (!_modelCache.ContainsKey(filename))
+                _modelCache.Add(filename, result);
+            return result;
+        }
+
+        private Mesh Build3DOMesh(Model3DO model, Mesh3DO tdMesh, HierarchyNode hierarchyNode, out List<Material> materials)
+        {
+            var vertices    = new List<Vector3>();
+            var normals     = new List<Vector3>();
+            var uvs         = new List<Vector2>();
+            var intensities = new List<Color>();
+            var mats        = new Dictionary<string, Material>();
+            var submeshes   = new Dictionary<string, List<int>>(); // for every texture a list of polygon vertex indices is created
+
+            for (var faceIndex = 0; faceIndex < tdMesh.Faces.Length; faceIndex++)
+            {
+                var face    = tdMesh.Faces[faceIndex];
+                var matName = model.Materials[face.Material];
+                if (!mats.TryGetValue(matName, out Material mat))
+                {
+                    mat = SithAssets.Instance.Load(matName, face.LightMode, face.FaceFlags, _cmp, /*transparentShader=*/true);
+                    mat.enableInstancing = true;
+                    mat.SetGeoMode(face.GeoMode);
+                    mat.SetLightMode(face.LightMode);
+                    mat.SetFaceExtraLight(face.ExtraLight);
+                    mat.EnableIjimShading(_type == WorldType.IJIM);
+                    mats.Add(matName, mat);
+                }
+
+                mat.SetCullMode((face.FaceFlags & FaceFlag.DoubleSided) != 0 ? CullMode.Off : CullMode.Back);// The last shared material sets the cull mode for them all
+
+                foreach (VertexGroup t in face.Vertices)
+                {
+                    vertices.Add(Utils.GetUnityCoords(tdMesh.Vertices[t.VertexIndex] + hierarchyNode.Pivot));
+                    normals.Add(Utils.GetUnityCoords(tdMesh.VertexNormals[t.VertexIndex]));
+
+                    Vector2 uv;
+                    if (t.TextureIndex < tdMesh.TextureVertices.Length)
+                    {
+                        uv = tdMesh.TextureVertices[t.TextureIndex];
+                        if (_type != WorldType.IJIM && model.Version == 2.1f)
+                        {
+                            uv.x /= mat.mainTexture.width;
+                            uv.y /= mat.mainTexture.height;
+                        }
+                    }
+                    else
+                    {
+                        uv = new Vector2();
+                    }
+
+                    uvs.Add(new Vector2(uv.x, uv.y));
+                    intensities.Add(tdMesh.VertColors[t.VertexIndex]);
+                }
+
+                // Triangulate polygon face and add it's vertex indices to submeshes
+                if (!submeshes.ContainsKey(matName))
+                {
+                    submeshes[matName] = new List<int>();
+                }
+                var viStart = vertices.Count - face.Vertices.Length;
+                submeshes[matName].AddRange(Utils.GetTriangulationIndices(viStart, face.Vertices.Length));
+            }
+
+            var mesh = new Mesh
+            {
+                name = tdMesh.Name
+            };
+            mesh.SetVertices(vertices);
+            mesh.subMeshCount = submeshes.Count;
+            for (var i = 0; i < submeshes.Count; i++)
+            {
+                mesh.SetTriangles(submeshes.ElementAt(i).Value, i);
+            }
+
+            mesh.SetNormals(normals);
+            mesh.SetColors(intensities);
+            mesh.SetUVs(0, uvs);
+            mesh.RecalculateBounds();
+
+            materials = mats.Values.ToList();
+            return mesh;
+        }
+
+        public class RotateToCamera : MonoBehaviour
+        {
+            public Camera Camera;
+
+            void Update()
+            {
+                Camera cam = (Camera != null) ? Camera : Camera.current;
+                if (cam != null)
+                    transform.rotation = Quaternion.LookRotation(-cam.transform.forward);
+            }
+        }
+        private GameObject CreateSpriteThing(in Content.JKL.Thing thing)
+        {
+            // TODO: Refactor that this function adds sprite to existing game object and removes any other renderer e.g. 3DO model renderer
+            if (!thing.Parameters.ContainsKey("sprite"))
+            {
+                Debug.LogWarning($"Found sprite Thing '{thing.Name}' with no sprite parameter, skipping...");
+                return null;
+            }
+
+            var sprFilename = thing.Parameters["sprite"];
+            SPR spr = SithAssets.Instance.Load<SPR>(sprFilename);
+
+            var mat     = SithAssets.Instance.Load(spr.MatFile, spr.LightMode, FaceFlag.Textranslucent, _cmp, /*transparentShader=*/true);
+            var tex     = mat.mainTexture;
+            var sprite  = Sprite.Create((Texture2D)tex, new Rect(0, 0, tex.width, tex.height), new Vector2(0.5f, 0.5f));
+            sprite.name = sprFilename;
+
+            var spriteObj  = new GameObject(thing.Name);
+            var rdspr      = spriteObj.AddComponent<SpriteRenderer>();
+            rdspr.name     = sprFilename;
+            rdspr.drawMode = SpriteDrawMode.Sliced;
+            rdspr.sprite   = sprite;
+            rdspr.size     = Utils.Scale(spr.Size);
+            rdspr.transform.localPosition = sprite.pivot;
+
+            var rtc = spriteObj.AddComponent<RotateToCamera>();
+            rtc.enabled = spr.Type == SPRType.FaceCamera;
+            return spriteObj;
+        }
+
+        private class ThreedoLoadResult
+        {
+            public Model3DO Model { get; set; }
+            public GameObject ModelObject { get; set; }
+        }
+
+        private CMP _cmp;
+        private readonly Dictionary<string, ThreedoLoadResult> _modelCache = new Dictionary<string, ThreedoLoadResult>();
+    }
+}
diff --git a/Assets/Sith/Game/World/SithWorld.cs.meta b/Assets/Sith/Game/World/SithWorld.cs.meta
new file mode 100644
index 0000000..4953a0b
--- /dev/null
+++ b/Assets/Sith/Game/World/SithWorld.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 82a1b1e7bc949a848ac5de60b6edb855
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Sith/Gui.meta b/Assets/Sith/Gui.meta
new file mode 100644
index 0000000..8ca1a78
--- /dev/null
+++ b/Assets/Sith/Gui.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: bf1e3b3592b95c945ae4c9f32b2743d1
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Sith/Gui/BoundsMinMaxViewAttribute.cs b/Assets/Sith/Gui/BoundsMinMaxViewAttribute.cs
new file mode 100644
index 0000000..86c9055
--- /dev/null
+++ b/Assets/Sith/Gui/BoundsMinMaxViewAttribute.cs
@@ -0,0 +1,47 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using UnityEditor;
+using UnityEngine;
+
+namespace Assets.Sith.Gui
+{
+    // TODO: Constrain attribute to Bounds class
+    [AttributeUsage(AttributeTargets.Field | AttributeTargets.Property |
+        AttributeTargets.Class | AttributeTargets.Struct, Inherited = true)]
+    public class BoundsMinMaxViewAttribute : PropertyAttribute {}
+
+    [CustomPropertyDrawer(typeof(BoundsMinMaxViewAttribute))]
+    public class BoundsMinMaxViewDrawer : PropertyDrawer
+    {
+        private bool _showValues = true;
+        public override void OnGUI(Rect position, SerializedProperty property, GUIContent label)
+        {
+            //label = EditorGUI.BeginProperty(position, label, property);
+            _showValues = EditorGUI.BeginFoldoutHeaderGroup(position, _showValues, label);
+            if(_showValues)
+            {
+                bool wasEnabled = GUI.enabled;
+                GUI.enabled = false;
+
+                ++EditorGUI.indentLevel;
+                position.y += 5 + EditorGUI.GetPropertyHeight(SerializedPropertyType.String, label);
+                EditorGUI.Vector3Field(position, "Min", property.boundsValue.min);
+
+                position.y += 20;
+                EditorGUI.Vector3Field(position, "Max", property.boundsValue.max);
+                GUI.enabled = true;
+            }
+            EditorGUI.EndFoldoutHeaderGroup();
+        }
+
+        public override float GetPropertyHeight(SerializedProperty property, GUIContent label)
+        {
+            return _showValues
+                ? EditorGUI.GetPropertyHeight(property, label) + 10
+                : EditorGUI.GetPropertyHeight(SerializedPropertyType.String, label);
+        }
+    }
+}
diff --git a/Assets/Sith/Gui/BoundsMinMaxViewAttribute.cs.meta b/Assets/Sith/Gui/BoundsMinMaxViewAttribute.cs.meta
new file mode 100644
index 0000000..7283aa7
--- /dev/null
+++ b/Assets/Sith/Gui/BoundsMinMaxViewAttribute.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 3144d5582a6894f4b826ed423d51672c
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Sith/Gui/ConditionalHideAttribute.cs b/Assets/Sith/Gui/ConditionalHideAttribute.cs
new file mode 100644
index 0000000..af1f3e3
--- /dev/null
+++ b/Assets/Sith/Gui/ConditionalHideAttribute.cs
@@ -0,0 +1,88 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using UnityEditor;
+using UnityEngine;
+
+namespace Assets.Sith.Gui
+{
+    [AttributeUsage(AttributeTargets.Field | AttributeTargets.Property |
+        AttributeTargets.Class | AttributeTargets.Struct, Inherited = true)]
+    public class ConditionalHideAttribute : PropertyAttribute
+    {
+        //The name of the bool field that will be in control
+        public string ConditionalSourceField = "";
+
+        //true = Hide in inspector / false = Disable in inspector 
+        public bool HideInInspector = false;
+        public bool HideCondition = false;
+
+        public ConditionalHideAttribute(string conditionalSourceField) :
+            this(conditionalSourceField, false, false)
+        {}
+
+        public ConditionalHideAttribute(string conditionalSourceField, bool hideInInspector) : 
+            this(conditionalSourceField, hideInInspector, false)
+        {}
+
+        public ConditionalHideAttribute(string conditionalSourceField, bool hideInInspector, bool hideCondition)
+        {
+            ConditionalSourceField = conditionalSourceField;
+            HideInInspector = hideInInspector;
+            HideCondition = hideCondition;
+        }
+    }
+
+    [CustomPropertyDrawer(typeof(ConditionalHideAttribute))]
+    public class ConditionalHidePropertyDrawer : PropertyDrawer
+    {
+        public override void OnGUI(Rect position, SerializedProperty property, GUIContent label)
+        {
+            ConditionalHideAttribute condHAtt = (ConditionalHideAttribute)attribute;
+            bool enabled = GetConditionalHideAttributeResult(condHAtt, property);
+
+            bool wasEnabled = GUI.enabled;
+            GUI.enabled = enabled;
+            if (!condHAtt.HideInInspector || enabled)
+            {
+                EditorGUI.PropertyField(position, property, label, true);
+            }
+
+            GUI.enabled = wasEnabled;
+        }
+
+        public override float GetPropertyHeight(SerializedProperty property, GUIContent label)
+        {
+            ConditionalHideAttribute condHAtt = (ConditionalHideAttribute)attribute;
+            bool enabled = GetConditionalHideAttributeResult(condHAtt, property);
+
+            if (!condHAtt.HideInInspector || enabled)
+            {
+                return EditorGUI.GetPropertyHeight(property, label);
+            }
+            else
+            {
+                return -EditorGUIUtility.standardVerticalSpacing;
+            }
+        }
+        private bool GetConditionalHideAttributeResult(ConditionalHideAttribute condHAtt, SerializedProperty property)
+        {
+            bool enabled = true;
+            string propertyPath = property.propertyPath; //returns the property path of the property we want to apply the attribute to
+            string conditionPath = propertyPath.Replace(property.name, condHAtt.ConditionalSourceField); //changes the path to the conditionalsource property path
+            SerializedProperty sourcePropertyValue = property.serializedObject.FindProperty(conditionPath);
+
+            if (sourcePropertyValue != null)
+            {
+                enabled = sourcePropertyValue.boolValue != condHAtt.HideCondition;
+            }
+            else
+            {
+                Debug.LogWarning("Attempting to use a ConditionalHideAttribute but no matching SourcePropertyValue found in object: " + condHAtt.ConditionalSourceField);
+            }
+            return enabled;
+        }
+    }
+}
diff --git a/Assets/Sith/Gui/ConditionalHideAttribute.cs.meta b/Assets/Sith/Gui/ConditionalHideAttribute.cs.meta
new file mode 100644
index 0000000..a6e3424
--- /dev/null
+++ b/Assets/Sith/Gui/ConditionalHideAttribute.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: e294b1b44d5831948b170e254a46c4de
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Sith/Gui/HexFieldAttribute.cs b/Assets/Sith/Gui/HexFieldAttribute.cs
new file mode 100644
index 0000000..7a7636e
--- /dev/null
+++ b/Assets/Sith/Gui/HexFieldAttribute.cs
@@ -0,0 +1,90 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using UnityEditor;
+using UnityEngine;
+
+namespace Assets.Sith.Gui
+{
+    [AttributeUsage(AttributeTargets.Property | AttributeTargets.Field)]
+    public sealed class HexFieldAttribute : PropertyAttribute
+    {
+        public int digits;
+        public string FormatString
+        {
+            get
+            {
+                if (digits == 0)
+                {
+                    return "X";
+                }
+                else
+                {
+                    return string.Format("X{0}", digits);
+                }
+            }
+        }
+
+        public HexFieldAttribute(int digits = 2)
+        {
+            if (digits < 0)
+                throw new ArgumentOutOfRangeException("Digits cannot be negative");
+            this.digits = digits;
+        }
+
+        public HexFieldAttribute() : this(0)
+        {}
+    }
+
+
+    // The following class should be placed in a script file at the path "Assets/Editor"
+
+    // Here is where you create the custom PropertyDrawer. The magic happens in the
+    // OnGUI method where we create a TextField in the inspector and set it's value
+    // to the SerializedProperty's value as a long, read it back as a string and
+    // try to parse it to a number again. If the parsing fails at any point, the
+    // number is just set to 0.
+    [CustomPropertyDrawer(typeof(HexFieldAttribute))]
+    public class HexFieldDrawer : PropertyDrawer
+    {
+        public HexFieldAttribute hexFieldAttribute
+        {
+            get { return ((HexFieldAttribute)attribute); }
+        }
+
+        public override void OnGUI(Rect position,
+                                   SerializedProperty property,
+                                   GUIContent label)
+        {
+            EditorGUI.BeginChangeCheck();
+            string hexValue = EditorGUI.TextField(position, label,
+                 "0x" + property.longValue.ToString(hexFieldAttribute.FormatString));
+
+            long value = 0;
+            if (hexValue.ToLower().StartsWith("0x"))
+            {
+                try
+                {
+                    value = Convert.ToInt64(hexValue, 16);
+                }
+                catch (FormatException)
+                {
+                    value = 0;
+                }
+            }
+            else
+            {
+                bool parsed = long.TryParse(hexValue, System.Globalization.NumberStyles.HexNumber, null, out value);
+                if (!parsed)
+                {
+                    value = 0;
+                }
+            }
+
+            if (EditorGUI.EndChangeCheck())
+                property.longValue = value;
+        }
+    }
+}
diff --git a/Assets/Sith/Gui/HexFieldAttribute.cs.meta b/Assets/Sith/Gui/HexFieldAttribute.cs.meta
new file mode 100644
index 0000000..2dd4ced
--- /dev/null
+++ b/Assets/Sith/Gui/HexFieldAttribute.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 22e8e89173d721d4685873ac383047b0
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Sith/Gui/NotifyAttribute.cs b/Assets/Sith/Gui/NotifyAttribute.cs
new file mode 100644
index 0000000..c8b20b1
--- /dev/null
+++ b/Assets/Sith/Gui/NotifyAttribute.cs
@@ -0,0 +1,48 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+using System.Threading.Tasks;
+using UnityEditor;
+using UnityEngine;
+
+namespace Assets.Sith.Gui
+{
+    [AttributeUsage(AttributeTargets.Property | AttributeTargets.Field)]
+
+    public sealed class NotifyAttribute : PropertyAttribute
+    {
+    }
+
+    [CustomPropertyDrawer(typeof(NotifyAttribute))]
+    public class NotifyAttributeyDrawer : PropertyDrawer
+    {
+        public override void OnGUI(Rect position, SerializedProperty property, GUIContent label)
+        {
+            // Rely on the default inspector GUI
+            EditorGUI.BeginChangeCheck();
+            EditorGUI.PropertyField(position, property, label);
+
+            // Update only when necessary
+            NotifyAttribute setProperty = attribute as NotifyAttribute;
+            if (EditorGUI.EndChangeCheck())
+            {
+                property.serializedObject.ApplyModifiedProperties();
+                Debug.Log("NotifyAttributeyDrawer::changeeeed" + property.ToString());
+                foreach (var t in property.serializedObject.targetObjects)
+                {
+                    //((Game.World.SithSector)t).testChanged();
+                    var m = property.name + "Changed";
+                    var aa = t.GetType();
+                    var notify = t.GetType().GetMethod(m);
+
+
+                   // var uu = Convert.ChangeType(property.serializedObject, aa);
+                    if (notify != null)
+                        notify.Invoke(null, null);
+                }
+            }
+        }
+    }
+}
diff --git a/Assets/Sith/Gui/NotifyAttribute.cs.meta b/Assets/Sith/Gui/NotifyAttribute.cs.meta
new file mode 100644
index 0000000..2507f9e
--- /dev/null
+++ b/Assets/Sith/Gui/NotifyAttribute.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: aa3d52669c29a204ab719ae49c9334e2
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Sith/Gui/ReadOnlyAttribute.cs b/Assets/Sith/Gui/ReadOnlyAttribute.cs
new file mode 100644
index 0000000..841c0fc
--- /dev/null
+++ b/Assets/Sith/Gui/ReadOnlyAttribute.cs
@@ -0,0 +1,32 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using UnityEditor;
+using UnityEngine;
+
+namespace Assets.Sith.Gui
+{
+    [AttributeUsage(AttributeTargets.Field | AttributeTargets.Property |
+        AttributeTargets.Class | AttributeTargets.Struct, Inherited = true)]
+    public class ReadOnlyAttribute : PropertyAttribute
+    { }
+
+    [CustomPropertyDrawer(typeof(ReadOnlyAttribute))]
+    public class ReadOnlyDrawer : PropertyDrawer
+    {
+        public override void OnGUI(Rect position, SerializedProperty property, GUIContent label)
+        {
+            bool wasEnabled = GUI.enabled;
+            GUI.enabled = false;
+            EditorGUI.PropertyField(position, property, label, true);
+            GUI.enabled = wasEnabled;
+        }
+
+        public override float GetPropertyHeight(SerializedProperty property, GUIContent label)
+        {
+            return EditorGUI.GetPropertyHeight(property, label);
+        }
+    }
+}
diff --git a/Assets/Sith/Gui/ReadOnlyAttribute.cs.meta b/Assets/Sith/Gui/ReadOnlyAttribute.cs.meta
new file mode 100644
index 0000000..1d759ef
--- /dev/null
+++ b/Assets/Sith/Gui/ReadOnlyAttribute.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 7af2fbd1cd0b4994f94ea902e622400e
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Sith/Utility.meta b/Assets/Sith/Utility.meta
new file mode 100644
index 0000000..b3fd19a
--- /dev/null
+++ b/Assets/Sith/Utility.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 556c48ca7fe85654d87e489a067c1f29
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Sith/Utility/Extensions.cs b/Assets/Sith/Utility/Extensions.cs
new file mode 100644
index 0000000..a457551
--- /dev/null
+++ b/Assets/Sith/Utility/Extensions.cs
@@ -0,0 +1,142 @@
+using Assets.Sith.Content;
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using UnityEngine;
+
+namespace Assets.Sith.Utility
+{
+    public static class MaterialExtensions
+    {
+        public static void SetCullMode(this Material mat, UnityEngine.Rendering.CullMode mode)
+        {
+            mat.SetInt("_Culling", (int)mode);
+        }
+
+        // [Applies to Sith shader] Sets geometry mode
+        public static void SetGeoMode(this Material mat, Content.JKL.GeoMode geoMode)
+        {
+            mat.SetInt("_GeoMode", (int)geoMode);
+        }
+
+        // [Applies to Sith shader] Sets lighting mode
+        public static void SetLightMode(this Material mat, Content.JKL.LightMode lightMode)
+        {
+            mat.SetInt("_LightMode", (int)lightMode);
+        }
+
+        public static Content.JKL.LightMode GetLightMode(this Material mat)
+        {
+            return (Content.JKL.LightMode) mat.GetInt("_LightMode");
+        }
+
+        // [Applies to Sith shader] Sector ambient light
+        public static void SetAmbientLight(this Material mat, Color ambientLight)
+        {
+            mat.SetColor("_AmbientLight", ambientLight);
+        }
+
+        // [Applies to Sith shader] Sector extra light
+        public static void SetExtraLight(this Material mat, Color extraLight)
+        {
+            mat.SetColor("_ExtraLight", extraLight);
+        }
+
+        // [Applies to Sith shader] Mesh face extra light
+        public static void SetFaceExtraLight(this Material mat, Color extraLight)
+        {
+            mat.SetColor("_FaceExtraLight", extraLight);
+        }
+
+        // [Applies to Sith shader] Sector tint color
+        public static void SetTint(this Material mat, Color tint)
+        {
+            mat.SetColor("_Tint", tint);
+        }
+
+        public static void EnableIjimShading(this Material mat, bool enable)
+        {
+            mat.SetInt("_Ijim", enable ? 1 : 0);
+        }
+
+        public static void EnableZWrite(this Material mat, bool enable)
+        {
+            mat.SetInt("_ZWrite", enable ? 1 : 0);
+        }
+    }
+
+    public static class GameObjectExtensions
+    {
+        public static void SetSectorLight(this GameObject obj, Color ambientLight, Color extraLight)
+        {
+            var renderers = obj.GetComponentsInChildren<Renderer>();
+            foreach (var r in renderers)
+            {
+                var matBlock = new MaterialPropertyBlock();
+                matBlock.SetColor("_AmbientLight", ambientLight);
+                matBlock.SetColor("_ExtraLight", extraLight);
+                r.SetPropertyBlock(matBlock);
+                //var mats = new Material[rend.materials.Length];
+                //for (var j = 0; j < r.materials.Length; j++)
+                //{
+                //    //var tempMaterial = new Material(r.sharedMaterials[j]);
+                //    //tempMaterial.SetAmbientLight(ambientLight);
+                //    //tempMaterial.SetExtraLight(extraLight);
+                //    //r.sharedMaterials[j] = tempMaterial;
+                //    //mats[j] = newMat;
+                //    r.materials[j].SetAmbientLight(ambientLight);
+                //    r.materials[j].SetExtraLight(extraLight);
+                //}
+                //rend.materials = mats;
+            }
+        }
+
+        public static void SetSectorTint(this GameObject obj, Color tint)
+        {
+            var renderers = obj.GetComponentsInChildren<Renderer>();
+            foreach (var r in renderers)
+            {
+                //var mats = new Material[rend.materials.Length];
+                for (var j = 0; j < r.materials.Length; j++)
+                {
+                    r.materials[j].SetTint(tint);
+                }
+            }
+        }
+    }
+
+    public static class DictionaryExtensions
+    {
+        public static TValue ValueOr<TKey, TValue>(this Dictionary<TKey, TValue> dictionary, TKey key, TValue defaultValue = default)
+        {
+            if (dictionary == null) { throw new ArgumentNullException(nameof(dictionary)); } // using C# 6
+            if (key == null) { throw new ArgumentNullException(nameof(key)); } //  using C# 6
+
+            TValue value;
+            return dictionary.TryGetValue(key, out value) ? value : defaultValue;
+        }
+
+        public static int IntOr<TKey>(this Dictionary<TKey, string> dictionary, TKey key, int defaultValue = 0)
+        {
+            if (dictionary == null) { throw new ArgumentNullException(nameof(dictionary)); } // using C# 6
+            if (key == null) { throw new ArgumentNullException(nameof(key)); } //  using C# 6
+
+            
+
+            return dictionary.TryGetValue(key, out string value) 
+                ? int.Parse(value.Replace("0x", ""), NumberStyles.AllowHexSpecifier)
+                : defaultValue;
+        }
+
+        public static float FloatOr<TKey>(this Dictionary<TKey, string> dictionary, TKey key, float defaultValue = 0.0f)
+        {
+            if (dictionary == null) { throw new ArgumentNullException(nameof(dictionary)); } // using C# 6
+            if (key == null) { throw new ArgumentNullException(nameof(key)); } //  using C# 6
+
+            return dictionary.TryGetValue(key, out string value) ? float.Parse(value) : defaultValue;
+        }
+    }
+}
diff --git a/Assets/Sith/Utility/Extensions.cs.meta b/Assets/Sith/Utility/Extensions.cs.meta
new file mode 100644
index 0000000..a98aa4a
--- /dev/null
+++ b/Assets/Sith/Utility/Extensions.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 9d6d72b0605867344ac424a78904dd69
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Sith/Utility/Range.cs b/Assets/Sith/Utility/Range.cs
new file mode 100644
index 0000000..5899d0f
--- /dev/null
+++ b/Assets/Sith/Utility/Range.cs
@@ -0,0 +1,17 @@
+using System;
+
+namespace Assets.Sith.Utility
+{
+    [Serializable]
+    public class Range
+    {
+        public int Min;
+        public int Max;
+
+        public Range(int min, int max)
+        {
+            this.Min = min;
+            this.Max = max;
+        }
+    }
+}
\ No newline at end of file
diff --git a/Assets/Sith/Utility/Range.cs.meta b/Assets/Sith/Utility/Range.cs.meta
new file mode 100644
index 0000000..8accc82
--- /dev/null
+++ b/Assets/Sith/Utility/Range.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 57179c131501099409298b45d3bd10c2
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Sith/Utility/Singleton.cs b/Assets/Sith/Utility/Singleton.cs
new file mode 100644
index 0000000..a3afbfa
--- /dev/null
+++ b/Assets/Sith/Utility/Singleton.cs
@@ -0,0 +1,21 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Assets.Sith.Utility
+{
+    public class Singleton<T> where T : class, new()
+    {
+        public T value {get; private set;}
+        public static T Instance
+        {
+            get { return _instance.Value; }
+        }
+
+        private static readonly Lazy<T>
+        _instance = new Lazy<T>(() => new T(), LazyThreadSafetyMode.ExecutionAndPublication);
+    }
+}
diff --git a/Assets/Sith/Utility/Singleton.cs.meta b/Assets/Sith/Utility/Singleton.cs.meta
new file mode 100644
index 0000000..d360fe0
--- /dev/null
+++ b/Assets/Sith/Utility/Singleton.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 2af740ff4d7bcd24db8c40861776f67f
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Sith/Utility/Utils.cs b/Assets/Sith/Utility/Utils.cs
new file mode 100644
index 0000000..b249a9c
--- /dev/null
+++ b/Assets/Sith/Utility/Utils.cs
@@ -0,0 +1,88 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using UnityEngine;
+
+namespace Assets.Sith.Utility
+{
+    public class Utils
+    {
+        public const float geoScaleFactor = 10.0f;
+        public static float Scale(float x)
+        {
+            return x * geoScaleFactor;
+        }
+
+        public static Vector2 Scale(Vector2 v)
+        {
+            return v * geoScaleFactor;
+        }
+
+        public static Vector3 Scale(Vector3 v)
+        {
+            return v * geoScaleFactor;
+        }
+
+        public static Vector3 GetUnityCoords(Vector3 pos)
+        {
+            return new Vector3(pos.x, pos.z, pos.y);
+        }
+
+        //public static Vector3 GetScaledUinityCoords(Vector3 sithPos)
+        //{
+        //    var pos = GetUnityCoords(sithPos);
+        //    return Scale(pos);
+        //}
+
+        internal static Quaternion ToThingOrientation(Quaternion rotation)
+        {
+            return Quaternion.Euler(rotation.eulerAngles.x, rotation.eulerAngles.y /*+ 180.0f*/, rotation.eulerAngles.z);
+        }
+
+        public static Quaternion FromMeshOrientation(float pitch, float yaw, float roll)
+        {
+            return Quaternion.Euler(-pitch, -yaw, -roll);
+        }
+        public static Quaternion FromThingOrientation(float pitch, float yaw, float roll)
+        {
+            return Quaternion.Euler(-pitch, -yaw, -roll);
+        }
+
+        public static List<int> GetTriangulationIndices(int startVertIdx, int numVertices)
+        {
+            var triIndices = new List<int>();
+            if (numVertices <= 3)
+            {
+                triIndices.Add(startVertIdx + 1); // switch 0 & 1 for unity coords
+                triIndices.Add(startVertIdx);
+                triIndices.Add(startVertIdx + 2);
+            }
+            else
+            {
+                var totalTris   = numVertices - 2;
+                var ofsTriVer0 = 0;
+                var ofsTriVer1 = 1;
+                var ofsTriVer2 = numVertices - 1;
+                for (var idx = 0; idx < totalTris; idx++)
+                {
+                    triIndices.Add(startVertIdx + ofsTriVer1); // switch 0 & 1 for unity coords
+                    triIndices.Add(startVertIdx + ofsTriVer0);
+                    triIndices.Add(startVertIdx + ofsTriVer2);
+
+                    if ((~idx & 1) != 0)
+                    {
+                        ofsTriVer0 = ofsTriVer1++;
+                    }
+                    else
+                    {
+                        ofsTriVer0 = ofsTriVer2;
+                        ofsTriVer2 = ofsTriVer2 - 1;
+                    }
+                }
+            }
+            return triIndices;
+        }
+    }
+}
diff --git a/Assets/Sith/Utility/Utils.cs.meta b/Assets/Sith/Utility/Utils.cs.meta
new file mode 100644
index 0000000..e600254
--- /dev/null
+++ b/Assets/Sith/Utility/Utils.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 431401fb73d2e504ca2dbce96c49430a
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Sith/Vfs.meta b/Assets/Sith/Vfs.meta
new file mode 100644
index 0000000..3f1739e
--- /dev/null
+++ b/Assets/Sith/Vfs.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 7f86664b3d87c6643904952b226ab3ae
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Scripts/GOBStream.cs b/Assets/Sith/Vfs/GOBStream.cs
similarity index 95%
rename from Assets/Scripts/GOBStream.cs
rename to Assets/Sith/Vfs/GOBStream.cs
index d113cb8..06ccf82 100644
--- a/Assets/Scripts/GOBStream.cs
+++ b/Assets/Sith/Vfs/GOBStream.cs
@@ -3,7 +3,7 @@
 using System.Text;
 using UnityEngine;
 
-namespace Assets.Scripts
+namespace Assets.Sith.Vfs
 {
     public class GOBRecord
     {
@@ -22,7 +22,9 @@ public class GOBStream : IDisposable
         public byte Version { get; private set; }
         public GOBRecord[] Records { get; private set; }
 
-        private Stream _stream;
+        public string Name { get { return _stream.Name; } }
+
+        private FileStream _stream;
         public GOBStream(string path)
         {
             _stream = new FileStream(path, FileMode.Open);
diff --git a/Assets/Sith/Vfs/GOBStream.cs.meta b/Assets/Sith/Vfs/GOBStream.cs.meta
new file mode 100644
index 0000000..f7277ba
--- /dev/null
+++ b/Assets/Sith/Vfs/GOBStream.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: fee1982c4c7bf9040929cb705f8fbde7
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Scripts/PartStream.cs b/Assets/Sith/Vfs/PartStream.cs
similarity index 98%
rename from Assets/Scripts/PartStream.cs
rename to Assets/Sith/Vfs/PartStream.cs
index 8847b1b..4d3332b 100644
--- a/Assets/Scripts/PartStream.cs
+++ b/Assets/Sith/Vfs/PartStream.cs
@@ -4,7 +4,7 @@
 using System.Linq;
 using System.Text;
 
-namespace Assets.Scripts
+namespace Assets.Sith.Vfs
 {
     class PartStream : Stream
     {
diff --git a/Assets/Scripts/PartStream.cs.meta b/Assets/Sith/Vfs/PartStream.cs.meta
similarity index 100%
rename from Assets/Scripts/PartStream.cs.meta
rename to Assets/Sith/Vfs/PartStream.cs.meta
diff --git a/Assets/Sith/Vfs/VirtualFileSystem.cs b/Assets/Sith/Vfs/VirtualFileSystem.cs
new file mode 100644
index 0000000..d72d879
--- /dev/null
+++ b/Assets/Sith/Vfs/VirtualFileSystem.cs
@@ -0,0 +1,140 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using UnityEngine;
+
+namespace Assets.Sith.Vfs
+{
+    class GOBRecordEntry
+    {
+        public GOBStream GOBStream { get; set; }
+        public GOBRecord GOBRecord { get; set; }
+    }
+
+    public class VirtualFileSystem
+    {
+        private Dictionary<string, GOBRecordEntry> _recordDict = new Dictionary<string, GOBRecordEntry>();
+        private List<string> _sysPaths = new List<string>();
+
+        public VirtualFileSystem() {}
+
+        //public VirtualFileSystem(string gamePath, string[] gobFiles)
+        //{
+        //    _extractedPath = Path.Combine(gamePath, "Resource");
+
+        //    _recordDict = new Dictionary<string, GOBRecordEntry>();
+        //    foreach (var gobFile in gobFiles)
+        //    {
+        //        var gobPath = Path.Combine(gamePath, gobFile);
+        //        if (File.Exists(gobPath))
+        //        {
+        //            var gob = new GOBStream(gobPath);
+        //            foreach (var record in gob.Records)
+        //            {
+        //                var name = record.Name.ToLower();
+        //                if (!_recordDict.ContainsKey(name))
+        //                    _recordDict.Add(name, new GOBRecordEntry { GOBStream = gob, GOBRecord = record });
+        //            }
+        //        }
+        //    }
+        //}
+
+        public bool AddGob(string gobFilePath)
+        {
+            if (File.Exists(gobFilePath))
+            {
+                foreach (var e in _recordDict.Values)
+                {
+                    if (e.GOBStream.Name == gobFilePath) return false;
+                }
+                var gob = new GOBStream(gobFilePath);
+                AddGob(gob);
+                return true;
+            }
+            return false;
+        }
+
+        public void AddGob(in GOBStream gob)
+        {
+            foreach (var record in gob.Records)
+            {
+                var name = record.Name.ToLower();
+                if (!_recordDict.ContainsKey(name))
+                    _recordDict.Add(name, new GOBRecordEntry { GOBStream = gob, GOBRecord = record });
+            }
+        }
+
+        public bool AddSystemPath(string sysFolderPath)
+        {
+            foreach (var path in _sysPaths)
+            {
+                if (sysFolderPath == path)
+                    return false;
+            }
+            _sysPaths.Add(sysFolderPath);
+            return true;
+        }
+
+        private bool ExistOnDisk(string name)
+        {
+            foreach (var path in _sysPaths)
+            {
+                if (File.Exists(Path.Combine(path, name)))
+                    return true;
+            }
+            return false;
+        }
+
+        #nullable enable
+        private Stream? Find(string name)
+        {
+            //name = name.ToLower();
+            foreach (var path in _sysPaths)
+            {
+                var filepath = Path.Combine(path, name);
+                if (File.Exists(filepath))
+                {
+                    Debug.Log("GOBManager [DISK]: Loading " + name);
+                    return new FileStream(filepath, FileMode.Open);
+                }
+            }
+
+            if (!_recordDict.ContainsKey(name))
+                return null;
+
+            Debug.Log("GOBManager: Loading " + name);
+            var recordEntry = _recordDict[name];
+            return recordEntry.GOBStream.GetRecordStream(recordEntry.GOBRecord);
+        }
+
+        public Stream GetStream(string name)
+        {
+            var s = Find(name);
+            if (s == null)
+                throw new Exception("Cannot find file in GOB: " + name);
+            return s;
+            //var lowerName = name.ToLower();
+
+            //if (ExistOnDisk(name))
+            //{
+            //    Debug.Log("GOBManager [DISK]: Loading " + lowerName);
+            //    return new FileStream(Path.Combine(_extractedPath, name), FileMode.Open);
+            //}
+
+            //if(!_recordDict.ContainsKey(lowerName))
+            //    throw new Exception("Cannot find file in GOB: " + lowerName);
+
+            //Debug.Log("GOBManager: Loading " + lowerName);
+            //var recordEntry = _recordDict[lowerName];
+            //return recordEntry.GOBStream.GetRecordStream(recordEntry.GOBRecord);
+        }
+
+        public bool Exists(string name)
+        {
+            if (ExistOnDisk(name))
+                return true;
+
+            return _recordDict.ContainsKey(name);
+        }
+    }
+}
\ No newline at end of file
diff --git a/Assets/Sith/Vfs/VirtualFileSystem.cs.meta b/Assets/Sith/Vfs/VirtualFileSystem.cs.meta
new file mode 100644
index 0000000..1e3f6f1
--- /dev/null
+++ b/Assets/Sith/Vfs/VirtualFileSystem.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 9c1da198cfa582c4d90b1f402e710f3e
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/StandardMaterial.mat b/Assets/StandardMaterial.mat
deleted file mode 100644
index e9cf61a..0000000
Binary files a/Assets/StandardMaterial.mat and /dev/null differ
diff --git a/Assets/StandardMaterial.mat.meta b/Assets/StandardMaterial.mat.meta
deleted file mode 100644
index 3c4ba5b..0000000
--- a/Assets/StandardMaterial.mat.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 7ee4ce2e74b5a444187ef4a3499aff07
-timeCreated: 1451693122
-licenseType: Free
-NativeFormatImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Directory.Build.props b/Directory.Build.props
new file mode 100644
index 0000000..6c3294e
--- /dev/null
+++ b/Directory.Build.props
@@ -0,0 +1,7 @@
+<Project>
+ <PropertyGroup>
+    <Nullable>enable</Nullable>
+    <RunAnalyzersDuringBuild>true</RunAnalyzersDuringBuild>
+    <RunAnalyzersDuringLiveAnalysis>true</RunAnalyzersDuringLiveAnalysis>
+ </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/Directory.Build.targets b/Directory.Build.targets
new file mode 100644
index 0000000..497a2bf
--- /dev/null
+++ b/Directory.Build.targets
@@ -0,0 +1,7 @@
+<Project>
+	<PropertyGroup>
+		<Nullable>enable</Nullable>
+		<RunAnalyzersDuringBuild>true</RunAnalyzersDuringBuild>
+		<RunAnalyzersDuringLiveAnalysis>true</RunAnalyzersDuringLiveAnalysis>
+	</PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/Packages/manifest.json b/Packages/manifest.json
index 9685f21..02dff4d 100644
--- a/Packages/manifest.json
+++ b/Packages/manifest.json
@@ -1,15 +1,19 @@
 {
   "dependencies": {
-    "com.unity.ads": "2.0.8",
-    "com.unity.analytics": "3.3.2",
-    "com.unity.collab-proxy": "1.2.16",
-    "com.unity.multiplayer-hlapi": "1.0.2",
-    "com.unity.package-manager-ui": "2.1.2",
-    "com.unity.purchasing": "2.0.6",
-    "com.unity.textmeshpro": "2.0.0",
-    "com.unity.timeline": "1.0.0",
-    "com.unity.xr.legacyinputhelpers": "2.0.2",
+    "com.unity.2d.sprite": "1.0.0",
+    "com.unity.2d.tilemap": "1.0.0",
+    "com.unity.ads": "4.4.2",
+    "com.unity.analytics": "3.8.1",
+    "com.unity.collab-proxy": "2.0.7",
+    "com.unity.formats.fbx": "4.2.1",
+    "com.unity.ide.visualstudio": "2.0.22",
+    "com.unity.ide.vscode": "1.2.5",
+    "com.unity.test-framework": "1.1.33",
+    "com.unity.textmeshpro": "3.0.6",
+    "com.unity.ugui": "1.0.0",
+    "com.unity.xr.legacyinputhelpers": "2.1.10",
     "com.unity.modules.ai": "1.0.0",
+    "com.unity.modules.androidjni": "1.0.0",
     "com.unity.modules.animation": "1.0.0",
     "com.unity.modules.assetbundle": "1.0.0",
     "com.unity.modules.audio": "1.0.0",
diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json
new file mode 100644
index 0000000..46dfbaf
--- /dev/null
+++ b/Packages/packages-lock.json
@@ -0,0 +1,408 @@
+{
+  "dependencies": {
+    "com.autodesk.fbx": {
+      "version": "4.2.1",
+      "depth": 1,
+      "source": "registry",
+      "dependencies": {},
+      "url": "https://packages.unity.com"
+    },
+    "com.unity.2d.sprite": {
+      "version": "1.0.0",
+      "depth": 0,
+      "source": "builtin",
+      "dependencies": {}
+    },
+    "com.unity.2d.tilemap": {
+      "version": "1.0.0",
+      "depth": 0,
+      "source": "builtin",
+      "dependencies": {
+        "com.unity.modules.tilemap": "1.0.0",
+        "com.unity.modules.uielements": "1.0.0"
+      }
+    },
+    "com.unity.ads": {
+      "version": "4.4.2",
+      "depth": 0,
+      "source": "registry",
+      "dependencies": {
+        "com.unity.ugui": "1.0.0"
+      },
+      "url": "https://packages.unity.com"
+    },
+    "com.unity.analytics": {
+      "version": "3.8.1",
+      "depth": 0,
+      "source": "registry",
+      "dependencies": {
+        "com.unity.services.analytics": "1.0.4",
+        "com.unity.ugui": "1.0.0"
+      },
+      "url": "https://packages.unity.com"
+    },
+    "com.unity.collab-proxy": {
+      "version": "2.0.7",
+      "depth": 0,
+      "source": "registry",
+      "dependencies": {},
+      "url": "https://packages.unity.com"
+    },
+    "com.unity.ext.nunit": {
+      "version": "1.0.6",
+      "depth": 1,
+      "source": "registry",
+      "dependencies": {},
+      "url": "https://packages.unity.com"
+    },
+    "com.unity.formats.fbx": {
+      "version": "4.2.1",
+      "depth": 0,
+      "source": "registry",
+      "dependencies": {
+        "com.unity.timeline": "1.7.1",
+        "com.autodesk.fbx": "4.2.1"
+      },
+      "url": "https://packages.unity.com"
+    },
+    "com.unity.ide.visualstudio": {
+      "version": "2.0.22",
+      "depth": 0,
+      "source": "registry",
+      "dependencies": {
+        "com.unity.test-framework": "1.1.9"
+      },
+      "url": "https://packages.unity.com"
+    },
+    "com.unity.ide.vscode": {
+      "version": "1.2.5",
+      "depth": 0,
+      "source": "registry",
+      "dependencies": {},
+      "url": "https://packages.unity.com"
+    },
+    "com.unity.nuget.newtonsoft-json": {
+      "version": "3.2.1",
+      "depth": 3,
+      "source": "registry",
+      "dependencies": {},
+      "url": "https://packages.unity.com"
+    },
+    "com.unity.services.analytics": {
+      "version": "5.0.0",
+      "depth": 1,
+      "source": "registry",
+      "dependencies": {
+        "com.unity.ugui": "1.0.0",
+        "com.unity.modules.jsonserialize": "1.0.0",
+        "com.unity.services.core": "1.10.1"
+      },
+      "url": "https://packages.unity.com"
+    },
+    "com.unity.services.core": {
+      "version": "1.11.0",
+      "depth": 2,
+      "source": "registry",
+      "dependencies": {
+        "com.unity.modules.unitywebrequest": "1.0.0",
+        "com.unity.nuget.newtonsoft-json": "3.2.1",
+        "com.unity.modules.androidjni": "1.0.0"
+      },
+      "url": "https://packages.unity.com"
+    },
+    "com.unity.test-framework": {
+      "version": "1.1.33",
+      "depth": 0,
+      "source": "registry",
+      "dependencies": {
+        "com.unity.ext.nunit": "1.0.6",
+        "com.unity.modules.imgui": "1.0.0",
+        "com.unity.modules.jsonserialize": "1.0.0"
+      },
+      "url": "https://packages.unity.com"
+    },
+    "com.unity.textmeshpro": {
+      "version": "3.0.6",
+      "depth": 0,
+      "source": "registry",
+      "dependencies": {
+        "com.unity.ugui": "1.0.0"
+      },
+      "url": "https://packages.unity.com"
+    },
+    "com.unity.timeline": {
+      "version": "1.7.5",
+      "depth": 1,
+      "source": "registry",
+      "dependencies": {
+        "com.unity.modules.director": "1.0.0",
+        "com.unity.modules.animation": "1.0.0",
+        "com.unity.modules.audio": "1.0.0",
+        "com.unity.modules.particlesystem": "1.0.0"
+      },
+      "url": "https://packages.unity.com"
+    },
+    "com.unity.ugui": {
+      "version": "1.0.0",
+      "depth": 0,
+      "source": "builtin",
+      "dependencies": {
+        "com.unity.modules.ui": "1.0.0",
+        "com.unity.modules.imgui": "1.0.0"
+      }
+    },
+    "com.unity.xr.legacyinputhelpers": {
+      "version": "2.1.10",
+      "depth": 0,
+      "source": "registry",
+      "dependencies": {
+        "com.unity.modules.vr": "1.0.0",
+        "com.unity.modules.xr": "1.0.0"
+      },
+      "url": "https://packages.unity.com"
+    },
+    "com.unity.modules.ai": {
+      "version": "1.0.0",
+      "depth": 0,
+      "source": "builtin",
+      "dependencies": {}
+    },
+    "com.unity.modules.androidjni": {
+      "version": "1.0.0",
+      "depth": 0,
+      "source": "builtin",
+      "dependencies": {}
+    },
+    "com.unity.modules.animation": {
+      "version": "1.0.0",
+      "depth": 0,
+      "source": "builtin",
+      "dependencies": {}
+    },
+    "com.unity.modules.assetbundle": {
+      "version": "1.0.0",
+      "depth": 0,
+      "source": "builtin",
+      "dependencies": {}
+    },
+    "com.unity.modules.audio": {
+      "version": "1.0.0",
+      "depth": 0,
+      "source": "builtin",
+      "dependencies": {}
+    },
+    "com.unity.modules.cloth": {
+      "version": "1.0.0",
+      "depth": 0,
+      "source": "builtin",
+      "dependencies": {
+        "com.unity.modules.physics": "1.0.0"
+      }
+    },
+    "com.unity.modules.director": {
+      "version": "1.0.0",
+      "depth": 0,
+      "source": "builtin",
+      "dependencies": {
+        "com.unity.modules.audio": "1.0.0",
+        "com.unity.modules.animation": "1.0.0"
+      }
+    },
+    "com.unity.modules.imageconversion": {
+      "version": "1.0.0",
+      "depth": 0,
+      "source": "builtin",
+      "dependencies": {}
+    },
+    "com.unity.modules.imgui": {
+      "version": "1.0.0",
+      "depth": 0,
+      "source": "builtin",
+      "dependencies": {}
+    },
+    "com.unity.modules.jsonserialize": {
+      "version": "1.0.0",
+      "depth": 0,
+      "source": "builtin",
+      "dependencies": {}
+    },
+    "com.unity.modules.particlesystem": {
+      "version": "1.0.0",
+      "depth": 0,
+      "source": "builtin",
+      "dependencies": {}
+    },
+    "com.unity.modules.physics": {
+      "version": "1.0.0",
+      "depth": 0,
+      "source": "builtin",
+      "dependencies": {}
+    },
+    "com.unity.modules.physics2d": {
+      "version": "1.0.0",
+      "depth": 0,
+      "source": "builtin",
+      "dependencies": {}
+    },
+    "com.unity.modules.screencapture": {
+      "version": "1.0.0",
+      "depth": 0,
+      "source": "builtin",
+      "dependencies": {
+        "com.unity.modules.imageconversion": "1.0.0"
+      }
+    },
+    "com.unity.modules.subsystems": {
+      "version": "1.0.0",
+      "depth": 1,
+      "source": "builtin",
+      "dependencies": {
+        "com.unity.modules.jsonserialize": "1.0.0"
+      }
+    },
+    "com.unity.modules.terrain": {
+      "version": "1.0.0",
+      "depth": 0,
+      "source": "builtin",
+      "dependencies": {}
+    },
+    "com.unity.modules.terrainphysics": {
+      "version": "1.0.0",
+      "depth": 0,
+      "source": "builtin",
+      "dependencies": {
+        "com.unity.modules.physics": "1.0.0",
+        "com.unity.modules.terrain": "1.0.0"
+      }
+    },
+    "com.unity.modules.tilemap": {
+      "version": "1.0.0",
+      "depth": 0,
+      "source": "builtin",
+      "dependencies": {
+        "com.unity.modules.physics2d": "1.0.0"
+      }
+    },
+    "com.unity.modules.ui": {
+      "version": "1.0.0",
+      "depth": 0,
+      "source": "builtin",
+      "dependencies": {}
+    },
+    "com.unity.modules.uielements": {
+      "version": "1.0.0",
+      "depth": 0,
+      "source": "builtin",
+      "dependencies": {
+        "com.unity.modules.ui": "1.0.0",
+        "com.unity.modules.imgui": "1.0.0",
+        "com.unity.modules.jsonserialize": "1.0.0"
+      }
+    },
+    "com.unity.modules.umbra": {
+      "version": "1.0.0",
+      "depth": 0,
+      "source": "builtin",
+      "dependencies": {}
+    },
+    "com.unity.modules.unityanalytics": {
+      "version": "1.0.0",
+      "depth": 0,
+      "source": "builtin",
+      "dependencies": {
+        "com.unity.modules.unitywebrequest": "1.0.0",
+        "com.unity.modules.jsonserialize": "1.0.0"
+      }
+    },
+    "com.unity.modules.unitywebrequest": {
+      "version": "1.0.0",
+      "depth": 0,
+      "source": "builtin",
+      "dependencies": {}
+    },
+    "com.unity.modules.unitywebrequestassetbundle": {
+      "version": "1.0.0",
+      "depth": 0,
+      "source": "builtin",
+      "dependencies": {
+        "com.unity.modules.assetbundle": "1.0.0",
+        "com.unity.modules.unitywebrequest": "1.0.0"
+      }
+    },
+    "com.unity.modules.unitywebrequestaudio": {
+      "version": "1.0.0",
+      "depth": 0,
+      "source": "builtin",
+      "dependencies": {
+        "com.unity.modules.unitywebrequest": "1.0.0",
+        "com.unity.modules.audio": "1.0.0"
+      }
+    },
+    "com.unity.modules.unitywebrequesttexture": {
+      "version": "1.0.0",
+      "depth": 0,
+      "source": "builtin",
+      "dependencies": {
+        "com.unity.modules.unitywebrequest": "1.0.0",
+        "com.unity.modules.imageconversion": "1.0.0"
+      }
+    },
+    "com.unity.modules.unitywebrequestwww": {
+      "version": "1.0.0",
+      "depth": 0,
+      "source": "builtin",
+      "dependencies": {
+        "com.unity.modules.unitywebrequest": "1.0.0",
+        "com.unity.modules.unitywebrequestassetbundle": "1.0.0",
+        "com.unity.modules.unitywebrequestaudio": "1.0.0",
+        "com.unity.modules.audio": "1.0.0",
+        "com.unity.modules.assetbundle": "1.0.0",
+        "com.unity.modules.imageconversion": "1.0.0"
+      }
+    },
+    "com.unity.modules.vehicles": {
+      "version": "1.0.0",
+      "depth": 0,
+      "source": "builtin",
+      "dependencies": {
+        "com.unity.modules.physics": "1.0.0"
+      }
+    },
+    "com.unity.modules.video": {
+      "version": "1.0.0",
+      "depth": 0,
+      "source": "builtin",
+      "dependencies": {
+        "com.unity.modules.audio": "1.0.0",
+        "com.unity.modules.ui": "1.0.0",
+        "com.unity.modules.unitywebrequest": "1.0.0"
+      }
+    },
+    "com.unity.modules.vr": {
+      "version": "1.0.0",
+      "depth": 0,
+      "source": "builtin",
+      "dependencies": {
+        "com.unity.modules.jsonserialize": "1.0.0",
+        "com.unity.modules.physics": "1.0.0",
+        "com.unity.modules.xr": "1.0.0"
+      }
+    },
+    "com.unity.modules.wind": {
+      "version": "1.0.0",
+      "depth": 0,
+      "source": "builtin",
+      "dependencies": {}
+    },
+    "com.unity.modules.xr": {
+      "version": "1.0.0",
+      "depth": 0,
+      "source": "builtin",
+      "dependencies": {
+        "com.unity.modules.physics": "1.0.0",
+        "com.unity.modules.jsonserialize": "1.0.0",
+        "com.unity.modules.subsystems": "1.0.0"
+      }
+    }
+  }
+}
diff --git a/ProjectSettings/DynamicsManager.asset b/ProjectSettings/DynamicsManager.asset
index ba583ee..98a987f 100644
Binary files a/ProjectSettings/DynamicsManager.asset and b/ProjectSettings/DynamicsManager.asset differ
diff --git a/ProjectSettings/InputManager.asset b/ProjectSettings/InputManager.asset
index a1141a4..85ab2ed 100644
Binary files a/ProjectSettings/InputManager.asset and b/ProjectSettings/InputManager.asset differ
diff --git a/ProjectSettings/MemorySettings.asset b/ProjectSettings/MemorySettings.asset
new file mode 100644
index 0000000..5b5face
--- /dev/null
+++ b/ProjectSettings/MemorySettings.asset
@@ -0,0 +1,35 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!387306366 &1
+MemorySettings:
+  m_ObjectHideFlags: 0
+  m_EditorMemorySettings:
+    m_MainAllocatorBlockSize: -1
+    m_ThreadAllocatorBlockSize: -1
+    m_MainGfxBlockSize: -1
+    m_ThreadGfxBlockSize: -1
+    m_CacheBlockSize: -1
+    m_TypetreeBlockSize: -1
+    m_ProfilerBlockSize: -1
+    m_ProfilerEditorBlockSize: -1
+    m_BucketAllocatorGranularity: -1
+    m_BucketAllocatorBucketsCount: -1
+    m_BucketAllocatorBlockSize: -1
+    m_BucketAllocatorBlockCount: -1
+    m_ProfilerBucketAllocatorGranularity: -1
+    m_ProfilerBucketAllocatorBucketsCount: -1
+    m_ProfilerBucketAllocatorBlockSize: -1
+    m_ProfilerBucketAllocatorBlockCount: -1
+    m_TempAllocatorSizeMain: -1
+    m_JobTempAllocatorBlockSize: -1
+    m_BackgroundJobTempAllocatorBlockSize: -1
+    m_JobTempAllocatorReducedBlockSize: -1
+    m_TempAllocatorSizeGIBakingWorker: -1
+    m_TempAllocatorSizeNavMeshWorker: -1
+    m_TempAllocatorSizeAudioWorker: -1
+    m_TempAllocatorSizeCloudWorker: -1
+    m_TempAllocatorSizeGfx: -1
+    m_TempAllocatorSizeJobWorker: -1
+    m_TempAllocatorSizeBackgroundWorker: -1
+    m_TempAllocatorSizePreloadManager: -1
+  m_PlatformMemorySettings: {}
diff --git a/ProjectSettings/PackageManagerSettings.asset b/ProjectSettings/PackageManagerSettings.asset
new file mode 100644
index 0000000..568fee6
--- /dev/null
+++ b/ProjectSettings/PackageManagerSettings.asset
@@ -0,0 +1,43 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &1
+MonoBehaviour:
+  m_ObjectHideFlags: 61
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 13964, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_EnablePreviewPackages: 1
+  m_EnablePackageDependencies: 0
+  m_AdvancedSettingsExpanded: 1
+  m_ScopedRegistriesSettingsExpanded: 1
+  oneTimeWarningShown: 1
+  m_Registries:
+  - m_Id: main
+    m_Name: 
+    m_Url: https://packages.unity.com
+    m_Scopes: []
+    m_IsDefault: 1
+    m_Capabilities: 7
+  m_UserSelectedRegistryName: 
+  m_UserAddingNewScopedRegistry: 0
+  m_RegistryInfoDraft:
+    m_ErrorMessage: 
+    m_Original:
+      m_Id: 
+      m_Name: 
+      m_Url: 
+      m_Scopes: []
+      m_IsDefault: 0
+      m_Capabilities: 0
+    m_Modified: 0
+    m_Name: 
+    m_Url: 
+    m_Scopes:
+    - 
+    m_SelectedScopeIndex: 0
diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset
index 94e5b61..70378d1 100644
Binary files a/ProjectSettings/ProjectSettings.asset and b/ProjectSettings/ProjectSettings.asset differ
diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt
index 241ebd0..a74c35f 100644
--- a/ProjectSettings/ProjectVersion.txt
+++ b/ProjectSettings/ProjectVersion.txt
@@ -1,2 +1,2 @@
-m_EditorVersion: 2019.1.0f2
-m_EditorVersionWithRevision: 2019.1.0f2 (292b93d75a2c)
+m_EditorVersion: 2022.3.9f1
+m_EditorVersionWithRevision: 2022.3.9f1 (ea401c316338)
diff --git a/ProjectSettings/SceneTemplateSettings.json b/ProjectSettings/SceneTemplateSettings.json
new file mode 100644
index 0000000..5e97f83
--- /dev/null
+++ b/ProjectSettings/SceneTemplateSettings.json
@@ -0,0 +1,121 @@
+{
+    "templatePinStates": [],
+    "dependencyTypeInfos": [
+        {
+            "userAdded": false,
+            "type": "UnityEngine.AnimationClip",
+            "defaultInstantiationMode": 0
+        },
+        {
+            "userAdded": false,
+            "type": "UnityEditor.Animations.AnimatorController",
+            "defaultInstantiationMode": 0
+        },
+        {
+            "userAdded": false,
+            "type": "UnityEngine.AnimatorOverrideController",
+            "defaultInstantiationMode": 0
+        },
+        {
+            "userAdded": false,
+            "type": "UnityEditor.Audio.AudioMixerController",
+            "defaultInstantiationMode": 0
+        },
+        {
+            "userAdded": false,
+            "type": "UnityEngine.ComputeShader",
+            "defaultInstantiationMode": 1
+        },
+        {
+            "userAdded": false,
+            "type": "UnityEngine.Cubemap",
+            "defaultInstantiationMode": 0
+        },
+        {
+            "userAdded": false,
+            "type": "UnityEngine.GameObject",
+            "defaultInstantiationMode": 0
+        },
+        {
+            "userAdded": false,
+            "type": "UnityEditor.LightingDataAsset",
+            "defaultInstantiationMode": 0
+        },
+        {
+            "userAdded": false,
+            "type": "UnityEngine.LightingSettings",
+            "defaultInstantiationMode": 0
+        },
+        {
+            "userAdded": false,
+            "type": "UnityEngine.Material",
+            "defaultInstantiationMode": 0
+        },
+        {
+            "userAdded": false,
+            "type": "UnityEditor.MonoScript",
+            "defaultInstantiationMode": 1
+        },
+        {
+            "userAdded": false,
+            "type": "UnityEngine.PhysicMaterial",
+            "defaultInstantiationMode": 0
+        },
+        {
+            "userAdded": false,
+            "type": "UnityEngine.PhysicsMaterial2D",
+            "defaultInstantiationMode": 0
+        },
+        {
+            "userAdded": false,
+            "type": "UnityEngine.Rendering.PostProcessing.PostProcessProfile",
+            "defaultInstantiationMode": 0
+        },
+        {
+            "userAdded": false,
+            "type": "UnityEngine.Rendering.PostProcessing.PostProcessResources",
+            "defaultInstantiationMode": 0
+        },
+        {
+            "userAdded": false,
+            "type": "UnityEngine.Rendering.VolumeProfile",
+            "defaultInstantiationMode": 0
+        },
+        {
+            "userAdded": false,
+            "type": "UnityEditor.SceneAsset",
+            "defaultInstantiationMode": 1
+        },
+        {
+            "userAdded": false,
+            "type": "UnityEngine.Shader",
+            "defaultInstantiationMode": 1
+        },
+        {
+            "userAdded": false,
+            "type": "UnityEngine.ShaderVariantCollection",
+            "defaultInstantiationMode": 1
+        },
+        {
+            "userAdded": false,
+            "type": "UnityEngine.Texture",
+            "defaultInstantiationMode": 0
+        },
+        {
+            "userAdded": false,
+            "type": "UnityEngine.Texture2D",
+            "defaultInstantiationMode": 0
+        },
+        {
+            "userAdded": false,
+            "type": "UnityEngine.Timeline.TimelineAsset",
+            "defaultInstantiationMode": 0
+        }
+    ],
+    "defaultDependencyTypeInfo": {
+        "userAdded": false,
+        "type": "<default_scene_template_dependencies>",
+        "defaultInstantiationMode": 1
+    },
+    "newSceneOverride": 0
+}
\ No newline at end of file
diff --git a/ProjectSettings/URPProjectSettings.asset b/ProjectSettings/URPProjectSettings.asset
new file mode 100644
index 0000000..3077404
--- /dev/null
+++ b/ProjectSettings/URPProjectSettings.asset
@@ -0,0 +1,15 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &1
+MonoBehaviour:
+  m_ObjectHideFlags: 61
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 247994e1f5a72c2419c26a37e9334c01, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_LastMaterialVersion: 4
diff --git a/ProjectSettings/VersionControlSettings.asset b/ProjectSettings/VersionControlSettings.asset
new file mode 100644
index 0000000..dca2881
--- /dev/null
+++ b/ProjectSettings/VersionControlSettings.asset
@@ -0,0 +1,8 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!890905787 &1
+VersionControlSettings:
+  m_ObjectHideFlags: 0
+  m_Mode: Visible Meta Files
+  m_CollabEditorSettings:
+    inProgressEnabled: 1