diff --git a/Assets/Fungus/Lua.meta b/Assets/Fungus/Lua.meta
index 19b32961..57284f07 100644
--- a/Assets/Fungus/Lua.meta
+++ b/Assets/Fungus/Lua.meta
@@ -1,7 +1,7 @@
 fileFormatVersion: 2
-guid: 6fb32c987f2084f71b3394b6efb57ccf
+guid: eb9106aaabbf94f978cec3f7bf29790e
 folderAsset: yes
-timeCreated: 1455641608
+timeCreated: 1459937141
 licenseType: Free
 DefaultImporter:
   userData: 
diff --git a/Assets/Fungus/Lua/Scripts.meta b/Assets/Fungus/Lua/Scripts.meta
index 5d8e1c05..dbc4914e 100644
--- a/Assets/Fungus/Lua/Scripts.meta
+++ b/Assets/Fungus/Lua/Scripts.meta
@@ -1,7 +1,7 @@
 fileFormatVersion: 2
-guid: faeb3c27132254942b6ffd5acf46da3a
+guid: 927b2ce96300f4cb093db15b56750d0c
 folderAsset: yes
-timeCreated: 1454683902
+timeCreated: 1459937186
 licenseType: Free
 DefaultImporter:
   userData: 
diff --git a/Assets/FungusLua.meta b/Assets/FungusLua.meta
new file mode 100644
index 00000000..19b32961
--- /dev/null
+++ b/Assets/FungusLua.meta
@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: 6fb32c987f2084f71b3394b6efb57ccf
+folderAsset: yes
+timeCreated: 1455641608
+licenseType: Free
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Fungus/Lua/Resources.meta b/Assets/FungusLua/Resources.meta
similarity index 100%
rename from Assets/Fungus/Lua/Resources.meta
rename to Assets/FungusLua/Resources.meta
diff --git a/Assets/Fungus/Lua/Resources/Lua.meta b/Assets/FungusLua/Resources/Lua.meta
similarity index 100%
rename from Assets/Fungus/Lua/Resources/Lua.meta
rename to Assets/FungusLua/Resources/Lua.meta
diff --git a/Assets/Fungus/Lua/Resources/Lua/fungus.txt b/Assets/FungusLua/Resources/Lua/fungus.txt
similarity index 95%
rename from Assets/Fungus/Lua/Resources/Lua/fungus.txt
rename to Assets/FungusLua/Resources/Lua/fungus.txt
index d10e3fe5..0c4e9091 100644
--- a/Assets/Fungus/Lua/Resources/Lua/fungus.txt
+++ b/Assets/FungusLua/Resources/Lua/fungus.txt
@@ -106,9 +106,10 @@ function M.sub(text)
 	return M.luautils.substitute(text)
 end
 
---------------------
+--------------------------------------------------------------
 -- Integration tests
---------------------
+-- These functions require the Unity Test Tools to work.
+--------------------------------------------------------------
 
 -- Checks if a condition is true (requires Unity Test Tools)
 -- Lua has a built in assert function, so we called this check to avoid conflicting.
@@ -131,6 +132,10 @@ function M.fail(reason)
 	M.test.fail(reason)
 end
 
+---------------------------------------------
+-- All functions below require Fungus to work
+---------------------------------------------
+
 -------------
 -- Say Dialog
 -------------
diff --git a/Assets/Fungus/Lua/Resources/Lua/fungus.txt.meta b/Assets/FungusLua/Resources/Lua/fungus.txt.meta
similarity index 100%
rename from Assets/Fungus/Lua/Resources/Lua/fungus.txt.meta
rename to Assets/FungusLua/Resources/Lua/fungus.txt.meta
diff --git a/Assets/Fungus/Lua/Resources/Lua/inspect.txt b/Assets/FungusLua/Resources/Lua/inspect.txt
similarity index 100%
rename from Assets/Fungus/Lua/Resources/Lua/inspect.txt
rename to Assets/FungusLua/Resources/Lua/inspect.txt
diff --git a/Assets/Fungus/Lua/Resources/Lua/inspect.txt.meta b/Assets/FungusLua/Resources/Lua/inspect.txt.meta
similarity index 100%
rename from Assets/Fungus/Lua/Resources/Lua/inspect.txt.meta
rename to Assets/FungusLua/Resources/Lua/inspect.txt.meta
diff --git a/Assets/Fungus/Lua/Resources/Prefabs.meta b/Assets/FungusLua/Resources/Prefabs.meta
similarity index 100%
rename from Assets/Fungus/Lua/Resources/Prefabs.meta
rename to Assets/FungusLua/Resources/Prefabs.meta
diff --git a/Assets/Fungus/Lua/Resources/Prefabs/LuaBindings.prefab b/Assets/FungusLua/Resources/Prefabs/LuaBindings.prefab
similarity index 100%
rename from Assets/Fungus/Lua/Resources/Prefabs/LuaBindings.prefab
rename to Assets/FungusLua/Resources/Prefabs/LuaBindings.prefab
diff --git a/Assets/Fungus/Lua/Resources/Prefabs/LuaBindings.prefab.meta b/Assets/FungusLua/Resources/Prefabs/LuaBindings.prefab.meta
similarity index 100%
rename from Assets/Fungus/Lua/Resources/Prefabs/LuaBindings.prefab.meta
rename to Assets/FungusLua/Resources/Prefabs/LuaBindings.prefab.meta
diff --git a/Assets/Fungus/Lua/Resources/Prefabs/LuaEnvironment.prefab b/Assets/FungusLua/Resources/Prefabs/LuaEnvironment.prefab
similarity index 95%
rename from Assets/Fungus/Lua/Resources/Prefabs/LuaEnvironment.prefab
rename to Assets/FungusLua/Resources/Prefabs/LuaEnvironment.prefab
index 545dee15..b3b7feeb 100644
--- a/Assets/Fungus/Lua/Resources/Prefabs/LuaEnvironment.prefab
+++ b/Assets/FungusLua/Resources/Prefabs/LuaEnvironment.prefab
@@ -40,11 +40,13 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: c10f0b861365b42b0928858f7b086ff3, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  fungusModule: 0
   stringTable: {fileID: 0}
   activeLanguage: en
   timeScale: -1
   registerTypes:
   - {fileID: 4900000, guid: 9c3ab7a98d51241bbb499643399fa761, type: 3}
