diff --git a/Editor/DefinitionCreatorEditor.cs b/Editor/DefinitionCreatorEditor.cs
index 6238c2a..f1257a5 100644
--- a/Editor/DefinitionCreatorEditor.cs
+++ b/Editor/DefinitionCreatorEditor.cs
@@ -75,7 +75,7 @@ namespace Syntriax.Modules.Movement.Editor
 
             movementDefinition.MovementConfigs = new MovementConfig[]
             {
-                new MovementConfig(typeof(Implementations.GroundMovement1D).FullName, 5f)
+                new MovementConfig(typeof(Samples.GroundMovement1D).FullName, 5f)
             };
 
             movementDefinition.MonoBehaviours = new string[]
@@ -92,8 +92,8 @@ namespace Syntriax.Modules.Movement.Editor
 
             movementDefinition.MovementConfigs = new MovementConfig[]
             {
-                new MovementConfig(typeof(Implementations.AirMovement1D).FullName, 5f),
-                new MovementConfig(typeof(Implementations.GroundMovement1D).FullName, 5f)
+                new MovementConfig(typeof(Samples.AirMovement1D).FullName, 5f),
+                new MovementConfig(typeof(Samples.GroundMovement1D).FullName, 5f)
             };
 
             movementDefinition.MonoBehaviours = new string[]
