diff --git a/UnitySDK/Assets/ML-Agents/Scripts/Constants.cs b/UnitySDK/Assets/ML-Agents/Scripts/Constants.cs
new file mode 100644
index 0000000000..720e2863f2
--- /dev/null
+++ b/UnitySDK/Assets/ML-Agents/Scripts/Constants.cs
@@ -0,0 +1,11 @@
+namespace MLAgents
+{
+    /// <summary>
+    /// Grouping for use in AddComponentMenu (instead of nesting the menus).
+    /// </summary>
+    public enum MenuGroup
+    {
+        Default=0,
+        Sensors=50
+    }
+}
diff --git a/UnitySDK/Assets/ML-Agents/Scripts/Constants.cs.meta b/UnitySDK/Assets/ML-Agents/Scripts/Constants.cs.meta
new file mode 100644
index 0000000000..f963ba55aa
--- /dev/null
+++ b/UnitySDK/Assets/ML-Agents/Scripts/Constants.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 0622d88401ec464d9d2cf2fb03ce17b5
+timeCreated: 1579215785
\ No newline at end of file
diff --git a/UnitySDK/Assets/ML-Agents/Scripts/DemonstrationRecorder.cs b/UnitySDK/Assets/ML-Agents/Scripts/DemonstrationRecorder.cs
index 33881f7102..3adf6cc990 100644
--- a/UnitySDK/Assets/ML-Agents/Scripts/DemonstrationRecorder.cs
+++ b/UnitySDK/Assets/ML-Agents/Scripts/DemonstrationRecorder.cs
@@ -10,6 +10,7 @@ namespace MLAgents
     /// Demonstration Recorder Component.
     /// </summary>
     [RequireComponent(typeof(Agent))]
+    [AddComponentMenu("ML Agents/Demonstration Recorder", (int) MenuGroup.Default)]
     public class DemonstrationRecorder : MonoBehaviour
     {
         public bool record;
diff --git a/UnitySDK/Assets/ML-Agents/Scripts/Policy/BehaviorParameters.cs b/UnitySDK/Assets/ML-Agents/Scripts/Policy/BehaviorParameters.cs
index dca26b0d6a..3e07a33993 100644
--- a/UnitySDK/Assets/ML-Agents/Scripts/Policy/BehaviorParameters.cs
+++ b/UnitySDK/Assets/ML-Agents/Scripts/Policy/BehaviorParameters.cs
@@ -9,6 +9,8 @@ namespace MLAgents
     /// <summary>
     /// The Factory to generate policies.
     /// </summary>
+    ///
+    [AddComponentMenu("ML Agents/Behavior Parameters", (int) MenuGroup.Default)]
     public class BehaviorParameters : MonoBehaviour
     {
 
diff --git a/UnitySDK/Assets/ML-Agents/Scripts/Sensor/CameraSensorComponent.cs b/UnitySDK/Assets/ML-Agents/Scripts/Sensor/CameraSensorComponent.cs
index 607706c194..90a8cd92a9 100644
--- a/UnitySDK/Assets/ML-Agents/Scripts/Sensor/CameraSensorComponent.cs
+++ b/UnitySDK/Assets/ML-Agents/Scripts/Sensor/CameraSensorComponent.cs
@@ -3,6 +3,7 @@
 
 namespace MLAgents.Sensor
 {
+    [AddComponentMenu("ML Agents/Camera Sensor", (int) MenuGroup.Sensors)]
     public class CameraSensorComponent : SensorComponent
     {
         public new Camera camera;
diff --git a/UnitySDK/Assets/ML-Agents/Scripts/Sensor/ISensor.cs b/UnitySDK/Assets/ML-Agents/Scripts/Sensor/ISensor.cs
index 9fee45a0d6..5efa86a23e 100644
--- a/UnitySDK/Assets/ML-Agents/Scripts/Sensor/ISensor.cs
+++ b/UnitySDK/Assets/ML-Agents/Scripts/Sensor/ISensor.cs
@@ -75,5 +75,4 @@ public static int ObservationSize(this ISensor sensor)
             return count;
         }
     }
-
 }
diff --git a/UnitySDK/Assets/ML-Agents/Scripts/Sensor/RayPerceptionSensorComponent2D.cs b/UnitySDK/Assets/ML-Agents/Scripts/Sensor/RayPerceptionSensorComponent2D.cs
index abb750128e..36211cadc5 100644
--- a/UnitySDK/Assets/ML-Agents/Scripts/Sensor/RayPerceptionSensorComponent2D.cs
+++ b/UnitySDK/Assets/ML-Agents/Scripts/Sensor/RayPerceptionSensorComponent2D.cs
@@ -1,5 +1,8 @@
+using UnityEngine;
+
 namespace MLAgents.Sensor
 {
+    [AddComponentMenu("ML Agents/Ray Perception Sensor 2D", (int) MenuGroup.Sensors)]
     public class RayPerceptionSensorComponent2D : RayPerceptionSensorComponentBase
     {
         public override RayPerceptionSensor.CastType GetCastType()
diff --git a/UnitySDK/Assets/ML-Agents/Scripts/Sensor/RayPerceptionSensorComponent3D.cs b/UnitySDK/Assets/ML-Agents/Scripts/Sensor/RayPerceptionSensorComponent3D.cs
index 6d7718971d..560fc82793 100644
--- a/UnitySDK/Assets/ML-Agents/Scripts/Sensor/RayPerceptionSensorComponent3D.cs
+++ b/UnitySDK/Assets/ML-Agents/Scripts/Sensor/RayPerceptionSensorComponent3D.cs
@@ -3,6 +3,7 @@
 
 namespace MLAgents.Sensor
 {
+    [AddComponentMenu("ML Agents/Ray Perception Sensor 3D", (int) MenuGroup.Sensors)]
     public class RayPerceptionSensorComponent3D : RayPerceptionSensorComponentBase
     {
         [Header("3D Properties", order = 100)]
diff --git a/UnitySDK/Assets/ML-Agents/Scripts/Sensor/RenderTextureSensorComponent.cs b/UnitySDK/Assets/ML-Agents/Scripts/Sensor/RenderTextureSensorComponent.cs
index 8c22bcd80f..7ad185517a 100644
--- a/UnitySDK/Assets/ML-Agents/Scripts/Sensor/RenderTextureSensorComponent.cs
+++ b/UnitySDK/Assets/ML-Agents/Scripts/Sensor/RenderTextureSensorComponent.cs
@@ -3,6 +3,7 @@
 
 namespace MLAgents.Sensor
 {
+    [AddComponentMenu("ML Agents/Render Texture Sensor", (int) MenuGroup.Sensors)]
     public class RenderTextureSensorComponent : SensorComponent
     {
         public RenderTexture renderTexture;