diff --git a/Assets/Scripts/Logic.meta b/Assets/Scripts/Logic.meta
new file mode 100644
index 0000000..11ebafc
--- /dev/null
+++ b/Assets/Scripts/Logic.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: bda3fde8d921a4948a2cf1f839816627
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Scripts/Logic/Control.meta b/Assets/Scripts/Logic/Control.meta
new file mode 100644
index 0000000..9d25cf5
--- /dev/null
+++ b/Assets/Scripts/Logic/Control.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 7cd11a47c5c25664fb9ebb7a87d3bfb2
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Scripts/Logic/Control/Control.cs b/Assets/Scripts/Logic/Control/Control.cs
new file mode 100644
index 0000000..06fa2df
--- /dev/null
+++ b/Assets/Scripts/Logic/Control/Control.cs
@@ -0,0 +1,29 @@
+using System;
+using UnityEngine;
+
+[Serializable]
+public class Control
+{
+  [HideInInspector]
+  public Logic logic;
+
+  public void Set(InspectorSetter setter)
+  {
+
+  }
+
+  public void Fetch(InspectorSetter setter)
+  {
+
+  }
+
+  public void Start(Logic logic)
+  {
+    this.logic = logic;
+  }
+
+  public void Update()
+  {
+
+  }
+}
\ No newline at end of file
diff --git a/Assets/Scripts/Painter.cs.meta b/Assets/Scripts/Logic/Control/Control.cs.meta
similarity index 83%
rename from Assets/Scripts/Painter.cs.meta
rename to Assets/Scripts/Logic/Control/Control.cs.meta
index 9450767..da40fd3 100644
--- a/Assets/Scripts/Painter.cs.meta
+++ b/Assets/Scripts/Logic/Control/Control.cs.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 0398ec04026615b42bcd4362f03041ca
+guid: 06dfe74aa9d30a84681f5b16806b4e75
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2
diff --git a/Assets/Scripts/Logic/Control/OculusFilter.cs b/Assets/Scripts/Logic/Control/OculusFilter.cs
new file mode 100644
index 0000000..114f340
--- /dev/null
+++ b/Assets/Scripts/Logic/Control/OculusFilter.cs
@@ -0,0 +1,18 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class OculusBS : MonoBehaviour
+{
+    // Start is called before the first frame update
+    void Start()
+    {
+        
+    }
+
+    // Update is called once per frame
+    void Update()
+    {
+        
+    }
+}
diff --git a/Assets/Scripts/Logic/Control/OculusFilter.cs.meta b/Assets/Scripts/Logic/Control/OculusFilter.cs.meta
new file mode 100644
index 0000000..f2d9d69
--- /dev/null
+++ b/Assets/Scripts/Logic/Control/OculusFilter.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 48ad6fd1dd746bd47bed8f1e343717d8
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Scripts/Logic/Control/ValveFilter.cs b/Assets/Scripts/Logic/Control/ValveFilter.cs
new file mode 100644
index 0000000..aab8dc4
--- /dev/null
+++ b/Assets/Scripts/Logic/Control/ValveFilter.cs
@@ -0,0 +1,18 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class ValveFilter : MonoBehaviour
+{
+    // Start is called before the first frame update
+    void Start()
+    {
+        
+    }
+
+    // Update is called once per frame
+    void Update()
+    {
+        
+    }
+}
diff --git a/Assets/Scripts/Logic/Control/ValveFilter.cs.meta b/Assets/Scripts/Logic/Control/ValveFilter.cs.meta
new file mode 100644
index 0000000..1738dad
--- /dev/null
+++ b/Assets/Scripts/Logic/Control/ValveFilter.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 437205472051c9b49b7ca818824beb05
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Scripts/Logic.cs b/Assets/Scripts/Logic/Logic.cs
similarity index 69%
rename from Assets/Scripts/Logic.cs
rename to Assets/Scripts/Logic/Logic.cs
index d9386e1..04fb0eb 100644
--- a/Assets/Scripts/Logic.cs
+++ b/Assets/Scripts/Logic/Logic.cs
@@ -7,25 +7,28 @@ public class Logic
   [HideInInspector]
   public Monolith mono;
 