+  - {fileID: 4900000, guid: 93fddea8208764a2dbb189cc238aed40, type: 3}
 --- !u!114 &11493126
 MonoBehaviour:
   m_ObjectHideFlags: 1
diff --git a/Assets/Fungus/Lua/Resources/Prefabs/LuaEnvironment.prefab.meta b/Assets/FungusLua/Resources/Prefabs/LuaEnvironment.prefab.meta
similarity index 100%
rename from Assets/Fungus/Lua/Resources/Prefabs/LuaEnvironment.prefab.meta
rename to Assets/FungusLua/Resources/Prefabs/LuaEnvironment.prefab.meta
diff --git a/Assets/Fungus/Lua/Resources/Prefabs/LuaScript.prefab b/Assets/FungusLua/Resources/Prefabs/LuaScript.prefab
similarity index 100%
rename from Assets/Fungus/Lua/Resources/Prefabs/LuaScript.prefab
rename to Assets/FungusLua/Resources/Prefabs/LuaScript.prefab
diff --git a/Assets/Fungus/Lua/Resources/Prefabs/LuaScript.prefab.meta b/Assets/FungusLua/Resources/Prefabs/LuaScript.prefab.meta
similarity index 100%
rename from Assets/Fungus/Lua/Resources/Prefabs/LuaScript.prefab.meta
rename to Assets/FungusLua/Resources/Prefabs/LuaScript.prefab.meta
diff --git a/Assets/Fungus/Lua/Resources/Prefabs/LuaStore.prefab b/Assets/FungusLua/Resources/Prefabs/LuaStore.prefab
similarity index 100%
rename from Assets/Fungus/Lua/Resources/Prefabs/LuaStore.prefab
rename to Assets/FungusLua/Resources/Prefabs/LuaStore.prefab
diff --git a/Assets/Fungus/Lua/Resources/Prefabs/LuaStore.prefab.meta b/Assets/FungusLua/Resources/Prefabs/LuaStore.prefab.meta
similarity index 100%
rename from Assets/Fungus/Lua/Resources/Prefabs/LuaStore.prefab.meta
rename to Assets/FungusLua/Resources/Prefabs/LuaStore.prefab.meta
diff --git a/Assets/Fungus/Lua/Resources/Types.meta b/Assets/FungusLua/Resources/Types.meta
similarity index 100%
rename from Assets/Fungus/Lua/Resources/Types.meta
rename to Assets/FungusLua/Resources/Types.meta
diff --git a/Assets/FungusLua/Resources/Types/FungusTypes.txt b/Assets/FungusLua/Resources/Types/FungusTypes.txt
new file mode 100644
index 00000000..69f519cb
--- /dev/null
+++ b/Assets/FungusLua/Resources/Types/FungusTypes.txt
@@ -0,0 +1,43 @@
+# List of c# types to register with MoonSharp
+# LuaBindings usually takes care of registering the types of bound objects, but in some
+# cases you'll need to register a type manually by adding it to this list.
+# You can also register types using MoonSharp's UserData class in the Awake method of a component.
+# To register an extension type, add the E: prefix 
+# If the type is defined in the main assembly then you can just use namespace.typename
+# If the type is defined in any other assembly you need to use the full assembly qualified type name.
+
+Fungus.AnimatorVariable
+Fungus.AudioSourceVariable
+Fungus.Block
+Fungus.BooleanVariable
+Fungus.Character
+Fungus.ColorVariable
+Fungus.Command
+Fungus.CommandInfoAttribute
+Fungus.FacingDirection
+Fungus.FloatVariable
+Fungus.Flowchart
+Fungus.FungusPrefs
+Fungus.LuaEnvironment
+Fungus.LuaUtils
+Fungus.GameObjectVariable
+Fungus.IntegerVariable
+Fungus.Label
+Fungus.MaterialVariable
+Fungus.MenuDialog
+Fungus.ObjectVariable
+Fungus.PODTypeFactory
+Fungus.PortraitState
+Fungus.SayDialog
+Fungus.SpriteVariable
+Fungus.StringVariable
+Fungus.Task
+Fungus.TextureVariable
+Fungus.TransformVariable
+Fungus.Variable
+Fungus.Vector2Variable
+Fungus.Vector3Variable
+
+# Extension types
+
+E:Fungus.LuaExtensions
diff --git a/Assets/FungusLua/Resources/Types/FungusTypes.txt.meta b/Assets/FungusLua/Resources/Types/FungusTypes.txt.meta
new file mode 100644
index 00000000..f34aaa38
--- /dev/null
+++ b/Assets/FungusLua/Resources/Types/FungusTypes.txt.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 93fddea8208764a2dbb189cc238aed40
+timeCreated: 1459937246
+licenseType: Free
+TextScriptImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Fungus/Lua/Resources/Types/RegisterTypes.txt b/Assets/FungusLua/Resources/Types/UnityTypes.txt
similarity index 89%
rename from Assets/Fungus/Lua/Resources/Types/RegisterTypes.txt
rename to Assets/FungusLua/Resources/Types/UnityTypes.txt
index 1478c827..1d10e589 100644
--- a/Assets/Fungus/Lua/Resources/Types/RegisterTypes.txt
+++ b/Assets/FungusLua/Resources/Types/UnityTypes.txt
@@ -6,37 +6,6 @@
 # If the type is defined in the main assembly then you can just use namespace.typename
 # If the type is defined in any other assembly you need to use the full assembly qualified type name.
 