diff --git a/Editor/Syntriax.Modules.Movement.Editor.asmdef b/Editor/Syntriax.Modules.Movement.Editor.asmdef
index 8844535..80c2cb2 100644
--- a/Editor/Syntriax.Modules.Movement.Editor.asmdef
+++ b/Editor/Syntriax.Modules.Movement.Editor.asmdef
@@ -4,7 +4,8 @@
     "references": [
         "GUID:d4c952ed5f59c5a449cda1b0080ed841",
         "GUID:efa9a9bc94c60c74684aafb7428fbf61",
-        "GUID:c967acc4be781ca44b42a1887eb1ac7a"
+        "GUID:c967acc4be781ca44b42a1887eb1ac7a",
+        "GUID:863b8995abde2cf40b8b4cb709452a32"
     ],
     "includePlatforms": [
         "Editor"
diff --git a/Runtime/Implementations/DefaultMovement.cs b/Runtime/DefaultMovement.cs
similarity index 71%
rename from Runtime/Implementations/DefaultMovement.cs
rename to Runtime/DefaultMovement.cs
index 07ee97b..3fac37c 100644
--- a/Runtime/Implementations/DefaultMovement.cs
+++ b/Runtime/DefaultMovement.cs
@@ -1,7 +1,10 @@
 using UnityEngine;
 
-namespace Syntriax.Modules.Movement.Implementations
+namespace Syntriax.Modules.Movement
 {
+    /// <summary>
+    /// A <see cref="IMovement" with no implementation, added by <see cref="MovementController" by default as a fallback implementation/>/>
+    /// </summary>
     public class DefaultMovement : MovementBase
     {
         public override void ApplyMovement() { }
diff --git a/Runtime/Implementations/DefaultMovement.cs.meta b/Runtime/DefaultMovement.cs.meta
similarity index 100%
rename from Runtime/Implementations/DefaultMovement.cs.meta
rename to Runtime/DefaultMovement.cs.meta
diff --git a/Runtime/IMovementController.cs b/Runtime/IMovementController.cs
index 28bf228..d72295b 100644
--- a/Runtime/IMovementController.cs
+++ b/Runtime/IMovementController.cs
@@ -7,9 +7,9 @@ namespace Syntriax.Modules.Movement
     public interface IMovementController
     {
         /// <summary>
-        /// Member Toggle State
+        /// Member <see cref="IToggleState"/> to switch on or off
         /// </summary>
-        IToggleState ToggleState { get; }
+        IToggleState ToggleStateMember { get; }
 
         /// <summary>
         /// Currently active <see cref="IMovement"/>
diff --git a/Runtime/MovementController.cs b/Runtime/MovementController.cs
index f2c4cae..729247e 100644
--- a/Runtime/MovementController.cs
+++ b/Runtime/MovementController.cs
@@ -31,24 +31,24 @@ namespace Syntriax.Modules.Movement
             }
         }
 
-        private bool areBothToggleStatesToggled => ToggleState.IsToggledNullChecked() && toggleStateOnGameObject.IsToggledNullChecked();
+        private bool areBothToggleStatesToggled => ToggleStateMember.IsToggledNullChecked() && toggleStateOnGameObject.IsToggledNullChecked();
 
         public List<IMovement> Movements { get; protected set; } = new List<IMovement>(32);
 
-        public IToggleState ToggleState { get; protected set; } = new ToggleStateMember(true);
+        public IToggleState ToggleStateMember { get; protected set; } = new ToggleStateMember(true);
 
         protected IToggleState toggleStateOnGameObject = null;
 
         protected virtual void Start()
         {
-            if (GetComponent<Implementations.DefaultMovement>() == null)
-                gameObject.AddComponent<Implementations.DefaultMovement>();
+            if (GetComponent<DefaultMovement>() == null)
+                gameObject.AddComponent<DefaultMovement>();
 
             RecacheMovements();
             toggleStateOnGameObject = GetComponent<IToggleState>();
 
             toggleStateOnGameObject.OnToggleStateChanged += (_) => InvokeOnMoveAction();
-            ToggleState.OnToggleStateChanged += (_) => InvokeOnMoveAction();
+            ToggleStateMember.OnToggleStateChanged += (_) => InvokeOnMoveAction();
         }
 
         protected virtual void FixedUpdate()
diff --git a/Runtime/Implementations.meta b/Samples.meta
similarity index 77%
rename from Runtime/Implementations.meta
rename to Samples.meta
index c14cbc9..f01ab38 100644
--- a/Runtime/Implementations.meta
+++ b/Samples.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 15528ebd51d27d54398c55826710f23e
+guid: 231b2d16dd7862d41bc2111d759f6ca2
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}
diff --git a/Runtime/Implementations/AirMovement1D.cs b/Samples/AirMovement1D.cs
similarity index 92%
rename from Runtime/Implementations/AirMovement1D.cs
rename to Samples/AirMovement1D.cs
index 155e6b5..b7345b1 100644
--- a/Runtime/Implementations/AirMovement1D.cs
+++ b/Samples/AirMovement1D.cs
@@ -1,7 +1,7 @@
 using Syntriax.Modules.Trigger;
 using UnityEngine;
 
-namespace Syntriax.Modules.Movement.Implementations
+namespace Syntriax.Modules.Movement.Samples
 {
     [RequireComponent(typeof(Rigidbody2D))]
     public class AirMovement1D : MovementBase1D
@@ -19,7 +19,7 @@ namespace Syntriax.Modules.Movement.Implementations
 
             if (groundTrigger != null)
             {
-                groundTrigger.OnTriggered += OnGroundTrigger;
+                groundTrigger.OnTriggerStateChanged += OnGroundTrigger;
                 CanTakeOver = false;
             }
         }
diff --git a/Runtime/Implementations/AirMovement1D.cs.meta b/Samples/AirMovement1D.cs.meta
similarity index 100%
rename from Runtime/Implementations/AirMovement1D.cs.meta
rename to Samples/AirMovement1D.cs.meta
diff --git a/Runtime/Implementations/GroundMovement1D.cs b/Samples/GroundMovement1D.cs
similarity index 90%
rename from Runtime/Implementations/GroundMovement1D.cs
rename to Samples/GroundMovement1D.cs
index 5271430..6f29b2b 100644
--- a/Runtime/Implementations/GroundMovement1D.cs
+++ b/Samples/GroundMovement1D.cs
@@ -1,7 +1,7 @@
 using Syntriax.Modules.Trigger;
 using UnityEngine;
 
-namespace Syntriax.Modules.Movement.Implementations
+namespace Syntriax.Modules.Movement.Samples
 {
     [RequireComponent(typeof(Rigidbody2D))]
     public class GroundMovement1D : MovementBase1D
@@ -21,7 +21,7 @@ namespace Syntriax.Modules.Movement.Implementations
 
             if (groundTrigger != null)
             {
-                groundTrigger.OnTriggered += OnGroundTrigger;
+                groundTrigger.OnTriggerStateChanged += OnGroundTrigger;
                 CanTakeOver = false;
             }
         }
diff --git a/Runtime/Implementations/GroundMovement1D.cs.meta b/Samples/GroundMovement1D.cs.meta
similarity index 100%
rename from Runtime/Implementations/GroundMovement1D.cs.meta
rename to Samples/GroundMovement1D.cs.meta
diff --git a/Samples/Syntriax.Modules.Movement.Samples.asmdef b/Samples/Syntriax.Modules.Movement.Samples.asmdef
new file mode 100644
index 0000000..fd66084
--- /dev/null
+++ b/Samples/Syntriax.Modules.Movement.Samples.asmdef
@@ -0,0 +1,19 @@
+{
+    "name": "Syntriax.Modules.Movement.Samples",
+    "rootNamespace": "",
+    "references": [
+        "GUID:efa9a9bc94c60c74684aafb7428fbf61",
+        "GUID:1f5f15fe7e49bdb48a76c5ce9b1c9f2f",
+        "GUID:d4c952ed5f59c5a449cda1b0080ed841",
+        "GUID:c967acc4be781ca44b42a1887eb1ac7a"
+    ],
+    "includePlatforms": [],
+    "excludePlatforms": [],
+    "allowUnsafeCode": false,
+    "overrideReferences": false,
+    "precompiledReferences": [],
+    "autoReferenced": true,
+    "defineConstraints": [],
+    "versionDefines": [],
+    "noEngineReferences": false
+}
\ No newline at end of file
diff --git a/Samples/Syntriax.Modules.Movement.Samples.asmdef.meta b/Samples/Syntriax.Modules.Movement.Samples.asmdef.meta
new file mode 100644
index 0000000..8551f8b
--- /dev/null
+++ b/Samples/Syntriax.Modules.Movement.Samples.asmdef.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 863b8995abde2cf40b8b4cb709452a32
+AssemblyDefinitionImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/package.json b/package.json
index f0e4023..a78c986 100644
--- a/package.json
+++ b/package.json
@@ -1,13 +1,13 @@
 {
   "name": "com.syntriax.movement",
-  "version": "0.1.2",
+  "version": "0.1.4",
   "displayName": "Movement Module",
   "description": "Dependends On:\nhttps://git.syntriax.com/Syntriax/ToggleState.git\nhttps://git.syntriax.com/Syntriax/Trigger.git\nhttps://git.syntriax.com/Syntriax/Factory.git",
   "unity": "2019.1",
   "documentationUrl": "https://git.syntriax.com/Syntriax/Movement.git",
   "dependencies": {
     "com.syntriax.toggle-state": "0.1.0",
-    "com.syntriax.trigger": "0.1.0",
+    "com.syntriax.trigger": "0.2.0",
     "com.syntriax.factory": "0.1.0"
   },
   "keywords": ["Movement"],