-  public Rig rig;
-
-  // [Header("Variables")]
-
-  // public World world; Snake snake; public Box box; public
+  public Control control;
+  public World world;
+    public Rig rig;
 
   public void Set(InspectorSetter setter)
   {
     rig.Set(setter);
+    world.Set(setter);
   }
 
   public void Fetch(InspectorSetter setter)
   {
     rig.Fetch(setter);
+    world.Fetch(setter);
   }
 
   public void Start(Monolith mono)
   {
     this.mono = mono;
+
+    rig.Start(this);
+    world.Start(this);
   }
 
   public void Update()
diff --git a/Assets/Scripts/Logic.cs.meta b/Assets/Scripts/Logic/Logic.cs.meta
similarity index 100%
rename from Assets/Scripts/Logic.cs.meta
rename to Assets/Scripts/Logic/Logic.cs.meta
diff --git a/Assets/Scripts/Logic/World.meta b/Assets/Scripts/Logic/World.meta
new file mode 100644
index 0000000..8b3aafb
--- /dev/null
+++ b/Assets/Scripts/Logic/World.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 327a22a5e4aa834499784e52024aad8b
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Scripts/AI.cs b/Assets/Scripts/Logic/World/AI.cs
similarity index 100%
rename from Assets/Scripts/AI.cs
rename to Assets/Scripts/Logic/World/AI.cs
diff --git a/Assets/Scripts/AI.cs.meta b/Assets/Scripts/Logic/World/AI.cs.meta
similarity index 100%
rename from Assets/Scripts/AI.cs.meta
rename to Assets/Scripts/Logic/World/AI.cs.meta
diff --git a/Assets/Scripts/BoxUI.cs b/Assets/Scripts/Logic/World/BoxUI.cs
similarity index 100%
rename from Assets/Scripts/BoxUI.cs
rename to Assets/Scripts/Logic/World/BoxUI.cs
diff --git a/Assets/Scripts/BoxUI.cs.meta b/Assets/Scripts/Logic/World/BoxUI.cs.meta
similarity index 100%
rename from Assets/Scripts/BoxUI.cs.meta
rename to Assets/Scripts/Logic/World/BoxUI.cs.meta
diff --git a/Assets/Scripts/Game.cs b/Assets/Scripts/Logic/World/Game.cs
similarity index 100%
rename from Assets/Scripts/Game.cs
rename to Assets/Scripts/Logic/World/Game.cs
diff --git a/Assets/Scripts/Game.cs.meta b/Assets/Scripts/Logic/World/Game.cs.meta
similarity index 100%
rename from Assets/Scripts/Game.cs.meta
rename to Assets/Scripts/Logic/World/Game.cs.meta
diff --git a/Assets/Scripts/Rig.cs b/Assets/Scripts/Logic/World/Rig.cs
similarity index 97%
rename from Assets/Scripts/Rig.cs
rename to Assets/Scripts/Logic/World/Rig.cs
index 8ed0986..6a3c3fa 100644
--- a/Assets/Scripts/Rig.cs
+++ b/Assets/Scripts/Logic/World/Rig.cs
@@ -6,7 +6,7 @@ using UnityEngine.XR;
 public class Rig
 {
   [HideInInspector]
-  public Monolith mono;
+  public Logic logic;
 
   [Header("Design")]
   public float scale;
@@ -46,9 +46,10 @@ public class Rig
 
   public bool alignRecordCam;
 
-  public void Start()
+  public void Start(Logic logic)
   {
-    Game.OnBump += Bump;
+    this.logic = logic;
+    Game.OnBump += Bump; // replace these systems...
     Game.OnCrash += Bump;
 
     recordCam.gameObject.SetActive(Application.isEditor);
diff --git a/Assets/Scripts/Rig.cs.meta b/Assets/Scripts/Logic/World/Rig.cs.meta
similarity index 100%
rename from Assets/Scripts/Rig.cs.meta
rename to Assets/Scripts/Logic/World/Rig.cs.meta
diff --git a/Assets/Scripts/Logic/World/World.cs b/Assets/Scripts/Logic/World/World.cs
new file mode 100644
index 0000000..2b2afaf
--- /dev/null
+++ b/Assets/Scripts/Logic/World/World.cs
@@ -0,0 +1,29 @@
+using System;
+using UnityEngine;
+
+[Serializable]
+public class World
+{
+  [HideInInspector]
+  public Logic logic;
+
+  public void Set(InspectorSetter setter)
+  {
+    
+  }
+
+  public void Fetch(InspectorSetter setter)
+  {
+    
+  }
+
+  public void Start(Logic logic)
+  {
+    this.logic = logic;
+  }
+
+  public void Update()
+  {
+
+  }
+}
\ No newline at end of file
diff --git a/Assets/Scripts/Logic/World/World.cs.meta b/Assets/Scripts/Logic/World/World.cs.meta
new file mode 100644
index 0000000..e43d79d
--- /dev/null
+++ b/Assets/Scripts/Logic/World/World.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: e1aa34bff9eb7a143a7857a739ebf8e3
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Scripts/Painter.cs b/Assets/Scripts/Painter.cs
deleted file mode 100644
index 5c5f141..0000000
--- a/Assets/Scripts/Painter.cs
+++ /dev/null
@@ -1,66 +0,0 @@
-using UnityEngine;
-using UnityEditor;
-using NaughtyAttributes;
-
-#if UNITY_EDITOR
-public class Painter : MonoBehaviour
-{
-  // public Texture3D texture;
-  // public Color left, right, bottom, top, back, front;
-
-  // [Button]
-  // void LoadTexture()
-  // {
-  //   left = texture.GetPixel(0, 1, 1);
-  //   right = texture.GetPixel(2, 1, 1);
-
-  //   bottom = texture.GetPixel(1, 0, 1);
-  //   top = texture.GetPixel(1, 2, 1);
-
-  //   back = texture.GetPixel(1, 1, 0);
-  //   front = texture.GetPixel(1, 1, 2);
-  // }
-
-  // [Button]
-  // void UpdateTexture()
-  // {
-  //   texture.SetPixel(0, 1, 1, left);
-  //   texture.SetPixel(2, 1, 1, right);
-
-  //   texture.SetPixel(1, 0, 1, bottom);
-  //   texture.SetPixel(1, 2, 1, top);
-
-  //   texture.SetPixel(1, 1, 0, back);
-  //   texture.SetPixel(1, 1, 2, front);
-
-  //   texture.Apply();
-  //   AssetDatabase.CreateAsset(texture, "Assets/Materials/" + texture.name + ".asset");
-  // }
-
-  // [Button]
-  // public void NewTexture()
-  // {
-  //   // 3D texture for normal indexed colors
-  //   Texture3D normalColors = new Texture3D(3, 3, 3, TextureFormat.RGBA32, false);
-  //   normalColors.filterMode = FilterMode.Point;
-  //   normalColors.wrapMode = TextureWrapMode.Clamp;
-  //   normalColors.anisoLevel = 0;
-
-  //   Color[] colorArray = new Color[3 * 3 * 3];
-
-  //   colorArray[4] = Color.blue; // Back
-  //   colorArray[22] = Color.blue; // Forward
-
-  //   colorArray[10] = Color.green; // Down
-  //   colorArray[16] = Color.green; // Up
-
-  //   colorArray[12] = Color.red; // Left
-  //   colorArray[14] = Color.red; // Right
-
-  //   normalColors.SetPixels(colorArray);
-  //   normalColors.Apply();
-
-  //   AssetDatabase.CreateAsset(normalColors, "Assets/Materials/newTex.asset");
-  // }
-}
-#endif
\ No newline at end of file
diff --git a/Assets/Scripts/Render.meta b/Assets/Scripts/Render.meta
new file mode 100644
index 0000000..4c834ef
--- /dev/null
+++ b/Assets/Scripts/Render.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 347514ec7ea634d45ac109a8fbb09fb1
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Scripts/Drip.cs b/Assets/Scripts/Render/Drip.cs
similarity index 100%
rename from Assets/Scripts/Drip.cs
rename to Assets/Scripts/Render/Drip.cs
diff --git a/Assets/Scripts/Drip.cs.meta b/Assets/Scripts/Render/Drip.cs.meta
similarity index 100%
rename from Assets/Scripts/Drip.cs.meta
rename to Assets/Scripts/Render/Drip.cs.meta
diff --git a/Assets/Scripts/GraphX.cs b/Assets/Scripts/Render/GraphX.cs
similarity index 100%
rename from Assets/Scripts/GraphX.cs
rename to Assets/Scripts/Render/GraphX.cs
diff --git a/Assets/Scripts/GraphX.cs.meta b/Assets/Scripts/Render/GraphX.cs.meta
similarity index 100%
rename from Assets/Scripts/GraphX.cs.meta
rename to Assets/Scripts/Render/GraphX.cs.meta
diff --git a/Assets/Scripts/GraphXData.cs b/Assets/Scripts/Render/GraphXData.cs
similarity index 100%
rename from Assets/Scripts/GraphXData.cs
rename to Assets/Scripts/Render/GraphXData.cs
diff --git a/Assets/Scripts/GraphXData.cs.meta b/Assets/Scripts/Render/GraphXData.cs.meta
similarity index 100%
rename from Assets/Scripts/GraphXData.cs.meta
rename to Assets/Scripts/Render/GraphXData.cs.meta
diff --git a/Assets/Scripts/Poof.cs b/Assets/Scripts/Render/Poof.cs
similarity index 100%
rename from Assets/Scripts/Poof.cs
rename to Assets/Scripts/Render/Poof.cs
diff --git a/Assets/Scripts/Poof.cs.meta b/Assets/Scripts/Render/Poof.cs.meta
similarity index 100%
rename from Assets/Scripts/Poof.cs.meta
rename to Assets/Scripts/Render/Poof.cs.meta
diff --git a/Assets/Scripts/Render.cs b/Assets/Scripts/Render/Render.cs
similarity index 100%
rename from Assets/Scripts/Render.cs
rename to Assets/Scripts/Render/Render.cs
diff --git a/Assets/Scripts/Render.cs.meta b/Assets/Scripts/Render/Render.cs.meta
similarity index 100%
rename from Assets/Scripts/Render.cs.meta
rename to Assets/Scripts/Render/Render.cs.meta
diff --git a/Assets/Scripts/SnakeFace.cs b/Assets/Scripts/Render/SnakeFace.cs
similarity index 100%
rename from Assets/Scripts/SnakeFace.cs
rename to Assets/Scripts/Render/SnakeFace.cs
diff --git a/Assets/Scripts/SnakeFace.cs.meta b/Assets/Scripts/Render/SnakeFace.cs.meta
similarity index 100%
rename from Assets/Scripts/SnakeFace.cs.meta
rename to Assets/Scripts/Render/SnakeFace.cs.meta
diff --git a/Assets/Scripts/Render/Sound.meta b/Assets/Scripts/Render/Sound.meta
new file mode 100644
index 0000000..9600451
--- /dev/null
+++ b/Assets/Scripts/Render/Sound.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 61a442d648c4d7b408faeb512fe75f15
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Scripts/Music.cs b/Assets/Scripts/Render/Sound/Music.cs
similarity index 100%
rename from Assets/Scripts/Music.cs
rename to Assets/Scripts/Render/Sound/Music.cs
diff --git a/Assets/Scripts/Music.cs.meta b/Assets/Scripts/Render/Sound/Music.cs.meta
similarity index 100%
rename from Assets/Scripts/Music.cs.meta
rename to Assets/Scripts/Render/Sound/Music.cs.meta
diff --git a/Assets/Scripts/SFX.cs b/Assets/Scripts/Render/Sound/SFX.cs
similarity index 100%
rename from Assets/Scripts/SFX.cs
rename to Assets/Scripts/Render/Sound/SFX.cs
diff --git a/Assets/Scripts/SFX.cs.meta b/Assets/Scripts/Render/Sound/SFX.cs.meta
similarity index 100%
rename from Assets/Scripts/SFX.cs.meta
rename to Assets/Scripts/Render/Sound/SFX.cs.meta
diff --git a/Assets/Scripts/SoundData.cs b/Assets/Scripts/Render/Sound/SoundData.cs
similarity index 100%
rename from Assets/Scripts/SoundData.cs
rename to Assets/Scripts/Render/Sound/SoundData.cs
diff --git a/Assets/Scripts/SoundData.cs.meta b/Assets/Scripts/Render/Sound/SoundData.cs.meta
similarity index 100%
rename from Assets/Scripts/SoundData.cs.meta
rename to Assets/Scripts/Render/Sound/SoundData.cs.meta
diff --git a/Assets/Scripts/Vibe.cs b/Assets/Scripts/Render/Vibe.cs
similarity index 100%
rename from Assets/Scripts/Vibe.cs
rename to Assets/Scripts/Render/Vibe.cs
diff --git a/Assets/Scripts/Vibe.cs.meta b/Assets/Scripts/Render/Vibe.cs.meta
similarity index 100%
rename from Assets/Scripts/Vibe.cs.meta
rename to Assets/Scripts/Render/Vibe.cs.meta