-Fungus.AnimatorVariable
-Fungus.AudioSourceVariable
-Fungus.Block
-Fungus.BooleanVariable
-Fungus.Character
-Fungus.ColorVariable
-Fungus.Command
-Fungus.CommandInfoAttribute
-Fungus.FacingDirection
-Fungus.FloatVariable
-Fungus.Flowchart
-Fungus.FungusPrefs
-Fungus.LuaEnvironment
-Fungus.LuaUtils
-Fungus.GameObjectVariable
-Fungus.IntegerVariable
-Fungus.Label
-Fungus.MaterialVariable
-Fungus.MenuDialog
-Fungus.ObjectVariable
-Fungus.PODTypeFactory
-Fungus.PortraitState
-Fungus.SayDialog
-Fungus.SpriteVariable
-Fungus.StringVariable
-Fungus.Task
-Fungus.TextureVariable
-Fungus.TransformVariable
-Fungus.Variable
-Fungus.Vector2Variable
-Fungus.Vector3Variable
 System.Action, System.Core, Version=3.5.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
 System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
 System.Collections.IEnumerator, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
@@ -96,5 +65,3 @@ UnityEngine.Vector4, UnityEngine, Version=0.0.0.0, Culture=neutral, PublicKeyTok
 UnityEngine.VerticalWrapMode, UnityEngine, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
 
 # Extension types
-
-E:Fungus.LuaExtensions
diff --git a/Assets/Fungus/Lua/Resources/Types/RegisterTypes.txt.meta b/Assets/FungusLua/Resources/Types/UnityTypes.txt.meta
similarity index 100%
rename from Assets/Fungus/Lua/Resources/Types/RegisterTypes.txt.meta
rename to Assets/FungusLua/Resources/Types/UnityTypes.txt.meta
diff --git a/Assets/FungusLua/Scripts.meta b/Assets/FungusLua/Scripts.meta
new file mode 100644
index 00000000..5d8e1c05
--- /dev/null
+++ b/Assets/FungusLua/Scripts.meta
@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: faeb3c27132254942b6ffd5acf46da3a
+folderAsset: yes
+timeCreated: 1454683902
+licenseType: Free
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Fungus/Lua/Scripts/Editor.meta b/Assets/FungusLua/Scripts/Editor.meta
similarity index 100%
rename from Assets/Fungus/Lua/Scripts/Editor.meta
rename to Assets/FungusLua/Scripts/Editor.meta
diff --git a/Assets/Fungus/Lua/Scripts/Editor/DropDownControl.cs b/Assets/FungusLua/Scripts/Editor/DropDownControl.cs
similarity index 100%
rename from Assets/Fungus/Lua/Scripts/Editor/DropDownControl.cs
rename to Assets/FungusLua/Scripts/Editor/DropDownControl.cs
diff --git a/Assets/Fungus/Lua/Scripts/Editor/DropDownControl.cs.meta b/Assets/FungusLua/Scripts/Editor/DropDownControl.cs.meta
similarity index 100%
rename from Assets/Fungus/Lua/Scripts/Editor/DropDownControl.cs.meta
rename to Assets/FungusLua/Scripts/Editor/DropDownControl.cs.meta
diff --git a/Assets/Fungus/Lua/Scripts/Editor/LuaBindingsEditor.cs b/Assets/FungusLua/Scripts/Editor/LuaBindingsEditor.cs
similarity index 99%
rename from Assets/Fungus/Lua/Scripts/Editor/LuaBindingsEditor.cs
rename to Assets/FungusLua/Scripts/Editor/LuaBindingsEditor.cs
index e6f5d3cb..0e9f0470 100644
--- a/Assets/Fungus/Lua/Scripts/Editor/LuaBindingsEditor.cs
+++ b/Assets/FungusLua/Scripts/Editor/LuaBindingsEditor.cs
@@ -3,7 +3,6 @@ using UnityEditorInternal;
 using UnityEngine;
 using System.Collections;
 using System.Collections.Generic;
-using Rotorz.ReorderableList;
 using System.Linq;
 using System.Reflection;
 using System.IO;
diff --git a/Assets/Fungus/Lua/Scripts/Editor/LuaBindingsEditor.cs.meta b/Assets/FungusLua/Scripts/Editor/LuaBindingsEditor.cs.meta
similarity index 100%
rename from Assets/Fungus/Lua/Scripts/Editor/LuaBindingsEditor.cs.meta
rename to Assets/FungusLua/Scripts/Editor/LuaBindingsEditor.cs.meta
diff --git a/Assets/Fungus/Lua/Scripts/Editor/LuaScriptEditor.cs b/Assets/FungusLua/Scripts/Editor/LuaScriptEditor.cs
similarity index 100%
rename from Assets/Fungus/Lua/Scripts/Editor/LuaScriptEditor.cs
rename to Assets/FungusLua/Scripts/Editor/LuaScriptEditor.cs
diff --git a/Assets/Fungus/Lua/Scripts/Editor/LuaScriptEditor.cs.meta b/Assets/FungusLua/Scripts/Editor/LuaScriptEditor.cs.meta
similarity index 100%
rename from Assets/Fungus/Lua/Scripts/Editor/LuaScriptEditor.cs.meta
rename to Assets/FungusLua/Scripts/Editor/LuaScriptEditor.cs.meta
diff --git a/Assets/Fungus/Lua/Scripts/Editor/LuaStoreEditor.cs b/Assets/FungusLua/Scripts/Editor/LuaStoreEditor.cs
similarity index 100%
rename from Assets/Fungus/Lua/Scripts/Editor/LuaStoreEditor.cs
rename to Assets/FungusLua/Scripts/Editor/LuaStoreEditor.cs
diff --git a/Assets/Fungus/Lua/Scripts/Editor/LuaStoreEditor.cs.meta b/Assets/FungusLua/Scripts/Editor/LuaStoreEditor.cs.meta
similarity index 100%
rename from Assets/Fungus/Lua/Scripts/Editor/LuaStoreEditor.cs.meta
rename to Assets/FungusLua/Scripts/Editor/LuaStoreEditor.cs.meta
diff --git a/Assets/Fungus/Lua/Scripts/Editor/LuaUtilsEditor.cs b/Assets/FungusLua/Scripts/Editor/LuaUtilsEditor.cs
similarity index 100%
rename from Assets/Fungus/Lua/Scripts/Editor/LuaUtilsEditor.cs
rename to Assets/FungusLua/Scripts/Editor/LuaUtilsEditor.cs
diff --git a/Assets/Fungus/Lua/Scripts/Editor/LuaUtilsEditor.cs.meta b/Assets/FungusLua/Scripts/Editor/LuaUtilsEditor.cs.meta
similarity index 100%
rename from Assets/Fungus/Lua/Scripts/Editor/LuaUtilsEditor.cs.meta
rename to Assets/FungusLua/Scripts/Editor/LuaUtilsEditor.cs.meta
diff --git a/Assets/Fungus/Lua/Scripts/Editor/MenuItems.cs b/Assets/FungusLua/Scripts/Editor/MenuItems.cs
similarity index 100%
rename from Assets/Fungus/Lua/Scripts/Editor/MenuItems.cs
rename to Assets/FungusLua/Scripts/Editor/MenuItems.cs
diff --git a/Assets/Fungus/Lua/Scripts/Editor/MenuItems.cs.meta b/Assets/FungusLua/Scripts/Editor/MenuItems.cs.meta
similarity index 100%
rename from Assets/Fungus/Lua/Scripts/Editor/MenuItems.cs.meta
rename to Assets/FungusLua/Scripts/Editor/MenuItems.cs.meta
diff --git a/Assets/Fungus/Lua/Scripts/FungusPrefs.cs b/Assets/FungusLua/Scripts/FungusPrefs.cs
similarity index 100%
rename from Assets/Fungus/Lua/Scripts/FungusPrefs.cs
rename to Assets/FungusLua/Scripts/FungusPrefs.cs
diff --git a/Assets/Fungus/Lua/Scripts/FungusPrefs.cs.meta b/Assets/FungusLua/Scripts/FungusPrefs.cs.meta
similarity index 100%
rename from Assets/Fungus/Lua/Scripts/FungusPrefs.cs.meta
rename to Assets/FungusLua/Scripts/FungusPrefs.cs.meta
diff --git a/Assets/Fungus/Lua/Scripts/LuaBindings.cs b/Assets/FungusLua/Scripts/LuaBindings.cs
similarity index 100%
rename from Assets/Fungus/Lua/Scripts/LuaBindings.cs
rename to Assets/FungusLua/Scripts/LuaBindings.cs
diff --git a/Assets/Fungus/Lua/Scripts/LuaBindings.cs.meta b/Assets/FungusLua/Scripts/LuaBindings.cs.meta
similarity index 100%
rename from Assets/Fungus/Lua/Scripts/LuaBindings.cs.meta
rename to Assets/FungusLua/Scripts/LuaBindings.cs.meta
diff --git a/Assets/Fungus/Lua/Scripts/LuaEnvironment.cs b/Assets/FungusLua/Scripts/LuaEnvironment.cs
similarity index 100%
rename from Assets/Fungus/Lua/Scripts/LuaEnvironment.cs
rename to Assets/FungusLua/Scripts/LuaEnvironment.cs
diff --git a/Assets/Fungus/Lua/Scripts/LuaEnvironment.cs.meta b/Assets/FungusLua/Scripts/LuaEnvironment.cs.meta
similarity index 100%
rename from Assets/Fungus/Lua/Scripts/LuaEnvironment.cs.meta
rename to Assets/FungusLua/Scripts/LuaEnvironment.cs.meta
diff --git a/Assets/Fungus/Lua/Scripts/LuaScript.cs b/Assets/FungusLua/Scripts/LuaScript.cs
similarity index 100%
rename from Assets/Fungus/Lua/Scripts/LuaScript.cs
rename to Assets/FungusLua/Scripts/LuaScript.cs
diff --git a/Assets/Fungus/Lua/Scripts/LuaScript.cs.meta b/Assets/FungusLua/Scripts/LuaScript.cs.meta
similarity index 100%
rename from Assets/Fungus/Lua/Scripts/LuaScript.cs.meta
rename to Assets/FungusLua/Scripts/LuaScript.cs.meta
diff --git a/Assets/Fungus/Lua/Scripts/LuaStore.cs b/Assets/FungusLua/Scripts/LuaStore.cs
similarity index 100%
rename from Assets/Fungus/Lua/Scripts/LuaStore.cs
rename to Assets/FungusLua/Scripts/LuaStore.cs
diff --git a/Assets/Fungus/Lua/Scripts/LuaStore.cs.meta b/Assets/FungusLua/Scripts/LuaStore.cs.meta
similarity index 100%
rename from Assets/Fungus/Lua/Scripts/LuaStore.cs.meta
rename to Assets/FungusLua/Scripts/LuaStore.cs.meta
diff --git a/Assets/Fungus/Lua/Scripts/LuaUtils.cs b/Assets/FungusLua/Scripts/LuaUtils.cs
similarity index 98%
rename from Assets/Fungus/Lua/Scripts/LuaUtils.cs
rename to Assets/FungusLua/Scripts/LuaUtils.cs
index b9062ee7..582986a8 100644
--- a/Assets/Fungus/Lua/Scripts/LuaUtils.cs
+++ b/Assets/FungusLua/Scripts/LuaUtils.cs
@@ -103,6 +103,8 @@ namespace Fungus
 		/// </summary>
 		protected virtual void InitTypes()
 		{
+			bool isFungusInstalled = (Type.GetType("Fungus.Flowchart") != null);
+
 			foreach (TextAsset textFile in registerTypes)
 			{
 				if (textFile == null)
@@ -119,6 +121,13 @@ namespace Fungus
 						continue;
 					}
 
+					// Don't register fungus types if the Fungus library is not present
+					if (!isFungusInstalled &&
+						typeName.Contains("Fungus."))
+					{
+						continue;
+					}
+						
 					LuaEnvironment.RegisterType(typeName);
 				}
 			}
diff --git a/Assets/Fungus/Lua/Scripts/LuaUtils.cs.meta b/Assets/FungusLua/Scripts/LuaUtils.cs.meta
similarity index 100%
rename from Assets/Fungus/Lua/Scripts/LuaUtils.cs.meta
rename to Assets/FungusLua/Scripts/LuaUtils.cs.meta
diff --git a/Assets/Fungus/Lua/Scripts/PODTypeFactory.cs b/Assets/FungusLua/Scripts/PODTypeFactory.cs
similarity index 100%
rename from Assets/Fungus/Lua/Scripts/PODTypeFactory.cs
rename to Assets/FungusLua/Scripts/PODTypeFactory.cs
diff --git a/Assets/Fungus/Lua/Scripts/PODTypeFactory.cs.meta b/Assets/FungusLua/Scripts/PODTypeFactory.cs.meta
similarity index 100%
rename from Assets/Fungus/Lua/Scripts/PODTypeFactory.cs.meta
rename to Assets/FungusLua/Scripts/PODTypeFactory.cs.meta
diff --git a/Assets/Fungus/Lua/Scripts/StringSubstituter.cs b/Assets/FungusLua/Scripts/StringSubstituter.cs
similarity index 100%
rename from Assets/Fungus/Lua/Scripts/StringSubstituter.cs
rename to Assets/FungusLua/Scripts/StringSubstituter.cs
diff --git a/Assets/Fungus/Lua/Scripts/StringSubstituter.cs.meta b/Assets/FungusLua/Scripts/StringSubstituter.cs.meta
similarity index 100%
rename from Assets/Fungus/Lua/Scripts/StringSubstituter.cs.meta
rename to Assets/FungusLua/Scripts/StringSubstituter.cs.meta
diff --git a/Assets/FungusLua/Thirdparty.meta b/Assets/FungusLua/Thirdparty.meta
new file mode 100644
index 00000000..6aafbd54
--- /dev/null
+++ b/Assets/FungusLua/Thirdparty.meta
@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: a4641a76308964d7c8d505fcde53c241
+folderAsset: yes
+timeCreated: 1459935199
+licenseType: Free
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Fungus/Thirdparty/MoonSharp.meta b/Assets/FungusLua/Thirdparty/MoonSharp.meta
similarity index 100%
rename from Assets/Fungus/Thirdparty/MoonSharp.meta
rename to Assets/FungusLua/Thirdparty/MoonSharp.meta
diff --git a/Assets/Fungus/Thirdparty/MoonSharp/LICENSE b/Assets/FungusLua/Thirdparty/MoonSharp/LICENSE
similarity index 100%
rename from Assets/Fungus/Thirdparty/MoonSharp/LICENSE
rename to Assets/FungusLua/Thirdparty/MoonSharp/LICENSE
diff --git a/Assets/Fungus/Thirdparty/MoonSharp/LICENSE.meta b/Assets/FungusLua/Thirdparty/MoonSharp/LICENSE.meta
similarity index 100%
rename from Assets/Fungus/Thirdparty/MoonSharp/LICENSE.meta
rename to Assets/FungusLua/Thirdparty/MoonSharp/LICENSE.meta
diff --git a/Assets/Fungus/Thirdparty/MoonSharp/MoonSharp.Hardwire.dll b/Assets/FungusLua/Thirdparty/MoonSharp/MoonSharp.Hardwire.dll
similarity index 100%
rename from Assets/Fungus/Thirdparty/MoonSharp/MoonSharp.Hardwire.dll
rename to Assets/FungusLua/Thirdparty/MoonSharp/MoonSharp.Hardwire.dll
diff --git a/Assets/Fungus/Thirdparty/MoonSharp/MoonSharp.Hardwire.dll.meta b/Assets/FungusLua/Thirdparty/MoonSharp/MoonSharp.Hardwire.dll.meta
similarity index 100%
rename from Assets/Fungus/Thirdparty/MoonSharp/MoonSharp.Hardwire.dll.meta
rename to Assets/FungusLua/Thirdparty/MoonSharp/MoonSharp.Hardwire.dll.meta
diff --git a/Assets/Fungus/Thirdparty/MoonSharp/MoonSharp.Hardwire.pdb b/Assets/FungusLua/Thirdparty/MoonSharp/MoonSharp.Hardwire.pdb
similarity index 100%
rename from Assets/Fungus/Thirdparty/MoonSharp/MoonSharp.Hardwire.pdb
rename to Assets/FungusLua/Thirdparty/MoonSharp/MoonSharp.Hardwire.pdb
diff --git a/Assets/Fungus/Thirdparty/MoonSharp/MoonSharp.Hardwire.pdb.meta b/Assets/FungusLua/Thirdparty/MoonSharp/MoonSharp.Hardwire.pdb.meta
similarity index 100%
rename from Assets/Fungus/Thirdparty/MoonSharp/MoonSharp.Hardwire.pdb.meta
rename to Assets/FungusLua/Thirdparty/MoonSharp/MoonSharp.Hardwire.pdb.meta
diff --git a/Assets/Fungus/Thirdparty/MoonSharp/MoonSharp.Interpreter.dll b/Assets/FungusLua/Thirdparty/MoonSharp/MoonSharp.Interpreter.dll
similarity index 100%
rename from Assets/Fungus/Thirdparty/MoonSharp/MoonSharp.Interpreter.dll
rename to Assets/FungusLua/Thirdparty/MoonSharp/MoonSharp.Interpreter.dll
diff --git a/Assets/Fungus/Thirdparty/MoonSharp/MoonSharp.Interpreter.dll.meta b/Assets/FungusLua/Thirdparty/MoonSharp/MoonSharp.Interpreter.dll.meta
similarity index 100%
rename from Assets/Fungus/Thirdparty/MoonSharp/MoonSharp.Interpreter.dll.meta
rename to Assets/FungusLua/Thirdparty/MoonSharp/MoonSharp.Interpreter.dll.meta
diff --git a/Assets/Fungus/Thirdparty/MoonSharp/MoonSharp.Interpreter.pdb b/Assets/FungusLua/Thirdparty/MoonSharp/MoonSharp.Interpreter.pdb
similarity index 100%
rename from Assets/Fungus/Thirdparty/MoonSharp/MoonSharp.Interpreter.pdb
rename to Assets/FungusLua/Thirdparty/MoonSharp/MoonSharp.Interpreter.pdb
diff --git a/Assets/Fungus/Thirdparty/MoonSharp/MoonSharp.Interpreter.pdb.meta b/Assets/FungusLua/Thirdparty/MoonSharp/MoonSharp.Interpreter.pdb.meta
similarity index 100%
rename from Assets/Fungus/Thirdparty/MoonSharp/MoonSharp.Interpreter.pdb.meta
rename to Assets/FungusLua/Thirdparty/MoonSharp/MoonSharp.Interpreter.pdb.meta
diff --git a/Assets/Fungus/Thirdparty/MoonSharp/MoonSharp.Interpreter.xml b/Assets/FungusLua/Thirdparty/MoonSharp/MoonSharp.Interpreter.xml
similarity index 100%
rename from Assets/Fungus/Thirdparty/MoonSharp/MoonSharp.Interpreter.xml
rename to Assets/FungusLua/Thirdparty/MoonSharp/MoonSharp.Interpreter.xml
diff --git a/Assets/Fungus/Thirdparty/MoonSharp/MoonSharp.Interpreter.xml.meta b/Assets/FungusLua/Thirdparty/MoonSharp/MoonSharp.Interpreter.xml.meta
similarity index 100%
rename from Assets/Fungus/Thirdparty/MoonSharp/MoonSharp.Interpreter.xml.meta
rename to Assets/FungusLua/Thirdparty/MoonSharp/MoonSharp.Interpreter.xml.meta
diff --git a/Assets/Fungus/Thirdparty/MoonSharp/MoonSharp.RemoteDebugger.dll b/Assets/FungusLua/Thirdparty/MoonSharp/MoonSharp.RemoteDebugger.dll
similarity index 100%
rename from Assets/Fungus/Thirdparty/MoonSharp/MoonSharp.RemoteDebugger.dll
rename to Assets/FungusLua/Thirdparty/MoonSharp/MoonSharp.RemoteDebugger.dll
diff --git a/Assets/Fungus/Thirdparty/MoonSharp/MoonSharp.RemoteDebugger.dll.meta b/Assets/FungusLua/Thirdparty/MoonSharp/MoonSharp.RemoteDebugger.dll.meta
similarity index 100%
rename from Assets/Fungus/Thirdparty/MoonSharp/MoonSharp.RemoteDebugger.dll.meta
rename to Assets/FungusLua/Thirdparty/MoonSharp/MoonSharp.RemoteDebugger.dll.meta
diff --git a/Assets/Fungus/Thirdparty/MoonSharp/MoonSharp.RemoteDebugger.pdb b/Assets/FungusLua/Thirdparty/MoonSharp/MoonSharp.RemoteDebugger.pdb
similarity index 100%
rename from Assets/Fungus/Thirdparty/MoonSharp/MoonSharp.RemoteDebugger.pdb
rename to Assets/FungusLua/Thirdparty/MoonSharp/MoonSharp.RemoteDebugger.pdb
diff --git a/Assets/Fungus/Thirdparty/MoonSharp/MoonSharp.RemoteDebugger.pdb.meta b/Assets/FungusLua/Thirdparty/MoonSharp/MoonSharp.RemoteDebugger.pdb.meta
similarity index 100%
rename from Assets/Fungus/Thirdparty/MoonSharp/MoonSharp.RemoteDebugger.pdb.meta
rename to Assets/FungusLua/Thirdparty/MoonSharp/MoonSharp.RemoteDebugger.pdb.meta
diff --git a/Assets/Fungus/Thirdparty/MoonSharp/MoonSharp.pdb b/Assets/FungusLua/Thirdparty/MoonSharp/MoonSharp.pdb
similarity index 100%
rename from Assets/Fungus/Thirdparty/MoonSharp/MoonSharp.pdb
rename to Assets/FungusLua/Thirdparty/MoonSharp/MoonSharp.pdb
diff --git a/Assets/Fungus/Thirdparty/MoonSharp/MoonSharp.pdb.meta b/Assets/FungusLua/Thirdparty/MoonSharp/MoonSharp.pdb.meta
similarity index 100%
rename from Assets/Fungus/Thirdparty/MoonSharp/MoonSharp.pdb.meta
rename to Assets/FungusLua/Thirdparty/MoonSharp/MoonSharp.pdb.meta
diff --git a/Assets/Fungus/Thirdparty/TaskManager.meta b/Assets/FungusLua/Thirdparty/TaskManager.meta
similarity index 100%
rename from Assets/Fungus/Thirdparty/TaskManager.meta
rename to Assets/FungusLua/Thirdparty/TaskManager.meta
diff --git a/Assets/Fungus/Thirdparty/TaskManager/TaskManager.cs b/Assets/FungusLua/Thirdparty/TaskManager/TaskManager.cs
similarity index 100%
rename from Assets/Fungus/Thirdparty/TaskManager/TaskManager.cs
rename to Assets/FungusLua/Thirdparty/TaskManager/TaskManager.cs
diff --git a/Assets/Fungus/Thirdparty/TaskManager/TaskManager.cs.meta b/Assets/FungusLua/Thirdparty/TaskManager/TaskManager.cs.meta
similarity index 100%
rename from Assets/Fungus/Thirdparty/TaskManager/TaskManager.cs.meta
rename to Assets/FungusLua/Thirdparty/TaskManager/TaskManager.cs.meta
diff --git a/Assets/Tests/Lua/FungusTests.unity b/Assets/Tests/Lua/FungusTests.unity
index 72765174..5d7d6d7a 100644
--- a/Assets/Tests/Lua/FungusTests.unity
+++ b/Assets/Tests/Lua/FungusTests.unity
@@ -955,7 +955,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!114 &110417826
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -2232,66 +2232,10 @@ CanvasRenderer:
     type: 2}
   m_PrefabInternal: {fileID: 0}
   m_GameObject: {fileID: 330161927}
---- !u!1 &375366499
-GameObject:
-  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 100640, guid: 49031c561e16d4fcf91c12153f8e0b25, type: 2}
-  m_PrefabInternal: {fileID: 0}
-  serializedVersion: 4
-  m_Component:
-  - 4: {fileID: 375366500}
-  - 114: {fileID: 375366502}
-  - 114: {fileID: 375366501}
-  m_Layer: 0
-  m_Name: LuaEnvironment
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &375366500
+--- !u!4 &375366500 stripped
 Transform:
-  m_ObjectHideFlags: 0
   m_PrefabParentObject: {fileID: 495584, guid: 49031c561e16d4fcf91c12153f8e0b25, type: 2}
-  m_PrefabInternal: {fileID: 0}
-  m_GameObject: {fileID: 375366499}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children: []
-  m_Father: {fileID: 110417827}
-  m_RootOrder: 1
---- !u!114 &375366501
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 11486636, guid: 49031c561e16d4fcf91c12153f8e0b25,
-    type: 2}
-  m_PrefabInternal: {fileID: 0}
-  m_GameObject: {fileID: 375366499}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: c10f0b861365b42b0928858f7b086ff3, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  fungusModule: 0
-  stringTable: {fileID: 0}
-  activeLanguage: en
-  timeScale: -1
-  registerTypes:
-  - {fileID: 4900000, guid: 9c3ab7a98d51241bbb499643399fa761, type: 3}
---- !u!114 &375366502
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 11493126, guid: 49031c561e16d4fcf91c12153f8e0b25,
-    type: 2}
-  m_PrefabInternal: {fileID: 0}
-  m_GameObject: {fileID: 375366499}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: ba19c26c1ba7243d2b57ebc4329cc7c6, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  remoteDebugger: 0
+  m_PrefabInternal: {fileID: 1880272195}
 --- !u!1 &398057887
 GameObject:
   m_ObjectHideFlags: 0
@@ -7620,7 +7564,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!114 &1641285457
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -8989,6 +8933,48 @@ CanvasRenderer:
     type: 2}
   m_PrefabInternal: {fileID: 0}
   m_GameObject: {fileID: 1880266302}
+--- !u!1001 &1880272195
+Prefab:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 110417827}
+    m_Modifications:
+    - target: {fileID: 495584, guid: 49031c561e16d4fcf91c12153f8e0b25, type: 2}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 495584, guid: 49031c561e16d4fcf91c12153f8e0b25, type: 2}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 495584, guid: 49031c561e16d4fcf91c12153f8e0b25, type: 2}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 495584, guid: 49031c561e16d4fcf91c12153f8e0b25, type: 2}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 495584, guid: 49031c561e16d4fcf91c12153f8e0b25, type: 2}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 495584, guid: 49031c561e16d4fcf91c12153f8e0b25, type: 2}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 495584, guid: 49031c561e16d4fcf91c12153f8e0b25, type: 2}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 495584, guid: 49031c561e16d4fcf91c12153f8e0b25, type: 2}
+      propertyPath: m_RootOrder
+      value: 1
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_ParentPrefab: {fileID: 100100000, guid: 49031c561e16d4fcf91c12153f8e0b25, type: 2}
+  m_IsPrefabParent: 0
 --- !u!1 &1900092124
 GameObject:
   m_ObjectHideFlags: 0