diff --git a/com.unity.shadergraph/Editor/Current.meta b/com.unity.shadergraph/Editor/Current.meta
new file mode 100644
index 00000000000..01328242fdb
--- /dev/null
+++ b/com.unity.shadergraph/Editor/Current.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 16401f40dc849964a941cc5d8eaab82e
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/com.unity.shadergraph/Editor/AssemblyInfo.cs b/com.unity.shadergraph/Editor/Current/AssemblyInfo.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/AssemblyInfo.cs
rename to com.unity.shadergraph/Editor/Current/AssemblyInfo.cs
diff --git a/com.unity.shadergraph/Editor/AssemblyInfo.cs.meta b/com.unity.shadergraph/Editor/Current/AssemblyInfo.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/AssemblyInfo.cs.meta
rename to com.unity.shadergraph/Editor/Current/AssemblyInfo.cs.meta
diff --git a/com.unity.shadergraph/Editor/AssetCallbacks.meta b/com.unity.shadergraph/Editor/Current/AssetCallbacks.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/AssetCallbacks.meta
rename to com.unity.shadergraph/Editor/Current/AssetCallbacks.meta
diff --git a/com.unity.shadergraph/Editor/AssetCallbacks/CreateShaderGraph.cs b/com.unity.shadergraph/Editor/Current/AssetCallbacks/CreateShaderGraph.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/AssetCallbacks/CreateShaderGraph.cs
rename to com.unity.shadergraph/Editor/Current/AssetCallbacks/CreateShaderGraph.cs
diff --git a/com.unity.shadergraph/Editor/AssetCallbacks/CreateShaderGraph.cs.meta b/com.unity.shadergraph/Editor/Current/AssetCallbacks/CreateShaderGraph.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/AssetCallbacks/CreateShaderGraph.cs.meta
rename to com.unity.shadergraph/Editor/Current/AssetCallbacks/CreateShaderGraph.cs.meta
diff --git a/com.unity.shadergraph/Editor/AssetCallbacks/CreateShaderSubGraph.cs b/com.unity.shadergraph/Editor/Current/AssetCallbacks/CreateShaderSubGraph.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/AssetCallbacks/CreateShaderSubGraph.cs
rename to com.unity.shadergraph/Editor/Current/AssetCallbacks/CreateShaderSubGraph.cs
diff --git a/com.unity.shadergraph/Editor/AssetCallbacks/CreateShaderSubGraph.cs.meta b/com.unity.shadergraph/Editor/Current/AssetCallbacks/CreateShaderSubGraph.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/AssetCallbacks/CreateShaderSubGraph.cs.meta
rename to com.unity.shadergraph/Editor/Current/AssetCallbacks/CreateShaderSubGraph.cs.meta
diff --git a/com.unity.shadergraph/Editor/AssetCallbacks/CreateVFXShaderGraph.cs b/com.unity.shadergraph/Editor/Current/AssetCallbacks/CreateVFXShaderGraph.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/AssetCallbacks/CreateVFXShaderGraph.cs
rename to com.unity.shadergraph/Editor/Current/AssetCallbacks/CreateVFXShaderGraph.cs
diff --git a/com.unity.shadergraph/Editor/AssetCallbacks/CreateVFXShaderGraph.cs.meta b/com.unity.shadergraph/Editor/Current/AssetCallbacks/CreateVFXShaderGraph.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/AssetCallbacks/CreateVFXShaderGraph.cs.meta
rename to com.unity.shadergraph/Editor/Current/AssetCallbacks/CreateVFXShaderGraph.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data.meta b/com.unity.shadergraph/Editor/Current/Data.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data.meta
rename to com.unity.shadergraph/Editor/Current/Data.meta
diff --git a/com.unity.shadergraph/Editor/Data/Actions.meta b/com.unity.shadergraph/Editor/Current/Data/Actions.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Actions.meta
rename to com.unity.shadergraph/Editor/Current/Data/Actions.meta
diff --git a/com.unity.shadergraph/Editor/Data/Actions/GraphViewActions.cs b/com.unity.shadergraph/Editor/Current/Data/Actions/GraphViewActions.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Actions/GraphViewActions.cs
rename to com.unity.shadergraph/Editor/Current/Data/Actions/GraphViewActions.cs
diff --git a/com.unity.shadergraph/Editor/Data/Actions/GraphViewActions.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Actions/GraphViewActions.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Actions/GraphViewActions.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Actions/GraphViewActions.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Attributes.meta b/com.unity.shadergraph/Editor/Current/Data/Attributes.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Attributes.meta
rename to com.unity.shadergraph/Editor/Current/Data/Attributes.meta
diff --git a/com.unity.shadergraph/Editor/Data/Attributes/BuiltinKeywordAttribute.cs b/com.unity.shadergraph/Editor/Current/Data/Attributes/BuiltinKeywordAttribute.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Attributes/BuiltinKeywordAttribute.cs
rename to com.unity.shadergraph/Editor/Current/Data/Attributes/BuiltinKeywordAttribute.cs
diff --git a/com.unity.shadergraph/Editor/Data/Attributes/BuiltinKeywordAttribute.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Attributes/BuiltinKeywordAttribute.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Attributes/BuiltinKeywordAttribute.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Attributes/BuiltinKeywordAttribute.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Attributes/ContextFilterableAttribute.cs b/com.unity.shadergraph/Editor/Current/Data/Attributes/ContextFilterableAttribute.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Attributes/ContextFilterableAttribute.cs
rename to com.unity.shadergraph/Editor/Current/Data/Attributes/ContextFilterableAttribute.cs
diff --git a/com.unity.shadergraph/Editor/Data/Attributes/ContextFilterableAttribute.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Attributes/ContextFilterableAttribute.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Attributes/ContextFilterableAttribute.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Attributes/ContextFilterableAttribute.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Attributes/InspectableAttribute.cs b/com.unity.shadergraph/Editor/Current/Data/Attributes/InspectableAttribute.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Attributes/InspectableAttribute.cs
rename to com.unity.shadergraph/Editor/Current/Data/Attributes/InspectableAttribute.cs
diff --git a/com.unity.shadergraph/Editor/Data/Attributes/InspectableAttribute.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Attributes/InspectableAttribute.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Attributes/InspectableAttribute.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Attributes/InspectableAttribute.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Attributes/NeverAllowedByTargetAttribute.cs b/com.unity.shadergraph/Editor/Current/Data/Attributes/NeverAllowedByTargetAttribute.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Attributes/NeverAllowedByTargetAttribute.cs
rename to com.unity.shadergraph/Editor/Current/Data/Attributes/NeverAllowedByTargetAttribute.cs
diff --git a/com.unity.shadergraph/Editor/Data/Attributes/NeverAllowedByTargetAttribute.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Attributes/NeverAllowedByTargetAttribute.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Attributes/NeverAllowedByTargetAttribute.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Attributes/NeverAllowedByTargetAttribute.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Attributes/SGPropertyDrawerAttribute.cs b/com.unity.shadergraph/Editor/Current/Data/Attributes/SGPropertyDrawerAttribute.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Attributes/SGPropertyDrawerAttribute.cs
rename to com.unity.shadergraph/Editor/Current/Data/Attributes/SGPropertyDrawerAttribute.cs
diff --git a/com.unity.shadergraph/Editor/Data/Attributes/SGPropertyDrawerAttribute.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Attributes/SGPropertyDrawerAttribute.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Attributes/SGPropertyDrawerAttribute.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Attributes/SGPropertyDrawerAttribute.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Attributes/SRPFilterAttribute.cs b/com.unity.shadergraph/Editor/Current/Data/Attributes/SRPFilterAttribute.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Attributes/SRPFilterAttribute.cs
rename to com.unity.shadergraph/Editor/Current/Data/Attributes/SRPFilterAttribute.cs
diff --git a/com.unity.shadergraph/Editor/Data/Attributes/SRPFilterAttribute.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Attributes/SRPFilterAttribute.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Attributes/SRPFilterAttribute.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Attributes/SRPFilterAttribute.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Attributes/SubTargetFilterAttribute.cs b/com.unity.shadergraph/Editor/Current/Data/Attributes/SubTargetFilterAttribute.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Attributes/SubTargetFilterAttribute.cs
rename to com.unity.shadergraph/Editor/Current/Data/Attributes/SubTargetFilterAttribute.cs
diff --git a/com.unity.shadergraph/Editor/Data/Attributes/SubTargetFilterAttribute.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Attributes/SubTargetFilterAttribute.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Attributes/SubTargetFilterAttribute.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Attributes/SubTargetFilterAttribute.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/ContextData.cs b/com.unity.shadergraph/Editor/Current/Data/ContextData.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/ContextData.cs
rename to com.unity.shadergraph/Editor/Current/Data/ContextData.cs
diff --git a/com.unity.shadergraph/Editor/Data/ContextData.cs.meta b/com.unity.shadergraph/Editor/Current/Data/ContextData.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/ContextData.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/ContextData.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Enumerations.meta b/com.unity.shadergraph/Editor/Current/Data/Enumerations.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Enumerations.meta
rename to com.unity.shadergraph/Editor/Current/Data/Enumerations.meta
diff --git a/com.unity.shadergraph/Editor/Data/Enumerations/Precision.cs b/com.unity.shadergraph/Editor/Current/Data/Enumerations/Precision.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Enumerations/Precision.cs
rename to com.unity.shadergraph/Editor/Current/Data/Enumerations/Precision.cs
diff --git a/com.unity.shadergraph/Editor/Data/Enumerations/Precision.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Enumerations/Precision.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Enumerations/Precision.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Enumerations/Precision.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Graphs.meta b/com.unity.shadergraph/Editor/Current/Data/Graphs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Graphs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Graphs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Graphs/AbstractMaterialGraphAsset.cs b/com.unity.shadergraph/Editor/Current/Data/Graphs/AbstractMaterialGraphAsset.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Graphs/AbstractMaterialGraphAsset.cs
rename to com.unity.shadergraph/Editor/Current/Data/Graphs/AbstractMaterialGraphAsset.cs
diff --git a/com.unity.shadergraph/Editor/Data/Graphs/AbstractMaterialGraphAsset.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Graphs/AbstractMaterialGraphAsset.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Graphs/AbstractMaterialGraphAsset.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Graphs/AbstractMaterialGraphAsset.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Graphs/AbstractShaderProperty.cs b/com.unity.shadergraph/Editor/Current/Data/Graphs/AbstractShaderProperty.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Graphs/AbstractShaderProperty.cs
rename to com.unity.shadergraph/Editor/Current/Data/Graphs/AbstractShaderProperty.cs
diff --git a/com.unity.shadergraph/Editor/Data/Graphs/AbstractShaderProperty.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Graphs/AbstractShaderProperty.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Graphs/AbstractShaderProperty.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Graphs/AbstractShaderProperty.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Graphs/BitangentMaterialSlot.cs b/com.unity.shadergraph/Editor/Current/Data/Graphs/BitangentMaterialSlot.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Graphs/BitangentMaterialSlot.cs
rename to com.unity.shadergraph/Editor/Current/Data/Graphs/BitangentMaterialSlot.cs
diff --git a/com.unity.shadergraph/Editor/Data/Graphs/BitangentMaterialSlot.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Graphs/BitangentMaterialSlot.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Graphs/BitangentMaterialSlot.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Graphs/BitangentMaterialSlot.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Graphs/BooleanMaterialSlot.cs b/com.unity.shadergraph/Editor/Current/Data/Graphs/BooleanMaterialSlot.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Graphs/BooleanMaterialSlot.cs
rename to com.unity.shadergraph/Editor/Current/Data/Graphs/BooleanMaterialSlot.cs
diff --git a/com.unity.shadergraph/Editor/Data/Graphs/BooleanMaterialSlot.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Graphs/BooleanMaterialSlot.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Graphs/BooleanMaterialSlot.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Graphs/BooleanMaterialSlot.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Graphs/BooleanShaderProperty.cs b/com.unity.shadergraph/Editor/Current/Data/Graphs/BooleanShaderProperty.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Graphs/BooleanShaderProperty.cs
rename to com.unity.shadergraph/Editor/Current/Data/Graphs/BooleanShaderProperty.cs
diff --git a/com.unity.shadergraph/Editor/Data/Graphs/BooleanShaderProperty.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Graphs/BooleanShaderProperty.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Graphs/BooleanShaderProperty.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Graphs/BooleanShaderProperty.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Graphs/CategoryData.cs b/com.unity.shadergraph/Editor/Current/Data/Graphs/CategoryData.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Graphs/CategoryData.cs
rename to com.unity.shadergraph/Editor/Current/Data/Graphs/CategoryData.cs
diff --git a/com.unity.shadergraph/Editor/Data/Graphs/CategoryData.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Graphs/CategoryData.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Graphs/CategoryData.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Graphs/CategoryData.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Graphs/ColorMaterialSlot.cs b/com.unity.shadergraph/Editor/Current/Data/Graphs/ColorMaterialSlot.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Graphs/ColorMaterialSlot.cs
rename to com.unity.shadergraph/Editor/Current/Data/Graphs/ColorMaterialSlot.cs
diff --git a/com.unity.shadergraph/Editor/Data/Graphs/ColorMaterialSlot.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Graphs/ColorMaterialSlot.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Graphs/ColorMaterialSlot.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Graphs/ColorMaterialSlot.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Graphs/ColorRGBMaterialSlot.cs b/com.unity.shadergraph/Editor/Current/Data/Graphs/ColorRGBMaterialSlot.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Graphs/ColorRGBMaterialSlot.cs
rename to com.unity.shadergraph/Editor/Current/Data/Graphs/ColorRGBMaterialSlot.cs
diff --git a/com.unity.shadergraph/Editor/Data/Graphs/ColorRGBMaterialSlot.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Graphs/ColorRGBMaterialSlot.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Graphs/ColorRGBMaterialSlot.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Graphs/ColorRGBMaterialSlot.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Graphs/ColorShaderProperty.cs b/com.unity.shadergraph/Editor/Current/Data/Graphs/ColorShaderProperty.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Graphs/ColorShaderProperty.cs
rename to com.unity.shadergraph/Editor/Current/Data/Graphs/ColorShaderProperty.cs
diff --git a/com.unity.shadergraph/Editor/Data/Graphs/ColorShaderProperty.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Graphs/ColorShaderProperty.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Graphs/ColorShaderProperty.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Graphs/ColorShaderProperty.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Graphs/CubemapInputMaterialSlot.cs b/com.unity.shadergraph/Editor/Current/Data/Graphs/CubemapInputMaterialSlot.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Graphs/CubemapInputMaterialSlot.cs
rename to com.unity.shadergraph/Editor/Current/Data/Graphs/CubemapInputMaterialSlot.cs
diff --git a/com.unity.shadergraph/Editor/Data/Graphs/CubemapInputMaterialSlot.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Graphs/CubemapInputMaterialSlot.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Graphs/CubemapInputMaterialSlot.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Graphs/CubemapInputMaterialSlot.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Graphs/CubemapMaterialSlot.cs b/com.unity.shadergraph/Editor/Current/Data/Graphs/CubemapMaterialSlot.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Graphs/CubemapMaterialSlot.cs
rename to com.unity.shadergraph/Editor/Current/Data/Graphs/CubemapMaterialSlot.cs
diff --git a/com.unity.shadergraph/Editor/Data/Graphs/CubemapMaterialSlot.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Graphs/CubemapMaterialSlot.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Graphs/CubemapMaterialSlot.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Graphs/CubemapMaterialSlot.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Graphs/CubemapShaderProperty.cs b/com.unity.shadergraph/Editor/Current/Data/Graphs/CubemapShaderProperty.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Graphs/CubemapShaderProperty.cs
rename to com.unity.shadergraph/Editor/Current/Data/Graphs/CubemapShaderProperty.cs
diff --git a/com.unity.shadergraph/Editor/Data/Graphs/CubemapShaderProperty.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Graphs/CubemapShaderProperty.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Graphs/CubemapShaderProperty.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Graphs/CubemapShaderProperty.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Graphs/DataStore.cs b/com.unity.shadergraph/Editor/Current/Data/Graphs/DataStore.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Graphs/DataStore.cs
rename to com.unity.shadergraph/Editor/Current/Data/Graphs/DataStore.cs
diff --git a/com.unity.shadergraph/Editor/Data/Graphs/DataStore.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Graphs/DataStore.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Graphs/DataStore.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Graphs/DataStore.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Graphs/DynamicMatrixMaterialSlot.cs b/com.unity.shadergraph/Editor/Current/Data/Graphs/DynamicMatrixMaterialSlot.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Graphs/DynamicMatrixMaterialSlot.cs
rename to com.unity.shadergraph/Editor/Current/Data/Graphs/DynamicMatrixMaterialSlot.cs
diff --git a/com.unity.shadergraph/Editor/Data/Graphs/DynamicMatrixMaterialSlot.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Graphs/DynamicMatrixMaterialSlot.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Graphs/DynamicMatrixMaterialSlot.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Graphs/DynamicMatrixMaterialSlot.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Graphs/DynamicValueMaterialSlot.cs b/com.unity.shadergraph/Editor/Current/Data/Graphs/DynamicValueMaterialSlot.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Graphs/DynamicValueMaterialSlot.cs
rename to com.unity.shadergraph/Editor/Current/Data/Graphs/DynamicValueMaterialSlot.cs
diff --git a/com.unity.shadergraph/Editor/Data/Graphs/DynamicValueMaterialSlot.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Graphs/DynamicValueMaterialSlot.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Graphs/DynamicValueMaterialSlot.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Graphs/DynamicValueMaterialSlot.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Graphs/DynamicVectorMaterialSlot.cs b/com.unity.shadergraph/Editor/Current/Data/Graphs/DynamicVectorMaterialSlot.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Graphs/DynamicVectorMaterialSlot.cs
rename to com.unity.shadergraph/Editor/Current/Data/Graphs/DynamicVectorMaterialSlot.cs
diff --git a/com.unity.shadergraph/Editor/Data/Graphs/DynamicVectorMaterialSlot.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Graphs/DynamicVectorMaterialSlot.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Graphs/DynamicVectorMaterialSlot.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Graphs/DynamicVectorMaterialSlot.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Graphs/GradientInputMaterialSlot.cs b/com.unity.shadergraph/Editor/Current/Data/Graphs/GradientInputMaterialSlot.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Graphs/GradientInputMaterialSlot.cs
rename to com.unity.shadergraph/Editor/Current/Data/Graphs/GradientInputMaterialSlot.cs
diff --git a/com.unity.shadergraph/Editor/Data/Graphs/GradientInputMaterialSlot.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Graphs/GradientInputMaterialSlot.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Graphs/GradientInputMaterialSlot.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Graphs/GradientInputMaterialSlot.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Graphs/GradientMaterialSlot.cs b/com.unity.shadergraph/Editor/Current/Data/Graphs/GradientMaterialSlot.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Graphs/GradientMaterialSlot.cs
rename to com.unity.shadergraph/Editor/Current/Data/Graphs/GradientMaterialSlot.cs
diff --git a/com.unity.shadergraph/Editor/Data/Graphs/GradientMaterialSlot.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Graphs/GradientMaterialSlot.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Graphs/GradientMaterialSlot.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Graphs/GradientMaterialSlot.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Graphs/GradientShaderProperty.cs b/com.unity.shadergraph/Editor/Current/Data/Graphs/GradientShaderProperty.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Graphs/GradientShaderProperty.cs
rename to com.unity.shadergraph/Editor/Current/Data/Graphs/GradientShaderProperty.cs
diff --git a/com.unity.shadergraph/Editor/Data/Graphs/GradientShaderProperty.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Graphs/GradientShaderProperty.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Graphs/GradientShaderProperty.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Graphs/GradientShaderProperty.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Graphs/GraphConcretization.cs b/com.unity.shadergraph/Editor/Current/Data/Graphs/GraphConcretization.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Graphs/GraphConcretization.cs
rename to com.unity.shadergraph/Editor/Current/Data/Graphs/GraphConcretization.cs
diff --git a/com.unity.shadergraph/Editor/Data/Graphs/GraphConcretization.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Graphs/GraphConcretization.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Graphs/GraphConcretization.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Graphs/GraphConcretization.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Graphs/GraphData.cs b/com.unity.shadergraph/Editor/Current/Data/Graphs/GraphData.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Graphs/GraphData.cs
rename to com.unity.shadergraph/Editor/Current/Data/Graphs/GraphData.cs
diff --git a/com.unity.shadergraph/Editor/Data/Graphs/GraphData.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Graphs/GraphData.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Graphs/GraphData.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Graphs/GraphData.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Graphs/GraphDataUtils.cs b/com.unity.shadergraph/Editor/Current/Data/Graphs/GraphDataUtils.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Graphs/GraphDataUtils.cs
rename to com.unity.shadergraph/Editor/Current/Data/Graphs/GraphDataUtils.cs
diff --git a/com.unity.shadergraph/Editor/Data/Graphs/GraphDataUtils.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Graphs/GraphDataUtils.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Graphs/GraphDataUtils.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Graphs/GraphDataUtils.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Graphs/GraphSetup.cs b/com.unity.shadergraph/Editor/Current/Data/Graphs/GraphSetup.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Graphs/GraphSetup.cs
rename to com.unity.shadergraph/Editor/Current/Data/Graphs/GraphSetup.cs
diff --git a/com.unity.shadergraph/Editor/Data/Graphs/GraphSetup.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Graphs/GraphSetup.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Graphs/GraphSetup.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Graphs/GraphSetup.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Graphs/GraphValidation.cs b/com.unity.shadergraph/Editor/Current/Data/Graphs/GraphValidation.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Graphs/GraphValidation.cs
rename to com.unity.shadergraph/Editor/Current/Data/Graphs/GraphValidation.cs
diff --git a/com.unity.shadergraph/Editor/Data/Graphs/GraphValidation.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Graphs/GraphValidation.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Graphs/GraphValidation.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Graphs/GraphValidation.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Graphs/GroupData.cs b/com.unity.shadergraph/Editor/Current/Data/Graphs/GroupData.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Graphs/GroupData.cs
rename to com.unity.shadergraph/Editor/Current/Data/Graphs/GroupData.cs
diff --git a/com.unity.shadergraph/Editor/Data/Graphs/GroupData.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Graphs/GroupData.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Graphs/GroupData.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Graphs/GroupData.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Graphs/IMaterialGraphAsset.cs b/com.unity.shadergraph/Editor/Current/Data/Graphs/IMaterialGraphAsset.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Graphs/IMaterialGraphAsset.cs
rename to com.unity.shadergraph/Editor/Current/Data/Graphs/IMaterialGraphAsset.cs
diff --git a/com.unity.shadergraph/Editor/Data/Graphs/IMaterialGraphAsset.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Graphs/IMaterialGraphAsset.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Graphs/IMaterialGraphAsset.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Graphs/IMaterialGraphAsset.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Graphs/IMaterialSlotHasValue.cs b/com.unity.shadergraph/Editor/Current/Data/Graphs/IMaterialSlotHasValue.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Graphs/IMaterialSlotHasValue.cs
rename to com.unity.shadergraph/Editor/Current/Data/Graphs/IMaterialSlotHasValue.cs
diff --git a/com.unity.shadergraph/Editor/Data/Graphs/IMaterialSlotHasValue.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Graphs/IMaterialSlotHasValue.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Graphs/IMaterialSlotHasValue.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Graphs/IMaterialSlotHasValue.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Graphs/LightmappingShaderProperties.cs b/com.unity.shadergraph/Editor/Current/Data/Graphs/LightmappingShaderProperties.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Graphs/LightmappingShaderProperties.cs
rename to com.unity.shadergraph/Editor/Current/Data/Graphs/LightmappingShaderProperties.cs
diff --git a/com.unity.shadergraph/Editor/Data/Graphs/LightmappingShaderProperties.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Graphs/LightmappingShaderProperties.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Graphs/LightmappingShaderProperties.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Graphs/LightmappingShaderProperties.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Graphs/MaterialSlot.cs b/com.unity.shadergraph/Editor/Current/Data/Graphs/MaterialSlot.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Graphs/MaterialSlot.cs
rename to com.unity.shadergraph/Editor/Current/Data/Graphs/MaterialSlot.cs
diff --git a/com.unity.shadergraph/Editor/Data/Graphs/MaterialSlot.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Graphs/MaterialSlot.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Graphs/MaterialSlot.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Graphs/MaterialSlot.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Graphs/Matrix2MaterialSlot.cs b/com.unity.shadergraph/Editor/Current/Data/Graphs/Matrix2MaterialSlot.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Graphs/Matrix2MaterialSlot.cs
rename to com.unity.shadergraph/Editor/Current/Data/Graphs/Matrix2MaterialSlot.cs
diff --git a/com.unity.shadergraph/Editor/Data/Graphs/Matrix2MaterialSlot.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Graphs/Matrix2MaterialSlot.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Graphs/Matrix2MaterialSlot.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Graphs/Matrix2MaterialSlot.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Graphs/Matrix2ShaderProperty.cs b/com.unity.shadergraph/Editor/Current/Data/Graphs/Matrix2ShaderProperty.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Graphs/Matrix2ShaderProperty.cs
rename to com.unity.shadergraph/Editor/Current/Data/Graphs/Matrix2ShaderProperty.cs
diff --git a/com.unity.shadergraph/Editor/Data/Graphs/Matrix2ShaderProperty.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Graphs/Matrix2ShaderProperty.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Graphs/Matrix2ShaderProperty.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Graphs/Matrix2ShaderProperty.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Graphs/Matrix3MaterialSlot.cs b/com.unity.shadergraph/Editor/Current/Data/Graphs/Matrix3MaterialSlot.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Graphs/Matrix3MaterialSlot.cs
rename to com.unity.shadergraph/Editor/Current/Data/Graphs/Matrix3MaterialSlot.cs
diff --git a/com.unity.shadergraph/Editor/Data/Graphs/Matrix3MaterialSlot.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Graphs/Matrix3MaterialSlot.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Graphs/Matrix3MaterialSlot.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Graphs/Matrix3MaterialSlot.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Graphs/Matrix3ShaderProperty.cs b/com.unity.shadergraph/Editor/Current/Data/Graphs/Matrix3ShaderProperty.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Graphs/Matrix3ShaderProperty.cs
rename to com.unity.shadergraph/Editor/Current/Data/Graphs/Matrix3ShaderProperty.cs
diff --git a/com.unity.shadergraph/Editor/Data/Graphs/Matrix3ShaderProperty.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Graphs/Matrix3ShaderProperty.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Graphs/Matrix3ShaderProperty.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Graphs/Matrix3ShaderProperty.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Graphs/Matrix4MaterialSlot.cs b/com.unity.shadergraph/Editor/Current/Data/Graphs/Matrix4MaterialSlot.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Graphs/Matrix4MaterialSlot.cs
rename to com.unity.shadergraph/Editor/Current/Data/Graphs/Matrix4MaterialSlot.cs
diff --git a/com.unity.shadergraph/Editor/Data/Graphs/Matrix4MaterialSlot.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Graphs/Matrix4MaterialSlot.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Graphs/Matrix4MaterialSlot.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Graphs/Matrix4MaterialSlot.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Graphs/Matrix4ShaderProperty.cs b/com.unity.shadergraph/Editor/Current/Data/Graphs/Matrix4ShaderProperty.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Graphs/Matrix4ShaderProperty.cs
rename to com.unity.shadergraph/Editor/Current/Data/Graphs/Matrix4ShaderProperty.cs
diff --git a/com.unity.shadergraph/Editor/Data/Graphs/Matrix4ShaderProperty.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Graphs/Matrix4ShaderProperty.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Graphs/Matrix4ShaderProperty.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Graphs/Matrix4ShaderProperty.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Graphs/MatrixShaderProperty.cs b/com.unity.shadergraph/Editor/Current/Data/Graphs/MatrixShaderProperty.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Graphs/MatrixShaderProperty.cs
rename to com.unity.shadergraph/Editor/Current/Data/Graphs/MatrixShaderProperty.cs
diff --git a/com.unity.shadergraph/Editor/Data/Graphs/MatrixShaderProperty.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Graphs/MatrixShaderProperty.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Graphs/MatrixShaderProperty.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Graphs/MatrixShaderProperty.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Graphs/MinimalGraphData.cs b/com.unity.shadergraph/Editor/Current/Data/Graphs/MinimalGraphData.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Graphs/MinimalGraphData.cs
rename to com.unity.shadergraph/Editor/Current/Data/Graphs/MinimalGraphData.cs
diff --git a/com.unity.shadergraph/Editor/Data/Graphs/MinimalGraphData.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Graphs/MinimalGraphData.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Graphs/MinimalGraphData.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Graphs/MinimalGraphData.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Graphs/NormalMaterialSlot.cs b/com.unity.shadergraph/Editor/Current/Data/Graphs/NormalMaterialSlot.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Graphs/NormalMaterialSlot.cs
rename to com.unity.shadergraph/Editor/Current/Data/Graphs/NormalMaterialSlot.cs
diff --git a/com.unity.shadergraph/Editor/Data/Graphs/NormalMaterialSlot.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Graphs/NormalMaterialSlot.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Graphs/NormalMaterialSlot.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Graphs/NormalMaterialSlot.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Graphs/ParentGroupChange.cs b/com.unity.shadergraph/Editor/Current/Data/Graphs/ParentGroupChange.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Graphs/ParentGroupChange.cs
rename to com.unity.shadergraph/Editor/Current/Data/Graphs/ParentGroupChange.cs
diff --git a/com.unity.shadergraph/Editor/Data/Graphs/ParentGroupChange.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Graphs/ParentGroupChange.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Graphs/ParentGroupChange.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Graphs/ParentGroupChange.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Graphs/PositionMaterialSlot.cs b/com.unity.shadergraph/Editor/Current/Data/Graphs/PositionMaterialSlot.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Graphs/PositionMaterialSlot.cs
rename to com.unity.shadergraph/Editor/Current/Data/Graphs/PositionMaterialSlot.cs
diff --git a/com.unity.shadergraph/Editor/Data/Graphs/PositionMaterialSlot.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Graphs/PositionMaterialSlot.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Graphs/PositionMaterialSlot.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Graphs/PositionMaterialSlot.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Graphs/PreviewMode.cs b/com.unity.shadergraph/Editor/Current/Data/Graphs/PreviewMode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Graphs/PreviewMode.cs
rename to com.unity.shadergraph/Editor/Current/Data/Graphs/PreviewMode.cs
diff --git a/com.unity.shadergraph/Editor/Data/Graphs/PreviewMode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Graphs/PreviewMode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Graphs/PreviewMode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Graphs/PreviewMode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Graphs/PreviewProperty.cs b/com.unity.shadergraph/Editor/Current/Data/Graphs/PreviewProperty.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Graphs/PreviewProperty.cs
rename to com.unity.shadergraph/Editor/Current/Data/Graphs/PreviewProperty.cs
diff --git a/com.unity.shadergraph/Editor/Data/Graphs/PreviewProperty.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Graphs/PreviewProperty.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Graphs/PreviewProperty.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Graphs/PreviewProperty.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Graphs/PropertyConnectionStateMaterialSlot.cs b/com.unity.shadergraph/Editor/Current/Data/Graphs/PropertyConnectionStateMaterialSlot.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Graphs/PropertyConnectionStateMaterialSlot.cs
rename to com.unity.shadergraph/Editor/Current/Data/Graphs/PropertyConnectionStateMaterialSlot.cs
diff --git a/com.unity.shadergraph/Editor/Data/Graphs/PropertyConnectionStateMaterialSlot.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Graphs/PropertyConnectionStateMaterialSlot.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Graphs/PropertyConnectionStateMaterialSlot.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Graphs/PropertyConnectionStateMaterialSlot.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Graphs/SamplerStateMaterialSlot.cs b/com.unity.shadergraph/Editor/Current/Data/Graphs/SamplerStateMaterialSlot.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Graphs/SamplerStateMaterialSlot.cs
rename to com.unity.shadergraph/Editor/Current/Data/Graphs/SamplerStateMaterialSlot.cs
diff --git a/com.unity.shadergraph/Editor/Data/Graphs/SamplerStateMaterialSlot.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Graphs/SamplerStateMaterialSlot.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Graphs/SamplerStateMaterialSlot.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Graphs/SamplerStateMaterialSlot.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Graphs/SamplerStateShaderProperty.cs b/com.unity.shadergraph/Editor/Current/Data/Graphs/SamplerStateShaderProperty.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Graphs/SamplerStateShaderProperty.cs
rename to com.unity.shadergraph/Editor/Current/Data/Graphs/SamplerStateShaderProperty.cs
diff --git a/com.unity.shadergraph/Editor/Data/Graphs/SamplerStateShaderProperty.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Graphs/SamplerStateShaderProperty.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Graphs/SamplerStateShaderProperty.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Graphs/SamplerStateShaderProperty.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Graphs/ScreenPositionMaterialSlot.cs b/com.unity.shadergraph/Editor/Current/Data/Graphs/ScreenPositionMaterialSlot.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Graphs/ScreenPositionMaterialSlot.cs
rename to com.unity.shadergraph/Editor/Current/Data/Graphs/ScreenPositionMaterialSlot.cs
diff --git a/com.unity.shadergraph/Editor/Data/Graphs/ScreenPositionMaterialSlot.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Graphs/ScreenPositionMaterialSlot.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Graphs/ScreenPositionMaterialSlot.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Graphs/ScreenPositionMaterialSlot.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Graphs/SerializableCubemap.cs b/com.unity.shadergraph/Editor/Current/Data/Graphs/SerializableCubemap.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Graphs/SerializableCubemap.cs
rename to com.unity.shadergraph/Editor/Current/Data/Graphs/SerializableCubemap.cs
diff --git a/com.unity.shadergraph/Editor/Data/Graphs/SerializableCubemap.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Graphs/SerializableCubemap.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Graphs/SerializableCubemap.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Graphs/SerializableCubemap.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Graphs/SerializableGuid.cs b/com.unity.shadergraph/Editor/Current/Data/Graphs/SerializableGuid.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Graphs/SerializableGuid.cs
rename to com.unity.shadergraph/Editor/Current/Data/Graphs/SerializableGuid.cs
diff --git a/com.unity.shadergraph/Editor/Data/Graphs/SerializableGuid.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Graphs/SerializableGuid.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Graphs/SerializableGuid.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Graphs/SerializableGuid.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Graphs/SerializableMesh.cs b/com.unity.shadergraph/Editor/Current/Data/Graphs/SerializableMesh.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Graphs/SerializableMesh.cs
rename to com.unity.shadergraph/Editor/Current/Data/Graphs/SerializableMesh.cs
diff --git a/com.unity.shadergraph/Editor/Data/Graphs/SerializableMesh.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Graphs/SerializableMesh.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Graphs/SerializableMesh.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Graphs/SerializableMesh.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Graphs/SerializableTexture.cs b/com.unity.shadergraph/Editor/Current/Data/Graphs/SerializableTexture.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Graphs/SerializableTexture.cs
rename to com.unity.shadergraph/Editor/Current/Data/Graphs/SerializableTexture.cs
diff --git a/com.unity.shadergraph/Editor/Data/Graphs/SerializableTexture.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Graphs/SerializableTexture.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Graphs/SerializableTexture.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Graphs/SerializableTexture.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Graphs/SerializableTextureArray.cs b/com.unity.shadergraph/Editor/Current/Data/Graphs/SerializableTextureArray.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Graphs/SerializableTextureArray.cs
rename to com.unity.shadergraph/Editor/Current/Data/Graphs/SerializableTextureArray.cs
diff --git a/com.unity.shadergraph/Editor/Data/Graphs/SerializableTextureArray.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Graphs/SerializableTextureArray.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Graphs/SerializableTextureArray.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Graphs/SerializableTextureArray.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Graphs/SerializableVirtualTexture.cs b/com.unity.shadergraph/Editor/Current/Data/Graphs/SerializableVirtualTexture.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Graphs/SerializableVirtualTexture.cs
rename to com.unity.shadergraph/Editor/Current/Data/Graphs/SerializableVirtualTexture.cs
diff --git a/com.unity.shadergraph/Editor/Data/Graphs/SerializableVirtualTexture.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Graphs/SerializableVirtualTexture.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Graphs/SerializableVirtualTexture.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Graphs/SerializableVirtualTexture.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Graphs/ShaderDropdown.cs b/com.unity.shadergraph/Editor/Current/Data/Graphs/ShaderDropdown.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Graphs/ShaderDropdown.cs
rename to com.unity.shadergraph/Editor/Current/Data/Graphs/ShaderDropdown.cs
diff --git a/com.unity.shadergraph/Editor/Data/Graphs/ShaderDropdown.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Graphs/ShaderDropdown.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Graphs/ShaderDropdown.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Graphs/ShaderDropdown.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Graphs/ShaderGraphRequirements.cs b/com.unity.shadergraph/Editor/Current/Data/Graphs/ShaderGraphRequirements.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Graphs/ShaderGraphRequirements.cs
rename to com.unity.shadergraph/Editor/Current/Data/Graphs/ShaderGraphRequirements.cs
diff --git a/com.unity.shadergraph/Editor/Data/Graphs/ShaderGraphRequirements.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Graphs/ShaderGraphRequirements.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Graphs/ShaderGraphRequirements.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Graphs/ShaderGraphRequirements.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Graphs/ShaderInput.cs b/com.unity.shadergraph/Editor/Current/Data/Graphs/ShaderInput.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Graphs/ShaderInput.cs
rename to com.unity.shadergraph/Editor/Current/Data/Graphs/ShaderInput.cs
diff --git a/com.unity.shadergraph/Editor/Data/Graphs/ShaderInput.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Graphs/ShaderInput.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Graphs/ShaderInput.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Graphs/ShaderInput.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Graphs/ShaderKeyword.cs b/com.unity.shadergraph/Editor/Current/Data/Graphs/ShaderKeyword.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Graphs/ShaderKeyword.cs
rename to com.unity.shadergraph/Editor/Current/Data/Graphs/ShaderKeyword.cs
diff --git a/com.unity.shadergraph/Editor/Data/Graphs/ShaderKeyword.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Graphs/ShaderKeyword.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Graphs/ShaderKeyword.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Graphs/ShaderKeyword.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Graphs/SpaceMaterialSlot.cs b/com.unity.shadergraph/Editor/Current/Data/Graphs/SpaceMaterialSlot.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Graphs/SpaceMaterialSlot.cs
rename to com.unity.shadergraph/Editor/Current/Data/Graphs/SpaceMaterialSlot.cs
diff --git a/com.unity.shadergraph/Editor/Data/Graphs/SpaceMaterialSlot.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Graphs/SpaceMaterialSlot.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Graphs/SpaceMaterialSlot.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Graphs/SpaceMaterialSlot.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Graphs/StickyNoteData.cs b/com.unity.shadergraph/Editor/Current/Data/Graphs/StickyNoteData.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Graphs/StickyNoteData.cs
rename to com.unity.shadergraph/Editor/Current/Data/Graphs/StickyNoteData.cs
diff --git a/com.unity.shadergraph/Editor/Data/Graphs/StickyNoteData.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Graphs/StickyNoteData.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Graphs/StickyNoteData.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Graphs/StickyNoteData.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Graphs/TangentMaterialSlot.cs b/com.unity.shadergraph/Editor/Current/Data/Graphs/TangentMaterialSlot.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Graphs/TangentMaterialSlot.cs
rename to com.unity.shadergraph/Editor/Current/Data/Graphs/TangentMaterialSlot.cs
diff --git a/com.unity.shadergraph/Editor/Data/Graphs/TangentMaterialSlot.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Graphs/TangentMaterialSlot.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Graphs/TangentMaterialSlot.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Graphs/TangentMaterialSlot.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Graphs/Texture2DArrayInputMaterialSlot.cs b/com.unity.shadergraph/Editor/Current/Data/Graphs/Texture2DArrayInputMaterialSlot.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Graphs/Texture2DArrayInputMaterialSlot.cs
rename to com.unity.shadergraph/Editor/Current/Data/Graphs/Texture2DArrayInputMaterialSlot.cs
diff --git a/com.unity.shadergraph/Editor/Data/Graphs/Texture2DArrayInputMaterialSlot.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Graphs/Texture2DArrayInputMaterialSlot.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Graphs/Texture2DArrayInputMaterialSlot.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Graphs/Texture2DArrayInputMaterialSlot.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Graphs/Texture2DArrayMaterialSlot.cs b/com.unity.shadergraph/Editor/Current/Data/Graphs/Texture2DArrayMaterialSlot.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Graphs/Texture2DArrayMaterialSlot.cs
rename to com.unity.shadergraph/Editor/Current/Data/Graphs/Texture2DArrayMaterialSlot.cs
diff --git a/com.unity.shadergraph/Editor/Data/Graphs/Texture2DArrayMaterialSlot.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Graphs/Texture2DArrayMaterialSlot.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Graphs/Texture2DArrayMaterialSlot.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Graphs/Texture2DArrayMaterialSlot.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Graphs/Texture2DArrayShaderProperty.cs b/com.unity.shadergraph/Editor/Current/Data/Graphs/Texture2DArrayShaderProperty.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Graphs/Texture2DArrayShaderProperty.cs
rename to com.unity.shadergraph/Editor/Current/Data/Graphs/Texture2DArrayShaderProperty.cs
diff --git a/com.unity.shadergraph/Editor/Data/Graphs/Texture2DArrayShaderProperty.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Graphs/Texture2DArrayShaderProperty.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Graphs/Texture2DArrayShaderProperty.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Graphs/Texture2DArrayShaderProperty.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Graphs/Texture2DInputMaterialSlot.cs b/com.unity.shadergraph/Editor/Current/Data/Graphs/Texture2DInputMaterialSlot.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Graphs/Texture2DInputMaterialSlot.cs
rename to com.unity.shadergraph/Editor/Current/Data/Graphs/Texture2DInputMaterialSlot.cs
diff --git a/com.unity.shadergraph/Editor/Data/Graphs/Texture2DInputMaterialSlot.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Graphs/Texture2DInputMaterialSlot.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Graphs/Texture2DInputMaterialSlot.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Graphs/Texture2DInputMaterialSlot.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Graphs/Texture2DMaterialSlot.cs b/com.unity.shadergraph/Editor/Current/Data/Graphs/Texture2DMaterialSlot.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Graphs/Texture2DMaterialSlot.cs
rename to com.unity.shadergraph/Editor/Current/Data/Graphs/Texture2DMaterialSlot.cs
diff --git a/com.unity.shadergraph/Editor/Data/Graphs/Texture2DMaterialSlot.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Graphs/Texture2DMaterialSlot.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Graphs/Texture2DMaterialSlot.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Graphs/Texture2DMaterialSlot.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Graphs/Texture2DShaderProperty.cs b/com.unity.shadergraph/Editor/Current/Data/Graphs/Texture2DShaderProperty.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Graphs/Texture2DShaderProperty.cs
rename to com.unity.shadergraph/Editor/Current/Data/Graphs/Texture2DShaderProperty.cs
diff --git a/com.unity.shadergraph/Editor/Data/Graphs/Texture2DShaderProperty.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Graphs/Texture2DShaderProperty.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Graphs/Texture2DShaderProperty.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Graphs/Texture2DShaderProperty.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Graphs/Texture3DInputMaterialSlot.cs b/com.unity.shadergraph/Editor/Current/Data/Graphs/Texture3DInputMaterialSlot.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Graphs/Texture3DInputMaterialSlot.cs
rename to com.unity.shadergraph/Editor/Current/Data/Graphs/Texture3DInputMaterialSlot.cs
diff --git a/com.unity.shadergraph/Editor/Data/Graphs/Texture3DInputMaterialSlot.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Graphs/Texture3DInputMaterialSlot.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Graphs/Texture3DInputMaterialSlot.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Graphs/Texture3DInputMaterialSlot.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Graphs/Texture3DMaterialSlot.cs b/com.unity.shadergraph/Editor/Current/Data/Graphs/Texture3DMaterialSlot.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Graphs/Texture3DMaterialSlot.cs
rename to com.unity.shadergraph/Editor/Current/Data/Graphs/Texture3DMaterialSlot.cs
diff --git a/com.unity.shadergraph/Editor/Data/Graphs/Texture3DMaterialSlot.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Graphs/Texture3DMaterialSlot.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Graphs/Texture3DMaterialSlot.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Graphs/Texture3DMaterialSlot.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Graphs/Texture3DShaderProperty.cs b/com.unity.shadergraph/Editor/Current/Data/Graphs/Texture3DShaderProperty.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Graphs/Texture3DShaderProperty.cs
rename to com.unity.shadergraph/Editor/Current/Data/Graphs/Texture3DShaderProperty.cs
diff --git a/com.unity.shadergraph/Editor/Data/Graphs/Texture3DShaderProperty.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Graphs/Texture3DShaderProperty.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Graphs/Texture3DShaderProperty.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Graphs/Texture3DShaderProperty.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Graphs/TextureSamplerState.cs b/com.unity.shadergraph/Editor/Current/Data/Graphs/TextureSamplerState.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Graphs/TextureSamplerState.cs
rename to com.unity.shadergraph/Editor/Current/Data/Graphs/TextureSamplerState.cs
diff --git a/com.unity.shadergraph/Editor/Data/Graphs/TextureSamplerState.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Graphs/TextureSamplerState.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Graphs/TextureSamplerState.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Graphs/TextureSamplerState.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Graphs/UVMaterialSlot.cs b/com.unity.shadergraph/Editor/Current/Data/Graphs/UVMaterialSlot.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Graphs/UVMaterialSlot.cs
rename to com.unity.shadergraph/Editor/Current/Data/Graphs/UVMaterialSlot.cs
diff --git a/com.unity.shadergraph/Editor/Data/Graphs/UVMaterialSlot.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Graphs/UVMaterialSlot.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Graphs/UVMaterialSlot.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Graphs/UVMaterialSlot.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Graphs/Vector1MaterialSlot.cs b/com.unity.shadergraph/Editor/Current/Data/Graphs/Vector1MaterialSlot.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Graphs/Vector1MaterialSlot.cs
rename to com.unity.shadergraph/Editor/Current/Data/Graphs/Vector1MaterialSlot.cs
diff --git a/com.unity.shadergraph/Editor/Data/Graphs/Vector1MaterialSlot.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Graphs/Vector1MaterialSlot.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Graphs/Vector1MaterialSlot.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Graphs/Vector1MaterialSlot.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Graphs/Vector1ShaderProperty.cs b/com.unity.shadergraph/Editor/Current/Data/Graphs/Vector1ShaderProperty.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Graphs/Vector1ShaderProperty.cs
rename to com.unity.shadergraph/Editor/Current/Data/Graphs/Vector1ShaderProperty.cs
diff --git a/com.unity.shadergraph/Editor/Data/Graphs/Vector1ShaderProperty.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Graphs/Vector1ShaderProperty.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Graphs/Vector1ShaderProperty.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Graphs/Vector1ShaderProperty.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Graphs/Vector2MaterialSlot.cs b/com.unity.shadergraph/Editor/Current/Data/Graphs/Vector2MaterialSlot.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Graphs/Vector2MaterialSlot.cs
rename to com.unity.shadergraph/Editor/Current/Data/Graphs/Vector2MaterialSlot.cs
diff --git a/com.unity.shadergraph/Editor/Data/Graphs/Vector2MaterialSlot.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Graphs/Vector2MaterialSlot.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Graphs/Vector2MaterialSlot.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Graphs/Vector2MaterialSlot.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Graphs/Vector2ShaderProperty.cs b/com.unity.shadergraph/Editor/Current/Data/Graphs/Vector2ShaderProperty.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Graphs/Vector2ShaderProperty.cs
rename to com.unity.shadergraph/Editor/Current/Data/Graphs/Vector2ShaderProperty.cs
diff --git a/com.unity.shadergraph/Editor/Data/Graphs/Vector2ShaderProperty.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Graphs/Vector2ShaderProperty.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Graphs/Vector2ShaderProperty.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Graphs/Vector2ShaderProperty.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Graphs/Vector3MaterialSlot.cs b/com.unity.shadergraph/Editor/Current/Data/Graphs/Vector3MaterialSlot.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Graphs/Vector3MaterialSlot.cs
rename to com.unity.shadergraph/Editor/Current/Data/Graphs/Vector3MaterialSlot.cs
diff --git a/com.unity.shadergraph/Editor/Data/Graphs/Vector3MaterialSlot.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Graphs/Vector3MaterialSlot.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Graphs/Vector3MaterialSlot.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Graphs/Vector3MaterialSlot.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Graphs/Vector3ShaderProperty.cs b/com.unity.shadergraph/Editor/Current/Data/Graphs/Vector3ShaderProperty.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Graphs/Vector3ShaderProperty.cs
rename to com.unity.shadergraph/Editor/Current/Data/Graphs/Vector3ShaderProperty.cs
diff --git a/com.unity.shadergraph/Editor/Data/Graphs/Vector3ShaderProperty.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Graphs/Vector3ShaderProperty.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Graphs/Vector3ShaderProperty.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Graphs/Vector3ShaderProperty.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Graphs/Vector4MaterialSlot.cs b/com.unity.shadergraph/Editor/Current/Data/Graphs/Vector4MaterialSlot.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Graphs/Vector4MaterialSlot.cs
rename to com.unity.shadergraph/Editor/Current/Data/Graphs/Vector4MaterialSlot.cs
diff --git a/com.unity.shadergraph/Editor/Data/Graphs/Vector4MaterialSlot.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Graphs/Vector4MaterialSlot.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Graphs/Vector4MaterialSlot.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Graphs/Vector4MaterialSlot.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Graphs/Vector4ShaderProperty.cs b/com.unity.shadergraph/Editor/Current/Data/Graphs/Vector4ShaderProperty.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Graphs/Vector4ShaderProperty.cs
rename to com.unity.shadergraph/Editor/Current/Data/Graphs/Vector4ShaderProperty.cs
diff --git a/com.unity.shadergraph/Editor/Data/Graphs/Vector4ShaderProperty.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Graphs/Vector4ShaderProperty.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Graphs/Vector4ShaderProperty.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Graphs/Vector4ShaderProperty.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Graphs/VectorShaderProperty.cs b/com.unity.shadergraph/Editor/Current/Data/Graphs/VectorShaderProperty.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Graphs/VectorShaderProperty.cs
rename to com.unity.shadergraph/Editor/Current/Data/Graphs/VectorShaderProperty.cs
diff --git a/com.unity.shadergraph/Editor/Data/Graphs/VectorShaderProperty.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Graphs/VectorShaderProperty.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Graphs/VectorShaderProperty.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Graphs/VectorShaderProperty.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Graphs/VertexColorMaterialSlot.cs b/com.unity.shadergraph/Editor/Current/Data/Graphs/VertexColorMaterialSlot.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Graphs/VertexColorMaterialSlot.cs
rename to com.unity.shadergraph/Editor/Current/Data/Graphs/VertexColorMaterialSlot.cs
diff --git a/com.unity.shadergraph/Editor/Data/Graphs/VertexColorMaterialSlot.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Graphs/VertexColorMaterialSlot.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Graphs/VertexColorMaterialSlot.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Graphs/VertexColorMaterialSlot.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Graphs/ViewDirectionMaterialSlot.cs b/com.unity.shadergraph/Editor/Current/Data/Graphs/ViewDirectionMaterialSlot.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Graphs/ViewDirectionMaterialSlot.cs
rename to com.unity.shadergraph/Editor/Current/Data/Graphs/ViewDirectionMaterialSlot.cs
diff --git a/com.unity.shadergraph/Editor/Data/Graphs/ViewDirectionMaterialSlot.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Graphs/ViewDirectionMaterialSlot.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Graphs/ViewDirectionMaterialSlot.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Graphs/ViewDirectionMaterialSlot.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Graphs/VirtualTextureInputMaterialSlot.cs b/com.unity.shadergraph/Editor/Current/Data/Graphs/VirtualTextureInputMaterialSlot.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Graphs/VirtualTextureInputMaterialSlot.cs
rename to com.unity.shadergraph/Editor/Current/Data/Graphs/VirtualTextureInputMaterialSlot.cs
diff --git a/com.unity.shadergraph/Editor/Data/Graphs/VirtualTextureInputMaterialSlot.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Graphs/VirtualTextureInputMaterialSlot.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Graphs/VirtualTextureInputMaterialSlot.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Graphs/VirtualTextureInputMaterialSlot.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Graphs/VirtualTextureMaterialSlot.cs b/com.unity.shadergraph/Editor/Current/Data/Graphs/VirtualTextureMaterialSlot.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Graphs/VirtualTextureMaterialSlot.cs
rename to com.unity.shadergraph/Editor/Current/Data/Graphs/VirtualTextureMaterialSlot.cs
diff --git a/com.unity.shadergraph/Editor/Data/Graphs/VirtualTextureMaterialSlot.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Graphs/VirtualTextureMaterialSlot.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Graphs/VirtualTextureMaterialSlot.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Graphs/VirtualTextureMaterialSlot.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Graphs/VirtualTextureShaderProperty.cs b/com.unity.shadergraph/Editor/Current/Data/Graphs/VirtualTextureShaderProperty.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Graphs/VirtualTextureShaderProperty.cs
rename to com.unity.shadergraph/Editor/Current/Data/Graphs/VirtualTextureShaderProperty.cs
diff --git a/com.unity.shadergraph/Editor/Data/Graphs/VirtualTextureShaderProperty.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Graphs/VirtualTextureShaderProperty.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Graphs/VirtualTextureShaderProperty.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Graphs/VirtualTextureShaderProperty.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Implementation.meta b/com.unity.shadergraph/Editor/Current/Data/Implementation.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Implementation.meta
rename to com.unity.shadergraph/Editor/Current/Data/Implementation.meta
diff --git a/com.unity.shadergraph/Editor/Data/Implementation/Edge.cs b/com.unity.shadergraph/Editor/Current/Data/Implementation/Edge.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Implementation/Edge.cs
rename to com.unity.shadergraph/Editor/Current/Data/Implementation/Edge.cs
diff --git a/com.unity.shadergraph/Editor/Data/Implementation/Edge.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Implementation/Edge.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Implementation/Edge.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Implementation/Edge.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Implementation/GraphObject.cs b/com.unity.shadergraph/Editor/Current/Data/Implementation/GraphObject.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Implementation/GraphObject.cs
rename to com.unity.shadergraph/Editor/Current/Data/Implementation/GraphObject.cs
diff --git a/com.unity.shadergraph/Editor/Data/Implementation/GraphObject.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Implementation/GraphObject.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Implementation/GraphObject.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Implementation/GraphObject.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Implementation/HasDependenciesAttribute.cs b/com.unity.shadergraph/Editor/Current/Data/Implementation/HasDependenciesAttribute.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Implementation/HasDependenciesAttribute.cs
rename to com.unity.shadergraph/Editor/Current/Data/Implementation/HasDependenciesAttribute.cs
diff --git a/com.unity.shadergraph/Editor/Data/Implementation/HasDependenciesAttribute.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Implementation/HasDependenciesAttribute.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Implementation/HasDependenciesAttribute.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Implementation/HasDependenciesAttribute.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Implementation/IHasDependencies.cs b/com.unity.shadergraph/Editor/Current/Data/Implementation/IHasDependencies.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Implementation/IHasDependencies.cs
rename to com.unity.shadergraph/Editor/Current/Data/Implementation/IHasDependencies.cs
diff --git a/com.unity.shadergraph/Editor/Data/Implementation/IHasDependencies.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Implementation/IHasDependencies.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Implementation/IHasDependencies.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Implementation/IHasDependencies.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Implementation/NodeUtils.cs b/com.unity.shadergraph/Editor/Current/Data/Implementation/NodeUtils.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Implementation/NodeUtils.cs
rename to com.unity.shadergraph/Editor/Current/Data/Implementation/NodeUtils.cs
diff --git a/com.unity.shadergraph/Editor/Data/Implementation/NodeUtils.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Implementation/NodeUtils.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Implementation/NodeUtils.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Implementation/NodeUtils.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Implementation/SlotType.cs b/com.unity.shadergraph/Editor/Current/Data/Implementation/SlotType.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Implementation/SlotType.cs
rename to com.unity.shadergraph/Editor/Current/Data/Implementation/SlotType.cs
diff --git a/com.unity.shadergraph/Editor/Data/Implementation/SlotType.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Implementation/SlotType.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Implementation/SlotType.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Implementation/SlotType.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Interfaces.meta b/com.unity.shadergraph/Editor/Current/Data/Interfaces.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Interfaces.meta
rename to com.unity.shadergraph/Editor/Current/Data/Interfaces.meta
diff --git a/com.unity.shadergraph/Editor/Data/Interfaces/GenerationMode.cs b/com.unity.shadergraph/Editor/Current/Data/Interfaces/GenerationMode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Interfaces/GenerationMode.cs
rename to com.unity.shadergraph/Editor/Current/Data/Interfaces/GenerationMode.cs
diff --git a/com.unity.shadergraph/Editor/Data/Interfaces/GenerationMode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Interfaces/GenerationMode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Interfaces/GenerationMode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Interfaces/GenerationMode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Interfaces/Graph.meta b/com.unity.shadergraph/Editor/Current/Data/Interfaces/Graph.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Interfaces/Graph.meta
rename to com.unity.shadergraph/Editor/Current/Data/Interfaces/Graph.meta
diff --git a/com.unity.shadergraph/Editor/Data/Interfaces/Graph/DrawState.cs b/com.unity.shadergraph/Editor/Current/Data/Interfaces/Graph/DrawState.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Interfaces/Graph/DrawState.cs
rename to com.unity.shadergraph/Editor/Current/Data/Interfaces/Graph/DrawState.cs
diff --git a/com.unity.shadergraph/Editor/Data/Interfaces/Graph/DrawState.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Interfaces/Graph/DrawState.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Interfaces/Graph/DrawState.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Interfaces/Graph/DrawState.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Interfaces/Graph/GraphDrawingData.cs b/com.unity.shadergraph/Editor/Current/Data/Interfaces/Graph/GraphDrawingData.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Interfaces/Graph/GraphDrawingData.cs
rename to com.unity.shadergraph/Editor/Current/Data/Interfaces/Graph/GraphDrawingData.cs
diff --git a/com.unity.shadergraph/Editor/Data/Interfaces/Graph/GraphDrawingData.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Interfaces/Graph/GraphDrawingData.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Interfaces/Graph/GraphDrawingData.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Interfaces/Graph/GraphDrawingData.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Interfaces/Graph/IEdge.cs b/com.unity.shadergraph/Editor/Current/Data/Interfaces/Graph/IEdge.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Interfaces/Graph/IEdge.cs
rename to com.unity.shadergraph/Editor/Current/Data/Interfaces/Graph/IEdge.cs
diff --git a/com.unity.shadergraph/Editor/Data/Interfaces/Graph/IEdge.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Interfaces/Graph/IEdge.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Interfaces/Graph/IEdge.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Interfaces/Graph/IEdge.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Interfaces/Graph/INode.cs b/com.unity.shadergraph/Editor/Current/Data/Interfaces/Graph/INode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Interfaces/Graph/INode.cs
rename to com.unity.shadergraph/Editor/Current/Data/Interfaces/Graph/INode.cs
diff --git a/com.unity.shadergraph/Editor/Data/Interfaces/Graph/INode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Interfaces/Graph/INode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Interfaces/Graph/INode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Interfaces/Graph/INode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Interfaces/Graph/IOnAssetEnabled.cs b/com.unity.shadergraph/Editor/Current/Data/Interfaces/Graph/IOnAssetEnabled.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Interfaces/Graph/IOnAssetEnabled.cs
rename to com.unity.shadergraph/Editor/Current/Data/Interfaces/Graph/IOnAssetEnabled.cs
diff --git a/com.unity.shadergraph/Editor/Data/Interfaces/Graph/IOnAssetEnabled.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Interfaces/Graph/IOnAssetEnabled.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Interfaces/Graph/IOnAssetEnabled.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Interfaces/Graph/IOnAssetEnabled.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Interfaces/Graph/SlotReference.cs b/com.unity.shadergraph/Editor/Current/Data/Interfaces/Graph/SlotReference.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Interfaces/Graph/SlotReference.cs
rename to com.unity.shadergraph/Editor/Current/Data/Interfaces/Graph/SlotReference.cs
diff --git a/com.unity.shadergraph/Editor/Data/Interfaces/Graph/SlotReference.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Interfaces/Graph/SlotReference.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Interfaces/Graph/SlotReference.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Interfaces/Graph/SlotReference.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Interfaces/ICanChangeShaderGUI.cs b/com.unity.shadergraph/Editor/Current/Data/Interfaces/ICanChangeShaderGUI.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Interfaces/ICanChangeShaderGUI.cs
rename to com.unity.shadergraph/Editor/Current/Data/Interfaces/ICanChangeShaderGUI.cs
diff --git a/com.unity.shadergraph/Editor/Data/Interfaces/ICanChangeShaderGUI.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Interfaces/ICanChangeShaderGUI.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Interfaces/ICanChangeShaderGUI.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Interfaces/ICanChangeShaderGUI.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Interfaces/IGeneratesBodyCode.cs b/com.unity.shadergraph/Editor/Current/Data/Interfaces/IGeneratesBodyCode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Interfaces/IGeneratesBodyCode.cs
rename to com.unity.shadergraph/Editor/Current/Data/Interfaces/IGeneratesBodyCode.cs
diff --git a/com.unity.shadergraph/Editor/Data/Interfaces/IGeneratesBodyCode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Interfaces/IGeneratesBodyCode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Interfaces/IGeneratesBodyCode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Interfaces/IGeneratesBodyCode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Interfaces/IGeneratesFunction.cs b/com.unity.shadergraph/Editor/Current/Data/Interfaces/IGeneratesFunction.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Interfaces/IGeneratesFunction.cs
rename to com.unity.shadergraph/Editor/Current/Data/Interfaces/IGeneratesFunction.cs
diff --git a/com.unity.shadergraph/Editor/Data/Interfaces/IGeneratesFunction.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Interfaces/IGeneratesFunction.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Interfaces/IGeneratesFunction.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Interfaces/IGeneratesFunction.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Interfaces/IGraphDataAction.cs b/com.unity.shadergraph/Editor/Current/Data/Interfaces/IGraphDataAction.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Interfaces/IGraphDataAction.cs
rename to com.unity.shadergraph/Editor/Current/Data/Interfaces/IGraphDataAction.cs
diff --git a/com.unity.shadergraph/Editor/Data/Interfaces/IGraphDataAction.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Interfaces/IGraphDataAction.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Interfaces/IGraphDataAction.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Interfaces/IGraphDataAction.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Interfaces/IGroupItem.cs b/com.unity.shadergraph/Editor/Current/Data/Interfaces/IGroupItem.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Interfaces/IGroupItem.cs
rename to com.unity.shadergraph/Editor/Current/Data/Interfaces/IGroupItem.cs
diff --git a/com.unity.shadergraph/Editor/Data/Interfaces/IGroupItem.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Interfaces/IGroupItem.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Interfaces/IGroupItem.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Interfaces/IGroupItem.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Interfaces/IHasCustomDeprecationMessage.cs b/com.unity.shadergraph/Editor/Current/Data/Interfaces/IHasCustomDeprecationMessage.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Interfaces/IHasCustomDeprecationMessage.cs
rename to com.unity.shadergraph/Editor/Current/Data/Interfaces/IHasCustomDeprecationMessage.cs
diff --git a/com.unity.shadergraph/Editor/Data/Interfaces/IHasCustomDeprecationMessage.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Interfaces/IHasCustomDeprecationMessage.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Interfaces/IHasCustomDeprecationMessage.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Interfaces/IHasCustomDeprecationMessage.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Interfaces/IInspectable.cs b/com.unity.shadergraph/Editor/Current/Data/Interfaces/IInspectable.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Interfaces/IInspectable.cs
rename to com.unity.shadergraph/Editor/Current/Data/Interfaces/IInspectable.cs
diff --git a/com.unity.shadergraph/Editor/Data/Interfaces/IInspectable.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Interfaces/IInspectable.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Interfaces/IInspectable.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Interfaces/IInspectable.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Interfaces/IMayRequireBitangent.cs b/com.unity.shadergraph/Editor/Current/Data/Interfaces/IMayRequireBitangent.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Interfaces/IMayRequireBitangent.cs
rename to com.unity.shadergraph/Editor/Current/Data/Interfaces/IMayRequireBitangent.cs
diff --git a/com.unity.shadergraph/Editor/Data/Interfaces/IMayRequireBitangent.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Interfaces/IMayRequireBitangent.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Interfaces/IMayRequireBitangent.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Interfaces/IMayRequireBitangent.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Interfaces/IMayRequireCameraOpaqueTexture.cs b/com.unity.shadergraph/Editor/Current/Data/Interfaces/IMayRequireCameraOpaqueTexture.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Interfaces/IMayRequireCameraOpaqueTexture.cs
rename to com.unity.shadergraph/Editor/Current/Data/Interfaces/IMayRequireCameraOpaqueTexture.cs
diff --git a/com.unity.shadergraph/Editor/Data/Interfaces/IMayRequireCameraOpaqueTexture.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Interfaces/IMayRequireCameraOpaqueTexture.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Interfaces/IMayRequireCameraOpaqueTexture.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Interfaces/IMayRequireCameraOpaqueTexture.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Interfaces/IMayRequireDepthTexture.cs b/com.unity.shadergraph/Editor/Current/Data/Interfaces/IMayRequireDepthTexture.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Interfaces/IMayRequireDepthTexture.cs
rename to com.unity.shadergraph/Editor/Current/Data/Interfaces/IMayRequireDepthTexture.cs
diff --git a/com.unity.shadergraph/Editor/Data/Interfaces/IMayRequireDepthTexture.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Interfaces/IMayRequireDepthTexture.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Interfaces/IMayRequireDepthTexture.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Interfaces/IMayRequireDepthTexture.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Interfaces/IMayRequireFaceSign.cs b/com.unity.shadergraph/Editor/Current/Data/Interfaces/IMayRequireFaceSign.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Interfaces/IMayRequireFaceSign.cs
rename to com.unity.shadergraph/Editor/Current/Data/Interfaces/IMayRequireFaceSign.cs
diff --git a/com.unity.shadergraph/Editor/Data/Interfaces/IMayRequireFaceSign.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Interfaces/IMayRequireFaceSign.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Interfaces/IMayRequireFaceSign.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Interfaces/IMayRequireFaceSign.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Interfaces/IMayRequireMeshUV.cs b/com.unity.shadergraph/Editor/Current/Data/Interfaces/IMayRequireMeshUV.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Interfaces/IMayRequireMeshUV.cs
rename to com.unity.shadergraph/Editor/Current/Data/Interfaces/IMayRequireMeshUV.cs
diff --git a/com.unity.shadergraph/Editor/Data/Interfaces/IMayRequireMeshUV.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Interfaces/IMayRequireMeshUV.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Interfaces/IMayRequireMeshUV.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Interfaces/IMayRequireMeshUV.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Interfaces/IMayRequireNormal.cs b/com.unity.shadergraph/Editor/Current/Data/Interfaces/IMayRequireNormal.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Interfaces/IMayRequireNormal.cs
rename to com.unity.shadergraph/Editor/Current/Data/Interfaces/IMayRequireNormal.cs
diff --git a/com.unity.shadergraph/Editor/Data/Interfaces/IMayRequireNormal.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Interfaces/IMayRequireNormal.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Interfaces/IMayRequireNormal.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Interfaces/IMayRequireNormal.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Interfaces/IMayRequirePosition.cs b/com.unity.shadergraph/Editor/Current/Data/Interfaces/IMayRequirePosition.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Interfaces/IMayRequirePosition.cs
rename to com.unity.shadergraph/Editor/Current/Data/Interfaces/IMayRequirePosition.cs
diff --git a/com.unity.shadergraph/Editor/Data/Interfaces/IMayRequirePosition.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Interfaces/IMayRequirePosition.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Interfaces/IMayRequirePosition.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Interfaces/IMayRequirePosition.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Interfaces/IMayRequirePositionPredisplacement.cs b/com.unity.shadergraph/Editor/Current/Data/Interfaces/IMayRequirePositionPredisplacement.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Interfaces/IMayRequirePositionPredisplacement.cs
rename to com.unity.shadergraph/Editor/Current/Data/Interfaces/IMayRequirePositionPredisplacement.cs
diff --git a/com.unity.shadergraph/Editor/Data/Interfaces/IMayRequirePositionPredisplacement.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Interfaces/IMayRequirePositionPredisplacement.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Interfaces/IMayRequirePositionPredisplacement.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Interfaces/IMayRequirePositionPredisplacement.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Interfaces/IMayRequireScreenPosition.cs b/com.unity.shadergraph/Editor/Current/Data/Interfaces/IMayRequireScreenPosition.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Interfaces/IMayRequireScreenPosition.cs
rename to com.unity.shadergraph/Editor/Current/Data/Interfaces/IMayRequireScreenPosition.cs
diff --git a/com.unity.shadergraph/Editor/Data/Interfaces/IMayRequireScreenPosition.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Interfaces/IMayRequireScreenPosition.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Interfaces/IMayRequireScreenPosition.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Interfaces/IMayRequireScreenPosition.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Interfaces/IMayRequireTangent.cs b/com.unity.shadergraph/Editor/Current/Data/Interfaces/IMayRequireTangent.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Interfaces/IMayRequireTangent.cs
rename to com.unity.shadergraph/Editor/Current/Data/Interfaces/IMayRequireTangent.cs
diff --git a/com.unity.shadergraph/Editor/Data/Interfaces/IMayRequireTangent.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Interfaces/IMayRequireTangent.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Interfaces/IMayRequireTangent.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Interfaces/IMayRequireTangent.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Interfaces/IMayRequireTime.cs b/com.unity.shadergraph/Editor/Current/Data/Interfaces/IMayRequireTime.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Interfaces/IMayRequireTime.cs
rename to com.unity.shadergraph/Editor/Current/Data/Interfaces/IMayRequireTime.cs
diff --git a/com.unity.shadergraph/Editor/Data/Interfaces/IMayRequireTime.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Interfaces/IMayRequireTime.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Interfaces/IMayRequireTime.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Interfaces/IMayRequireTime.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Interfaces/IMayRequireTransform.cs b/com.unity.shadergraph/Editor/Current/Data/Interfaces/IMayRequireTransform.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Interfaces/IMayRequireTransform.cs
rename to com.unity.shadergraph/Editor/Current/Data/Interfaces/IMayRequireTransform.cs
diff --git a/com.unity.shadergraph/Editor/Data/Interfaces/IMayRequireTransform.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Interfaces/IMayRequireTransform.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Interfaces/IMayRequireTransform.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Interfaces/IMayRequireTransform.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Interfaces/IMayRequireVertexColor.cs b/com.unity.shadergraph/Editor/Current/Data/Interfaces/IMayRequireVertexColor.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Interfaces/IMayRequireVertexColor.cs
rename to com.unity.shadergraph/Editor/Current/Data/Interfaces/IMayRequireVertexColor.cs
diff --git a/com.unity.shadergraph/Editor/Data/Interfaces/IMayRequireVertexColor.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Interfaces/IMayRequireVertexColor.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Interfaces/IMayRequireVertexColor.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Interfaces/IMayRequireVertexColor.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Interfaces/IMayRequireVertexID.cs b/com.unity.shadergraph/Editor/Current/Data/Interfaces/IMayRequireVertexID.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Interfaces/IMayRequireVertexID.cs
rename to com.unity.shadergraph/Editor/Current/Data/Interfaces/IMayRequireVertexID.cs
diff --git a/com.unity.shadergraph/Editor/Data/Interfaces/IMayRequireVertexID.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Interfaces/IMayRequireVertexID.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Interfaces/IMayRequireVertexID.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Interfaces/IMayRequireVertexID.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Interfaces/IMayRequireVertexSkinning.cs b/com.unity.shadergraph/Editor/Current/Data/Interfaces/IMayRequireVertexSkinning.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Interfaces/IMayRequireVertexSkinning.cs
rename to com.unity.shadergraph/Editor/Current/Data/Interfaces/IMayRequireVertexSkinning.cs
diff --git a/com.unity.shadergraph/Editor/Data/Interfaces/IMayRequireVertexSkinning.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Interfaces/IMayRequireVertexSkinning.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Interfaces/IMayRequireVertexSkinning.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Interfaces/IMayRequireVertexSkinning.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Interfaces/IMayRequireViewDirection.cs b/com.unity.shadergraph/Editor/Current/Data/Interfaces/IMayRequireViewDirection.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Interfaces/IMayRequireViewDirection.cs
rename to com.unity.shadergraph/Editor/Current/Data/Interfaces/IMayRequireViewDirection.cs
diff --git a/com.unity.shadergraph/Editor/Data/Interfaces/IMayRequireViewDirection.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Interfaces/IMayRequireViewDirection.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Interfaces/IMayRequireViewDirection.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Interfaces/IMayRequireViewDirection.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Interfaces/IMaySupportVFX.cs b/com.unity.shadergraph/Editor/Current/Data/Interfaces/IMaySupportVFX.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Interfaces/IMaySupportVFX.cs
rename to com.unity.shadergraph/Editor/Current/Data/Interfaces/IMaySupportVFX.cs
diff --git a/com.unity.shadergraph/Editor/Data/Interfaces/IMaySupportVFX.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Interfaces/IMaySupportVFX.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Interfaces/IMaySupportVFX.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Interfaces/IMaySupportVFX.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Interfaces/IPropertyDrawer.cs b/com.unity.shadergraph/Editor/Current/Data/Interfaces/IPropertyDrawer.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Interfaces/IPropertyDrawer.cs
rename to com.unity.shadergraph/Editor/Current/Data/Interfaces/IPropertyDrawer.cs
diff --git a/com.unity.shadergraph/Editor/Data/Interfaces/IPropertyDrawer.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Interfaces/IPropertyDrawer.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Interfaces/IPropertyDrawer.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Interfaces/IPropertyDrawer.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Interfaces/NeededCoordinateSpace.cs b/com.unity.shadergraph/Editor/Current/Data/Interfaces/NeededCoordinateSpace.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Interfaces/NeededCoordinateSpace.cs
rename to com.unity.shadergraph/Editor/Current/Data/Interfaces/NeededCoordinateSpace.cs
diff --git a/com.unity.shadergraph/Editor/Data/Interfaces/NeededCoordinateSpace.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Interfaces/NeededCoordinateSpace.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Interfaces/NeededCoordinateSpace.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Interfaces/NeededCoordinateSpace.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Interfaces/PositionSource.cs b/com.unity.shadergraph/Editor/Current/Data/Interfaces/PositionSource.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Interfaces/PositionSource.cs
rename to com.unity.shadergraph/Editor/Current/Data/Interfaces/PositionSource.cs
diff --git a/com.unity.shadergraph/Editor/Data/Interfaces/PositionSource.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Interfaces/PositionSource.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Interfaces/PositionSource.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Interfaces/PositionSource.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Legacy.meta b/com.unity.shadergraph/Editor/Current/Data/Legacy.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Legacy.meta
rename to com.unity.shadergraph/Editor/Current/Data/Legacy.meta
diff --git a/com.unity.shadergraph/Editor/Data/Legacy/AbstractMaterialNode0.cs b/com.unity.shadergraph/Editor/Current/Data/Legacy/AbstractMaterialNode0.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Legacy/AbstractMaterialNode0.cs
rename to com.unity.shadergraph/Editor/Current/Data/Legacy/AbstractMaterialNode0.cs
diff --git a/com.unity.shadergraph/Editor/Data/Legacy/AbstractMaterialNode0.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Legacy/AbstractMaterialNode0.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Legacy/AbstractMaterialNode0.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Legacy/AbstractMaterialNode0.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Legacy/Edge0.cs b/com.unity.shadergraph/Editor/Current/Data/Legacy/Edge0.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Legacy/Edge0.cs
rename to com.unity.shadergraph/Editor/Current/Data/Legacy/Edge0.cs
diff --git a/com.unity.shadergraph/Editor/Data/Legacy/Edge0.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Legacy/Edge0.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Legacy/Edge0.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Legacy/Edge0.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Legacy/GraphData0.cs b/com.unity.shadergraph/Editor/Current/Data/Legacy/GraphData0.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Legacy/GraphData0.cs
rename to com.unity.shadergraph/Editor/Current/Data/Legacy/GraphData0.cs
diff --git a/com.unity.shadergraph/Editor/Data/Legacy/GraphData0.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Legacy/GraphData0.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Legacy/GraphData0.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Legacy/GraphData0.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Legacy/GroupData0.cs b/com.unity.shadergraph/Editor/Current/Data/Legacy/GroupData0.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Legacy/GroupData0.cs
rename to com.unity.shadergraph/Editor/Current/Data/Legacy/GroupData0.cs
diff --git a/com.unity.shadergraph/Editor/Data/Legacy/GroupData0.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Legacy/GroupData0.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Legacy/GroupData0.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Legacy/GroupData0.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Legacy/ILegacyTarget.cs b/com.unity.shadergraph/Editor/Current/Data/Legacy/ILegacyTarget.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Legacy/ILegacyTarget.cs
rename to com.unity.shadergraph/Editor/Current/Data/Legacy/ILegacyTarget.cs
diff --git a/com.unity.shadergraph/Editor/Data/Legacy/ILegacyTarget.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Legacy/ILegacyTarget.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Legacy/ILegacyTarget.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Legacy/ILegacyTarget.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Legacy/IMasterNode1.cs b/com.unity.shadergraph/Editor/Current/Data/Legacy/IMasterNode1.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Legacy/IMasterNode1.cs
rename to com.unity.shadergraph/Editor/Current/Data/Legacy/IMasterNode1.cs
diff --git a/com.unity.shadergraph/Editor/Data/Legacy/IMasterNode1.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Legacy/IMasterNode1.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Legacy/IMasterNode1.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Legacy/IMasterNode1.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Legacy/PBRMasterNode1.cs b/com.unity.shadergraph/Editor/Current/Data/Legacy/PBRMasterNode1.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Legacy/PBRMasterNode1.cs
rename to com.unity.shadergraph/Editor/Current/Data/Legacy/PBRMasterNode1.cs
diff --git a/com.unity.shadergraph/Editor/Data/Legacy/PBRMasterNode1.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Legacy/PBRMasterNode1.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Legacy/PBRMasterNode1.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Legacy/PBRMasterNode1.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Legacy/SerializableGuid.cs b/com.unity.shadergraph/Editor/Current/Data/Legacy/SerializableGuid.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Legacy/SerializableGuid.cs
rename to com.unity.shadergraph/Editor/Current/Data/Legacy/SerializableGuid.cs
diff --git a/com.unity.shadergraph/Editor/Data/Legacy/SerializableGuid.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Legacy/SerializableGuid.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Legacy/SerializableGuid.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Legacy/SerializableGuid.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Legacy/ShaderInput0.cs b/com.unity.shadergraph/Editor/Current/Data/Legacy/ShaderInput0.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Legacy/ShaderInput0.cs
rename to com.unity.shadergraph/Editor/Current/Data/Legacy/ShaderInput0.cs
diff --git a/com.unity.shadergraph/Editor/Data/Legacy/ShaderInput0.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Legacy/ShaderInput0.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Legacy/ShaderInput0.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Legacy/ShaderInput0.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Legacy/SlotReference0.cs b/com.unity.shadergraph/Editor/Current/Data/Legacy/SlotReference0.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Legacy/SlotReference0.cs
rename to com.unity.shadergraph/Editor/Current/Data/Legacy/SlotReference0.cs
diff --git a/com.unity.shadergraph/Editor/Data/Legacy/SlotReference0.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Legacy/SlotReference0.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Legacy/SlotReference0.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Legacy/SlotReference0.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Legacy/SpriteLitMasterNode1.cs b/com.unity.shadergraph/Editor/Current/Data/Legacy/SpriteLitMasterNode1.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Legacy/SpriteLitMasterNode1.cs
rename to com.unity.shadergraph/Editor/Current/Data/Legacy/SpriteLitMasterNode1.cs
diff --git a/com.unity.shadergraph/Editor/Data/Legacy/SpriteLitMasterNode1.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Legacy/SpriteLitMasterNode1.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Legacy/SpriteLitMasterNode1.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Legacy/SpriteLitMasterNode1.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Legacy/SpriteUnlitMasterNode1.cs b/com.unity.shadergraph/Editor/Current/Data/Legacy/SpriteUnlitMasterNode1.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Legacy/SpriteUnlitMasterNode1.cs
rename to com.unity.shadergraph/Editor/Current/Data/Legacy/SpriteUnlitMasterNode1.cs
diff --git a/com.unity.shadergraph/Editor/Data/Legacy/SpriteUnlitMasterNode1.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Legacy/SpriteUnlitMasterNode1.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Legacy/SpriteUnlitMasterNode1.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Legacy/SpriteUnlitMasterNode1.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Legacy/StickyNoteData0.cs b/com.unity.shadergraph/Editor/Current/Data/Legacy/StickyNoteData0.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Legacy/StickyNoteData0.cs
rename to com.unity.shadergraph/Editor/Current/Data/Legacy/StickyNoteData0.cs
diff --git a/com.unity.shadergraph/Editor/Data/Legacy/StickyNoteData0.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Legacy/StickyNoteData0.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Legacy/StickyNoteData0.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Legacy/StickyNoteData0.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Legacy/UnlitMasterNode1.cs b/com.unity.shadergraph/Editor/Current/Data/Legacy/UnlitMasterNode1.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Legacy/UnlitMasterNode1.cs
rename to com.unity.shadergraph/Editor/Current/Data/Legacy/UnlitMasterNode1.cs
diff --git a/com.unity.shadergraph/Editor/Data/Legacy/UnlitMasterNode1.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Legacy/UnlitMasterNode1.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Legacy/UnlitMasterNode1.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Legacy/UnlitMasterNode1.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Legacy/VisualEffectMasterNode1.cs b/com.unity.shadergraph/Editor/Current/Data/Legacy/VisualEffectMasterNode1.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Legacy/VisualEffectMasterNode1.cs
rename to com.unity.shadergraph/Editor/Current/Data/Legacy/VisualEffectMasterNode1.cs
diff --git a/com.unity.shadergraph/Editor/Data/Legacy/VisualEffectMasterNode1.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Legacy/VisualEffectMasterNode1.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Legacy/VisualEffectMasterNode1.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Legacy/VisualEffectMasterNode1.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/AbstractMaterialNode.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/AbstractMaterialNode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/AbstractMaterialNode.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/AbstractMaterialNode.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/AbstractMaterialNode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/AbstractMaterialNode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/AbstractMaterialNode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/AbstractMaterialNode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Artistic.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Artistic.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Artistic.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Artistic.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Artistic/Adjustment.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Artistic/Adjustment.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Artistic/Adjustment.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Artistic/Adjustment.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Artistic/Adjustment/ChannelMixerNode.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/Artistic/Adjustment/ChannelMixerNode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Artistic/Adjustment/ChannelMixerNode.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Artistic/Adjustment/ChannelMixerNode.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Artistic/Adjustment/ChannelMixerNode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Artistic/Adjustment/ChannelMixerNode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Artistic/Adjustment/ChannelMixerNode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Artistic/Adjustment/ChannelMixerNode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Artistic/Adjustment/ContrastNode.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/Artistic/Adjustment/ContrastNode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Artistic/Adjustment/ContrastNode.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Artistic/Adjustment/ContrastNode.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Artistic/Adjustment/ContrastNode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Artistic/Adjustment/ContrastNode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Artistic/Adjustment/ContrastNode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Artistic/Adjustment/ContrastNode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Artistic/Adjustment/HueNode.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/Artistic/Adjustment/HueNode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Artistic/Adjustment/HueNode.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Artistic/Adjustment/HueNode.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Artistic/Adjustment/HueNode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Artistic/Adjustment/HueNode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Artistic/Adjustment/HueNode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Artistic/Adjustment/HueNode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Artistic/Adjustment/InvertColorsNode.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/Artistic/Adjustment/InvertColorsNode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Artistic/Adjustment/InvertColorsNode.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Artistic/Adjustment/InvertColorsNode.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Artistic/Adjustment/InvertColorsNode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Artistic/Adjustment/InvertColorsNode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Artistic/Adjustment/InvertColorsNode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Artistic/Adjustment/InvertColorsNode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Artistic/Adjustment/ReplaceColorNode.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/Artistic/Adjustment/ReplaceColorNode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Artistic/Adjustment/ReplaceColorNode.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Artistic/Adjustment/ReplaceColorNode.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Artistic/Adjustment/ReplaceColorNode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Artistic/Adjustment/ReplaceColorNode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Artistic/Adjustment/ReplaceColorNode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Artistic/Adjustment/ReplaceColorNode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Artistic/Adjustment/SaturationNode.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/Artistic/Adjustment/SaturationNode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Artistic/Adjustment/SaturationNode.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Artistic/Adjustment/SaturationNode.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Artistic/Adjustment/SaturationNode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Artistic/Adjustment/SaturationNode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Artistic/Adjustment/SaturationNode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Artistic/Adjustment/SaturationNode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Artistic/Adjustment/WhiteBalanceNode.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/Artistic/Adjustment/WhiteBalanceNode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Artistic/Adjustment/WhiteBalanceNode.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Artistic/Adjustment/WhiteBalanceNode.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Artistic/Adjustment/WhiteBalanceNode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Artistic/Adjustment/WhiteBalanceNode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Artistic/Adjustment/WhiteBalanceNode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Artistic/Adjustment/WhiteBalanceNode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Artistic/Blend.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Artistic/Blend.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Artistic/Blend.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Artistic/Blend.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Artistic/Blend/BlendMode.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/Artistic/Blend/BlendMode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Artistic/Blend/BlendMode.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Artistic/Blend/BlendMode.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Artistic/Blend/BlendMode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Artistic/Blend/BlendMode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Artistic/Blend/BlendMode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Artistic/Blend/BlendMode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Artistic/Blend/BlendNode.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/Artistic/Blend/BlendNode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Artistic/Blend/BlendNode.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Artistic/Blend/BlendNode.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Artistic/Blend/BlendNode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Artistic/Blend/BlendNode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Artistic/Blend/BlendNode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Artistic/Blend/BlendNode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Artistic/Filter.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Artistic/Filter.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Artistic/Filter.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Artistic/Filter.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Artistic/Filter/DitherNode.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/Artistic/Filter/DitherNode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Artistic/Filter/DitherNode.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Artistic/Filter/DitherNode.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Artistic/Filter/DitherNode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Artistic/Filter/DitherNode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Artistic/Filter/DitherNode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Artistic/Filter/DitherNode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Artistic/Mask.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Artistic/Mask.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Artistic/Mask.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Artistic/Mask.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Artistic/Mask/ChannelMaskNode.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/Artistic/Mask/ChannelMaskNode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Artistic/Mask/ChannelMaskNode.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Artistic/Mask/ChannelMaskNode.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Artistic/Mask/ChannelMaskNode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Artistic/Mask/ChannelMaskNode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Artistic/Mask/ChannelMaskNode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Artistic/Mask/ChannelMaskNode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Artistic/Mask/ColorMaskNode.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/Artistic/Mask/ColorMaskNode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Artistic/Mask/ColorMaskNode.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Artistic/Mask/ColorMaskNode.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Artistic/Mask/ColorMaskNode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Artistic/Mask/ColorMaskNode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Artistic/Mask/ColorMaskNode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Artistic/Mask/ColorMaskNode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Artistic/Normal.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Artistic/Normal.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Artistic/Normal.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Artistic/Normal.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Artistic/Normal/NormalBlendNode.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/Artistic/Normal/NormalBlendNode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Artistic/Normal/NormalBlendNode.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Artistic/Normal/NormalBlendNode.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Artistic/Normal/NormalBlendNode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Artistic/Normal/NormalBlendNode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Artistic/Normal/NormalBlendNode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Artistic/Normal/NormalBlendNode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Artistic/Normal/NormalFromHeightNode.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/Artistic/Normal/NormalFromHeightNode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Artistic/Normal/NormalFromHeightNode.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Artistic/Normal/NormalFromHeightNode.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Artistic/Normal/NormalFromHeightNode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Artistic/Normal/NormalFromHeightNode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Artistic/Normal/NormalFromHeightNode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Artistic/Normal/NormalFromHeightNode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Artistic/Normal/NormalFromTextureNode.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/Artistic/Normal/NormalFromTextureNode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Artistic/Normal/NormalFromTextureNode.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Artistic/Normal/NormalFromTextureNode.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Artistic/Normal/NormalFromTextureNode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Artistic/Normal/NormalFromTextureNode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Artistic/Normal/NormalFromTextureNode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Artistic/Normal/NormalFromTextureNode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Artistic/Normal/NormalReconstructZNode.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/Artistic/Normal/NormalReconstructZNode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Artistic/Normal/NormalReconstructZNode.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Artistic/Normal/NormalReconstructZNode.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Artistic/Normal/NormalReconstructZNode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Artistic/Normal/NormalReconstructZNode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Artistic/Normal/NormalReconstructZNode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Artistic/Normal/NormalReconstructZNode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Artistic/Normal/NormalStrengthNode.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/Artistic/Normal/NormalStrengthNode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Artistic/Normal/NormalStrengthNode.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Artistic/Normal/NormalStrengthNode.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Artistic/Normal/NormalStrengthNode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Artistic/Normal/NormalStrengthNode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Artistic/Normal/NormalStrengthNode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Artistic/Normal/NormalStrengthNode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Artistic/Normal/NormalUnpackNode.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/Artistic/Normal/NormalUnpackNode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Artistic/Normal/NormalUnpackNode.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Artistic/Normal/NormalUnpackNode.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Artistic/Normal/NormalUnpackNode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Artistic/Normal/NormalUnpackNode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Artistic/Normal/NormalUnpackNode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Artistic/Normal/NormalUnpackNode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Artistic/Utility.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Artistic/Utility.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Artistic/Utility.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Artistic/Utility.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Artistic/Utility/ColorspaceConversion.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/Artistic/Utility/ColorspaceConversion.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Artistic/Utility/ColorspaceConversion.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Artistic/Utility/ColorspaceConversion.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Artistic/Utility/ColorspaceConversion.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Artistic/Utility/ColorspaceConversion.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Artistic/Utility/ColorspaceConversion.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Artistic/Utility/ColorspaceConversion.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/BlockNode.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/BlockNode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/BlockNode.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/BlockNode.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/BlockNode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/BlockNode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/BlockNode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/BlockNode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Channel.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Channel.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Channel.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Channel.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Channel/CombineNode.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/Channel/CombineNode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Channel/CombineNode.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Channel/CombineNode.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Channel/CombineNode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Channel/CombineNode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Channel/CombineNode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Channel/CombineNode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Channel/FlipNode.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/Channel/FlipNode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Channel/FlipNode.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Channel/FlipNode.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Channel/FlipNode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Channel/FlipNode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Channel/FlipNode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Channel/FlipNode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Channel/SplitNode.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/Channel/SplitNode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Channel/SplitNode.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Channel/SplitNode.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Channel/SplitNode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Channel/SplitNode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Channel/SplitNode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Channel/SplitNode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Channel/SwizzleNode.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/Channel/SwizzleNode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Channel/SwizzleNode.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Channel/SwizzleNode.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Channel/SwizzleNode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Channel/SwizzleNode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Channel/SwizzleNode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Channel/SwizzleNode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/CodeFunctionNode.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/CodeFunctionNode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/CodeFunctionNode.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/CodeFunctionNode.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/CodeFunctionNode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/CodeFunctionNode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/CodeFunctionNode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/CodeFunctionNode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/FormerNameAttribute.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/FormerNameAttribute.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/FormerNameAttribute.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/FormerNameAttribute.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/FormerNameAttribute.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/FormerNameAttribute.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/FormerNameAttribute.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/FormerNameAttribute.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/FunctionMultiInput.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/FunctionMultiInput.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/FunctionMultiInput.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/FunctionMultiInput.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/FunctionMultiInput.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/FunctionMultiInput.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/FunctionMultiInput.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/FunctionMultiInput.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/GeometryNode.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/GeometryNode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/GeometryNode.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/GeometryNode.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/GeometryNode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/GeometryNode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/GeometryNode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/GeometryNode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/GuidEncoder.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/GuidEncoder.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/GuidEncoder.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/GuidEncoder.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/GuidEncoder.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/GuidEncoder.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/GuidEncoder.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/GuidEncoder.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/IPropertyFromNode.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/IPropertyFromNode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/IPropertyFromNode.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/IPropertyFromNode.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/IPropertyFromNode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/IPropertyFromNode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/IPropertyFromNode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/IPropertyFromNode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Input.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Input.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Input.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Input.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Input/Basic.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Basic.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Input/Basic.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Basic.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Input/Basic/BooleanNode.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Basic/BooleanNode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Input/Basic/BooleanNode.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Basic/BooleanNode.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Input/Basic/BooleanNode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Basic/BooleanNode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Input/Basic/BooleanNode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Basic/BooleanNode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Input/Basic/ColorNode.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Basic/ColorNode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Input/Basic/ColorNode.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Basic/ColorNode.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Input/Basic/ColorNode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Basic/ColorNode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Input/Basic/ColorNode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Basic/ColorNode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Input/Basic/ConstantNode.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Basic/ConstantNode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Input/Basic/ConstantNode.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Basic/ConstantNode.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Input/Basic/ConstantNode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Basic/ConstantNode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Input/Basic/ConstantNode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Basic/ConstantNode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Input/Basic/IntegerNode.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Basic/IntegerNode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Input/Basic/IntegerNode.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Basic/IntegerNode.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Input/Basic/IntegerNode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Basic/IntegerNode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Input/Basic/IntegerNode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Basic/IntegerNode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Input/Basic/SliderNode.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Basic/SliderNode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Input/Basic/SliderNode.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Basic/SliderNode.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Input/Basic/SliderNode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Basic/SliderNode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Input/Basic/SliderNode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Basic/SliderNode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Input/Basic/TimeNode.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Basic/TimeNode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Input/Basic/TimeNode.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Basic/TimeNode.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Input/Basic/TimeNode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Basic/TimeNode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Input/Basic/TimeNode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Basic/TimeNode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Input/Basic/Vector1Node.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Basic/Vector1Node.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Input/Basic/Vector1Node.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Basic/Vector1Node.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Input/Basic/Vector1Node.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Basic/Vector1Node.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Input/Basic/Vector1Node.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Basic/Vector1Node.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Input/Basic/Vector2Node.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Basic/Vector2Node.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Input/Basic/Vector2Node.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Basic/Vector2Node.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Input/Basic/Vector2Node.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Basic/Vector2Node.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Input/Basic/Vector2Node.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Basic/Vector2Node.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Input/Basic/Vector3Node.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Basic/Vector3Node.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Input/Basic/Vector3Node.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Basic/Vector3Node.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Input/Basic/Vector3Node.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Basic/Vector3Node.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Input/Basic/Vector3Node.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Basic/Vector3Node.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Input/Basic/Vector4Node.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Basic/Vector4Node.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Input/Basic/Vector4Node.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Basic/Vector4Node.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Input/Basic/Vector4Node.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Basic/Vector4Node.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Input/Basic/Vector4Node.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Basic/Vector4Node.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Input/CustomInterpolatorNode.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/Input/CustomInterpolatorNode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Input/CustomInterpolatorNode.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Input/CustomInterpolatorNode.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Input/CustomInterpolatorNode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Input/CustomInterpolatorNode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Input/CustomInterpolatorNode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Input/CustomInterpolatorNode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Input/Geometry.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Geometry.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Input/Geometry.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Geometry.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Input/Geometry/BitangentVectorNode.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Geometry/BitangentVectorNode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Input/Geometry/BitangentVectorNode.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Geometry/BitangentVectorNode.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Input/Geometry/BitangentVectorNode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Geometry/BitangentVectorNode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Input/Geometry/BitangentVectorNode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Geometry/BitangentVectorNode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Input/Geometry/InstanceIDNode.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Geometry/InstanceIDNode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Input/Geometry/InstanceIDNode.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Geometry/InstanceIDNode.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Input/Geometry/InstanceIDNode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Geometry/InstanceIDNode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Input/Geometry/InstanceIDNode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Geometry/InstanceIDNode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Input/Geometry/NormalVectorNode.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Geometry/NormalVectorNode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Input/Geometry/NormalVectorNode.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Geometry/NormalVectorNode.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Input/Geometry/NormalVectorNode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Geometry/NormalVectorNode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Input/Geometry/NormalVectorNode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Geometry/NormalVectorNode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Input/Geometry/PositionNode.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Geometry/PositionNode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Input/Geometry/PositionNode.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Geometry/PositionNode.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Input/Geometry/PositionNode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Geometry/PositionNode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Input/Geometry/PositionNode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Geometry/PositionNode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Input/Geometry/ScreenPositionNode.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Geometry/ScreenPositionNode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Input/Geometry/ScreenPositionNode.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Geometry/ScreenPositionNode.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Input/Geometry/ScreenPositionNode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Geometry/ScreenPositionNode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Input/Geometry/ScreenPositionNode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Geometry/ScreenPositionNode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Input/Geometry/TangentVectorNode.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Geometry/TangentVectorNode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Input/Geometry/TangentVectorNode.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Geometry/TangentVectorNode.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Input/Geometry/TangentVectorNode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Geometry/TangentVectorNode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Input/Geometry/TangentVectorNode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Geometry/TangentVectorNode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Input/Geometry/UVNode.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Geometry/UVNode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Input/Geometry/UVNode.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Geometry/UVNode.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Input/Geometry/UVNode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Geometry/UVNode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Input/Geometry/UVNode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Geometry/UVNode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Input/Geometry/VertexColorNode.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Geometry/VertexColorNode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Input/Geometry/VertexColorNode.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Geometry/VertexColorNode.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Input/Geometry/VertexColorNode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Geometry/VertexColorNode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Input/Geometry/VertexColorNode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Geometry/VertexColorNode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Input/Geometry/VertexIDNode.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Geometry/VertexIDNode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Input/Geometry/VertexIDNode.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Geometry/VertexIDNode.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Input/Geometry/VertexIDNode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Geometry/VertexIDNode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Input/Geometry/VertexIDNode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Geometry/VertexIDNode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Input/Geometry/ViewDirectionNode.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Geometry/ViewDirectionNode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Input/Geometry/ViewDirectionNode.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Geometry/ViewDirectionNode.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Input/Geometry/ViewDirectionNode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Geometry/ViewDirectionNode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Input/Geometry/ViewDirectionNode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Geometry/ViewDirectionNode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Input/Geometry/ViewVectorNode.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Geometry/ViewVectorNode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Input/Geometry/ViewVectorNode.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Geometry/ViewVectorNode.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Input/Geometry/ViewVectorNode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Geometry/ViewVectorNode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Input/Geometry/ViewVectorNode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Geometry/ViewVectorNode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Input/Gradient.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Gradient.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Input/Gradient.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Gradient.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Input/Gradient/BlackbodyNode.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Gradient/BlackbodyNode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Input/Gradient/BlackbodyNode.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Gradient/BlackbodyNode.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Input/Gradient/BlackbodyNode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Gradient/BlackbodyNode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Input/Gradient/BlackbodyNode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Gradient/BlackbodyNode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Input/Gradient/GradientNode.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Gradient/GradientNode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Input/Gradient/GradientNode.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Gradient/GradientNode.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Input/Gradient/GradientNode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Gradient/GradientNode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Input/Gradient/GradientNode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Gradient/GradientNode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Input/Gradient/SampleGradientNode.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Gradient/SampleGradientNode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Input/Gradient/SampleGradientNode.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Gradient/SampleGradientNode.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Input/Gradient/SampleGradientNode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Gradient/SampleGradientNode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Input/Gradient/SampleGradientNode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Gradient/SampleGradientNode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Input/Lighting.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Lighting.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Input/Lighting.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Lighting.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Input/Lighting/AmbientNode.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Lighting/AmbientNode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Input/Lighting/AmbientNode.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Lighting/AmbientNode.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Input/Lighting/AmbientNode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Lighting/AmbientNode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Input/Lighting/AmbientNode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Lighting/AmbientNode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Input/Lighting/BakedGINode.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Lighting/BakedGINode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Input/Lighting/BakedGINode.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Lighting/BakedGINode.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Input/Lighting/BakedGINode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Lighting/BakedGINode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Input/Lighting/BakedGINode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Lighting/BakedGINode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Input/Lighting/ReflectionProbeNode.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Lighting/ReflectionProbeNode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Input/Lighting/ReflectionProbeNode.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Lighting/ReflectionProbeNode.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Input/Lighting/ReflectionProbeNode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Lighting/ReflectionProbeNode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Input/Lighting/ReflectionProbeNode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Lighting/ReflectionProbeNode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Input/Matrix.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Matrix.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Input/Matrix.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Matrix.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Input/Matrix/Matrix2Node.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Matrix/Matrix2Node.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Input/Matrix/Matrix2Node.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Matrix/Matrix2Node.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Input/Matrix/Matrix2Node.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Matrix/Matrix2Node.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Input/Matrix/Matrix2Node.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Matrix/Matrix2Node.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Input/Matrix/Matrix3Node.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Matrix/Matrix3Node.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Input/Matrix/Matrix3Node.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Matrix/Matrix3Node.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Input/Matrix/Matrix3Node.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Matrix/Matrix3Node.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Input/Matrix/Matrix3Node.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Matrix/Matrix3Node.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Input/Matrix/Matrix4Node.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Matrix/Matrix4Node.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Input/Matrix/Matrix4Node.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Matrix/Matrix4Node.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Input/Matrix/Matrix4Node.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Matrix/Matrix4Node.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Input/Matrix/Matrix4Node.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Matrix/Matrix4Node.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Input/Matrix/TransformationMatrixNode.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Matrix/TransformationMatrixNode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Input/Matrix/TransformationMatrixNode.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Matrix/TransformationMatrixNode.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Input/Matrix/TransformationMatrixNode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Matrix/TransformationMatrixNode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Input/Matrix/TransformationMatrixNode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Matrix/TransformationMatrixNode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Input/PBR.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Input/PBR.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Input/PBR.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Input/PBR.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Input/PBR/DielectricSpecularNode.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/Input/PBR/DielectricSpecularNode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Input/PBR/DielectricSpecularNode.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Input/PBR/DielectricSpecularNode.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Input/PBR/DielectricSpecularNode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Input/PBR/DielectricSpecularNode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Input/PBR/DielectricSpecularNode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Input/PBR/DielectricSpecularNode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Input/PBR/MetalReflectanceNode.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/Input/PBR/MetalReflectanceNode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Input/PBR/MetalReflectanceNode.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Input/PBR/MetalReflectanceNode.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Input/PBR/MetalReflectanceNode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Input/PBR/MetalReflectanceNode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Input/PBR/MetalReflectanceNode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Input/PBR/MetalReflectanceNode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Input/PropertyNode.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/Input/PropertyNode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Input/PropertyNode.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Input/PropertyNode.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Input/PropertyNode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Input/PropertyNode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Input/PropertyNode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Input/PropertyNode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Input/Scene.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Scene.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Input/Scene.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Scene.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Input/Scene/CameraNode.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Scene/CameraNode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Input/Scene/CameraNode.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Scene/CameraNode.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Input/Scene/CameraNode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Scene/CameraNode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Input/Scene/CameraNode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Scene/CameraNode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Input/Scene/EyeIndexNode.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Scene/EyeIndexNode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Input/Scene/EyeIndexNode.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Scene/EyeIndexNode.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Input/Scene/EyeIndexNode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Scene/EyeIndexNode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Input/Scene/EyeIndexNode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Scene/EyeIndexNode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Input/Scene/FogNode.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Scene/FogNode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Input/Scene/FogNode.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Scene/FogNode.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Input/Scene/FogNode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Scene/FogNode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Input/Scene/FogNode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Scene/FogNode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Input/Scene/ObjectNode.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Scene/ObjectNode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Input/Scene/ObjectNode.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Scene/ObjectNode.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Input/Scene/ObjectNode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Scene/ObjectNode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Input/Scene/ObjectNode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Scene/ObjectNode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Input/Scene/SceneColorNode.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Scene/SceneColorNode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Input/Scene/SceneColorNode.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Scene/SceneColorNode.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Input/Scene/SceneColorNode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Scene/SceneColorNode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Input/Scene/SceneColorNode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Scene/SceneColorNode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Input/Scene/SceneDepthNode.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Scene/SceneDepthNode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Input/Scene/SceneDepthNode.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Scene/SceneDepthNode.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Input/Scene/SceneDepthNode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Scene/SceneDepthNode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Input/Scene/SceneDepthNode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Scene/SceneDepthNode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Input/Scene/ScreenNode.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Scene/ScreenNode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Input/Scene/ScreenNode.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Scene/ScreenNode.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Input/Scene/ScreenNode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Scene/ScreenNode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Input/Scene/ScreenNode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Scene/ScreenNode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Input/Texture.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Texture.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Input/Texture.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Texture.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Input/Texture/CalculateLevelOfDetailTexture2DNode.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Texture/CalculateLevelOfDetailTexture2DNode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Input/Texture/CalculateLevelOfDetailTexture2DNode.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Texture/CalculateLevelOfDetailTexture2DNode.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Input/Texture/CalculateLevelOfDetailTexture2DNode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Texture/CalculateLevelOfDetailTexture2DNode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Input/Texture/CalculateLevelOfDetailTexture2DNode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Texture/CalculateLevelOfDetailTexture2DNode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Input/Texture/CubemapAssetNode.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Texture/CubemapAssetNode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Input/Texture/CubemapAssetNode.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Texture/CubemapAssetNode.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Input/Texture/CubemapAssetNode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Texture/CubemapAssetNode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Input/Texture/CubemapAssetNode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Texture/CubemapAssetNode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Input/Texture/GatherTexture2DNode.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Texture/GatherTexture2DNode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Input/Texture/GatherTexture2DNode.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Texture/GatherTexture2DNode.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Input/Texture/GatherTexture2DNode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Texture/GatherTexture2DNode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Input/Texture/GatherTexture2DNode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Texture/GatherTexture2DNode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Input/Texture/ProceduralVirtualTextureNode.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Texture/ProceduralVirtualTextureNode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Input/Texture/ProceduralVirtualTextureNode.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Texture/ProceduralVirtualTextureNode.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Input/Texture/ProceduralVirtualTextureNode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Texture/ProceduralVirtualTextureNode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Input/Texture/ProceduralVirtualTextureNode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Texture/ProceduralVirtualTextureNode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Input/Texture/SampleCubemapNode.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Texture/SampleCubemapNode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Input/Texture/SampleCubemapNode.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Texture/SampleCubemapNode.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Input/Texture/SampleCubemapNode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Texture/SampleCubemapNode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Input/Texture/SampleCubemapNode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Texture/SampleCubemapNode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Input/Texture/SampleRawCubemapNode.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Texture/SampleRawCubemapNode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Input/Texture/SampleRawCubemapNode.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Texture/SampleRawCubemapNode.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Input/Texture/SampleRawCubemapNode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Texture/SampleRawCubemapNode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Input/Texture/SampleRawCubemapNode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Texture/SampleRawCubemapNode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Input/Texture/SampleTexture2DArrayNode.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Texture/SampleTexture2DArrayNode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Input/Texture/SampleTexture2DArrayNode.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Texture/SampleTexture2DArrayNode.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Input/Texture/SampleTexture2DArrayNode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Texture/SampleTexture2DArrayNode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Input/Texture/SampleTexture2DArrayNode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Texture/SampleTexture2DArrayNode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Input/Texture/SampleTexture2DLODNode.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Texture/SampleTexture2DLODNode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Input/Texture/SampleTexture2DLODNode.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Texture/SampleTexture2DLODNode.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Input/Texture/SampleTexture2DLODNode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Texture/SampleTexture2DLODNode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Input/Texture/SampleTexture2DLODNode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Texture/SampleTexture2DLODNode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Input/Texture/SampleTexture2DNode.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Texture/SampleTexture2DNode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Input/Texture/SampleTexture2DNode.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Texture/SampleTexture2DNode.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Input/Texture/SampleTexture2DNode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Texture/SampleTexture2DNode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Input/Texture/SampleTexture2DNode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Texture/SampleTexture2DNode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Input/Texture/SampleTexture3DNode.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Texture/SampleTexture3DNode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Input/Texture/SampleTexture3DNode.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Texture/SampleTexture3DNode.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Input/Texture/SampleTexture3DNode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Texture/SampleTexture3DNode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Input/Texture/SampleTexture3DNode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Texture/SampleTexture3DNode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Input/Texture/SampleVirtualTextureNode.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Texture/SampleVirtualTextureNode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Input/Texture/SampleVirtualTextureNode.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Texture/SampleVirtualTextureNode.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Input/Texture/SampleVirtualTextureNode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Texture/SampleVirtualTextureNode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Input/Texture/SampleVirtualTextureNode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Texture/SampleVirtualTextureNode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Input/Texture/SamplerStateNode.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Texture/SamplerStateNode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Input/Texture/SamplerStateNode.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Texture/SamplerStateNode.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Input/Texture/SamplerStateNode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Texture/SamplerStateNode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Input/Texture/SamplerStateNode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Texture/SamplerStateNode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Input/Texture/TexelSizeNode.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Texture/TexelSizeNode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Input/Texture/TexelSizeNode.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Texture/TexelSizeNode.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Input/Texture/TexelSizeNode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Texture/TexelSizeNode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Input/Texture/TexelSizeNode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Texture/TexelSizeNode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Input/Texture/Texture2DArrayAssetNode.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Texture/Texture2DArrayAssetNode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Input/Texture/Texture2DArrayAssetNode.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Texture/Texture2DArrayAssetNode.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Input/Texture/Texture2DArrayAssetNode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Texture/Texture2DArrayAssetNode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Input/Texture/Texture2DArrayAssetNode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Texture/Texture2DArrayAssetNode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Input/Texture/Texture2DAssetNode.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Texture/Texture2DAssetNode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Input/Texture/Texture2DAssetNode.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Texture/Texture2DAssetNode.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Input/Texture/Texture2DAssetNode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Texture/Texture2DAssetNode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Input/Texture/Texture2DAssetNode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Texture/Texture2DAssetNode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Input/Texture/Texture3DAssetNode.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Texture/Texture3DAssetNode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Input/Texture/Texture3DAssetNode.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Texture/Texture3DAssetNode.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Input/Texture/Texture3DAssetNode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Texture/Texture3DAssetNode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Input/Texture/Texture3DAssetNode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Texture/Texture3DAssetNode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Input/Texture/TextureStackNode.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Texture/TextureStackNode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Input/Texture/TextureStackNode.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Texture/TextureStackNode.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Input/Texture/TextureStackNode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Texture/TextureStackNode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Input/Texture/TextureStackNode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Input/Texture/TextureStackNode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/LegacyUnknownTypeNode.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/LegacyUnknownTypeNode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/LegacyUnknownTypeNode.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/LegacyUnknownTypeNode.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/LegacyUnknownTypeNode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/LegacyUnknownTypeNode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/LegacyUnknownTypeNode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/LegacyUnknownTypeNode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Math.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Math.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Math.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Math.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Math/Advanced.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Advanced.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Math/Advanced.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Advanced.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Math/Advanced/AbsoluteNode.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Advanced/AbsoluteNode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Math/Advanced/AbsoluteNode.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Advanced/AbsoluteNode.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Math/Advanced/AbsoluteNode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Advanced/AbsoluteNode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Math/Advanced/AbsoluteNode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Advanced/AbsoluteNode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Math/Advanced/ExponentialNode.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Advanced/ExponentialNode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Math/Advanced/ExponentialNode.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Advanced/ExponentialNode.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Math/Advanced/ExponentialNode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Advanced/ExponentialNode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Math/Advanced/ExponentialNode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Advanced/ExponentialNode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Math/Advanced/LengthNode.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Advanced/LengthNode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Math/Advanced/LengthNode.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Advanced/LengthNode.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Math/Advanced/LengthNode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Advanced/LengthNode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Math/Advanced/LengthNode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Advanced/LengthNode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Math/Advanced/LogNode.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Advanced/LogNode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Math/Advanced/LogNode.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Advanced/LogNode.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Math/Advanced/LogNode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Advanced/LogNode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Math/Advanced/LogNode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Advanced/LogNode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Math/Advanced/ModuloNode.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Advanced/ModuloNode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Math/Advanced/ModuloNode.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Advanced/ModuloNode.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Math/Advanced/ModuloNode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Advanced/ModuloNode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Math/Advanced/ModuloNode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Advanced/ModuloNode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Math/Advanced/NegateNode.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Advanced/NegateNode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Math/Advanced/NegateNode.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Advanced/NegateNode.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Math/Advanced/NegateNode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Advanced/NegateNode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Math/Advanced/NegateNode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Advanced/NegateNode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Math/Advanced/NormalizeNode.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Advanced/NormalizeNode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Math/Advanced/NormalizeNode.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Advanced/NormalizeNode.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Math/Advanced/NormalizeNode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Advanced/NormalizeNode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Math/Advanced/NormalizeNode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Advanced/NormalizeNode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Math/Advanced/PosterizeNode.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Advanced/PosterizeNode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Math/Advanced/PosterizeNode.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Advanced/PosterizeNode.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Math/Advanced/PosterizeNode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Advanced/PosterizeNode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Math/Advanced/PosterizeNode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Advanced/PosterizeNode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Math/Advanced/ReciprocalNode.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Advanced/ReciprocalNode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Math/Advanced/ReciprocalNode.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Advanced/ReciprocalNode.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Math/Advanced/ReciprocalNode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Advanced/ReciprocalNode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Math/Advanced/ReciprocalNode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Advanced/ReciprocalNode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Math/Advanced/ReciprocalSquareRootNode.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Advanced/ReciprocalSquareRootNode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Math/Advanced/ReciprocalSquareRootNode.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Advanced/ReciprocalSquareRootNode.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Math/Advanced/ReciprocalSquareRootNode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Advanced/ReciprocalSquareRootNode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Math/Advanced/ReciprocalSquareRootNode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Advanced/ReciprocalSquareRootNode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Math/Basic.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Basic.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Math/Basic.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Basic.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Math/Basic/AddNode.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Basic/AddNode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Math/Basic/AddNode.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Basic/AddNode.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Math/Basic/AddNode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Basic/AddNode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Math/Basic/AddNode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Basic/AddNode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Math/Basic/DivideNode.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Basic/DivideNode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Math/Basic/DivideNode.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Basic/DivideNode.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Math/Basic/DivideNode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Basic/DivideNode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Math/Basic/DivideNode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Basic/DivideNode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Math/Basic/MultiplyNode.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Basic/MultiplyNode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Math/Basic/MultiplyNode.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Basic/MultiplyNode.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Math/Basic/MultiplyNode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Basic/MultiplyNode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Math/Basic/MultiplyNode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Basic/MultiplyNode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Math/Basic/PowerNode.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Basic/PowerNode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Math/Basic/PowerNode.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Basic/PowerNode.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Math/Basic/PowerNode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Basic/PowerNode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Math/Basic/PowerNode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Basic/PowerNode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Math/Basic/SquareRootNode.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Basic/SquareRootNode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Math/Basic/SquareRootNode.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Basic/SquareRootNode.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Math/Basic/SquareRootNode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Basic/SquareRootNode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Math/Basic/SquareRootNode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Basic/SquareRootNode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Math/Basic/SubtractNode.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Basic/SubtractNode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Math/Basic/SubtractNode.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Basic/SubtractNode.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Math/Basic/SubtractNode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Basic/SubtractNode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Math/Basic/SubtractNode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Basic/SubtractNode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Math/Derivative.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Derivative.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Math/Derivative.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Derivative.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Math/Derivative/DDXNode.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Derivative/DDXNode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Math/Derivative/DDXNode.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Derivative/DDXNode.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Math/Derivative/DDXNode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Derivative/DDXNode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Math/Derivative/DDXNode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Derivative/DDXNode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Math/Derivative/DDXYNode.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Derivative/DDXYNode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Math/Derivative/DDXYNode.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Derivative/DDXYNode.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Math/Derivative/DDXYNode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Derivative/DDXYNode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Math/Derivative/DDXYNode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Derivative/DDXYNode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Math/Derivative/DDYNode.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Derivative/DDYNode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Math/Derivative/DDYNode.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Derivative/DDYNode.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Math/Derivative/DDYNode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Derivative/DDYNode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Math/Derivative/DDYNode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Derivative/DDYNode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Math/Interpolation.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Interpolation.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Math/Interpolation.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Interpolation.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Math/Interpolation/InverseLerpNode.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Interpolation/InverseLerpNode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Math/Interpolation/InverseLerpNode.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Interpolation/InverseLerpNode.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Math/Interpolation/InverseLerpNode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Interpolation/InverseLerpNode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Math/Interpolation/InverseLerpNode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Interpolation/InverseLerpNode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Math/Interpolation/LerpNode.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Interpolation/LerpNode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Math/Interpolation/LerpNode.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Interpolation/LerpNode.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Math/Interpolation/LerpNode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Interpolation/LerpNode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Math/Interpolation/LerpNode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Interpolation/LerpNode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Math/Interpolation/SmoothstepNode.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Interpolation/SmoothstepNode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Math/Interpolation/SmoothstepNode.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Interpolation/SmoothstepNode.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Math/Interpolation/SmoothstepNode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Interpolation/SmoothstepNode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Math/Interpolation/SmoothstepNode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Interpolation/SmoothstepNode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Math/Matrix.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Matrix.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Math/Matrix.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Matrix.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Math/Matrix/MatrixConstructionNode.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Matrix/MatrixConstructionNode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Math/Matrix/MatrixConstructionNode.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Matrix/MatrixConstructionNode.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Math/Matrix/MatrixConstructionNode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Matrix/MatrixConstructionNode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Math/Matrix/MatrixConstructionNode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Matrix/MatrixConstructionNode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Math/Matrix/MatrixDeterminantNode.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Matrix/MatrixDeterminantNode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Math/Matrix/MatrixDeterminantNode.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Matrix/MatrixDeterminantNode.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Math/Matrix/MatrixDeterminantNode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Matrix/MatrixDeterminantNode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Math/Matrix/MatrixDeterminantNode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Matrix/MatrixDeterminantNode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Math/Matrix/MatrixSplitNode.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Matrix/MatrixSplitNode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Math/Matrix/MatrixSplitNode.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Matrix/MatrixSplitNode.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Math/Matrix/MatrixSplitNode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Matrix/MatrixSplitNode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Math/Matrix/MatrixSplitNode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Matrix/MatrixSplitNode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Math/Matrix/MatrixTransposeNode.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Matrix/MatrixTransposeNode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Math/Matrix/MatrixTransposeNode.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Matrix/MatrixTransposeNode.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Math/Matrix/MatrixTransposeNode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Matrix/MatrixTransposeNode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Math/Matrix/MatrixTransposeNode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Matrix/MatrixTransposeNode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Math/Range.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Range.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Math/Range.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Range.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Math/Range/ClampNode.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Range/ClampNode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Math/Range/ClampNode.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Range/ClampNode.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Math/Range/ClampNode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Range/ClampNode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Math/Range/ClampNode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Range/ClampNode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Math/Range/FractionNode.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Range/FractionNode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Math/Range/FractionNode.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Range/FractionNode.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Math/Range/FractionNode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Range/FractionNode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Math/Range/FractionNode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Range/FractionNode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Math/Range/MaximumNode.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Range/MaximumNode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Math/Range/MaximumNode.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Range/MaximumNode.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Math/Range/MaximumNode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Range/MaximumNode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Math/Range/MaximumNode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Range/MaximumNode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Math/Range/MinimumNode.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Range/MinimumNode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Math/Range/MinimumNode.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Range/MinimumNode.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Math/Range/MinimumNode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Range/MinimumNode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Math/Range/MinimumNode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Range/MinimumNode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Math/Range/OneMinusNode.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Range/OneMinusNode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Math/Range/OneMinusNode.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Range/OneMinusNode.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Math/Range/OneMinusNode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Range/OneMinusNode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Math/Range/OneMinusNode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Range/OneMinusNode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Math/Range/RandomRangeNode.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Range/RandomRangeNode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Math/Range/RandomRangeNode.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Range/RandomRangeNode.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Math/Range/RandomRangeNode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Range/RandomRangeNode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Math/Range/RandomRangeNode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Range/RandomRangeNode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Math/Range/RemapNode.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Range/RemapNode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Math/Range/RemapNode.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Range/RemapNode.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Math/Range/RemapNode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Range/RemapNode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Math/Range/RemapNode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Range/RemapNode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Math/Range/SaturateNode.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Range/SaturateNode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Math/Range/SaturateNode.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Range/SaturateNode.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Math/Range/SaturateNode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Range/SaturateNode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Math/Range/SaturateNode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Range/SaturateNode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Math/Round.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Round.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Math/Round.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Round.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Math/Round/CeilingNode.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Round/CeilingNode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Math/Round/CeilingNode.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Round/CeilingNode.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Math/Round/CeilingNode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Round/CeilingNode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Math/Round/CeilingNode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Round/CeilingNode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Math/Round/FloorNode.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Round/FloorNode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Math/Round/FloorNode.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Round/FloorNode.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Math/Round/FloorNode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Round/FloorNode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Math/Round/FloorNode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Round/FloorNode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Math/Round/RoundNode.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Round/RoundNode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Math/Round/RoundNode.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Round/RoundNode.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Math/Round/RoundNode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Round/RoundNode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Math/Round/RoundNode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Round/RoundNode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Math/Round/SignNode.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Round/SignNode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Math/Round/SignNode.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Round/SignNode.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Math/Round/SignNode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Round/SignNode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Math/Round/SignNode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Round/SignNode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Math/Round/StepNode.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Round/StepNode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Math/Round/StepNode.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Round/StepNode.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Math/Round/StepNode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Round/StepNode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Math/Round/StepNode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Round/StepNode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Math/Round/TruncateNode.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Round/TruncateNode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Math/Round/TruncateNode.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Round/TruncateNode.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Math/Round/TruncateNode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Round/TruncateNode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Math/Round/TruncateNode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Round/TruncateNode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Math/Trigonometry.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Trigonometry.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Math/Trigonometry.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Trigonometry.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Math/Trigonometry/ArccosineNode.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Trigonometry/ArccosineNode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Math/Trigonometry/ArccosineNode.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Trigonometry/ArccosineNode.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Math/Trigonometry/ArccosineNode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Trigonometry/ArccosineNode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Math/Trigonometry/ArccosineNode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Trigonometry/ArccosineNode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Math/Trigonometry/ArcsineNode.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Trigonometry/ArcsineNode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Math/Trigonometry/ArcsineNode.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Trigonometry/ArcsineNode.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Math/Trigonometry/ArcsineNode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Trigonometry/ArcsineNode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Math/Trigonometry/ArcsineNode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Trigonometry/ArcsineNode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Math/Trigonometry/Arctangent2Node.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Trigonometry/Arctangent2Node.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Math/Trigonometry/Arctangent2Node.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Trigonometry/Arctangent2Node.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Math/Trigonometry/Arctangent2Node.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Trigonometry/Arctangent2Node.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Math/Trigonometry/Arctangent2Node.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Trigonometry/Arctangent2Node.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Math/Trigonometry/ArctangentNode.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Trigonometry/ArctangentNode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Math/Trigonometry/ArctangentNode.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Trigonometry/ArctangentNode.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Math/Trigonometry/ArctangentNode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Trigonometry/ArctangentNode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Math/Trigonometry/ArctangentNode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Trigonometry/ArctangentNode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Math/Trigonometry/CosineNode.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Trigonometry/CosineNode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Math/Trigonometry/CosineNode.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Trigonometry/CosineNode.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Math/Trigonometry/CosineNode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Trigonometry/CosineNode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Math/Trigonometry/CosineNode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Trigonometry/CosineNode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Math/Trigonometry/DegreesToRadiansNode.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Trigonometry/DegreesToRadiansNode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Math/Trigonometry/DegreesToRadiansNode.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Trigonometry/DegreesToRadiansNode.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Math/Trigonometry/DegreesToRadiansNode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Trigonometry/DegreesToRadiansNode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Math/Trigonometry/DegreesToRadiansNode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Trigonometry/DegreesToRadiansNode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Math/Trigonometry/HyperbolicCosineNode.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Trigonometry/HyperbolicCosineNode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Math/Trigonometry/HyperbolicCosineNode.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Trigonometry/HyperbolicCosineNode.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Math/Trigonometry/HyperbolicCosineNode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Trigonometry/HyperbolicCosineNode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Math/Trigonometry/HyperbolicCosineNode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Trigonometry/HyperbolicCosineNode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Math/Trigonometry/HyperbolicSineNode.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Trigonometry/HyperbolicSineNode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Math/Trigonometry/HyperbolicSineNode.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Trigonometry/HyperbolicSineNode.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Math/Trigonometry/HyperbolicSineNode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Trigonometry/HyperbolicSineNode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Math/Trigonometry/HyperbolicSineNode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Trigonometry/HyperbolicSineNode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Math/Trigonometry/HyperbolicTangentNode.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Trigonometry/HyperbolicTangentNode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Math/Trigonometry/HyperbolicTangentNode.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Trigonometry/HyperbolicTangentNode.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Math/Trigonometry/HyperbolicTangentNode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Trigonometry/HyperbolicTangentNode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Math/Trigonometry/HyperbolicTangentNode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Trigonometry/HyperbolicTangentNode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Math/Trigonometry/RadiansToDegreesNode.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Trigonometry/RadiansToDegreesNode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Math/Trigonometry/RadiansToDegreesNode.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Trigonometry/RadiansToDegreesNode.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Math/Trigonometry/RadiansToDegreesNode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Trigonometry/RadiansToDegreesNode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Math/Trigonometry/RadiansToDegreesNode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Trigonometry/RadiansToDegreesNode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Math/Trigonometry/SineNode.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Trigonometry/SineNode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Math/Trigonometry/SineNode.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Trigonometry/SineNode.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Math/Trigonometry/SineNode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Trigonometry/SineNode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Math/Trigonometry/SineNode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Trigonometry/SineNode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Math/Trigonometry/TangentNode.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Trigonometry/TangentNode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Math/Trigonometry/TangentNode.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Trigonometry/TangentNode.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Math/Trigonometry/TangentNode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Trigonometry/TangentNode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Math/Trigonometry/TangentNode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Trigonometry/TangentNode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Math/Vector.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Vector.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Math/Vector.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Vector.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Math/Vector/CrossProductNode.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Vector/CrossProductNode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Math/Vector/CrossProductNode.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Vector/CrossProductNode.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Math/Vector/CrossProductNode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Vector/CrossProductNode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Math/Vector/CrossProductNode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Vector/CrossProductNode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Math/Vector/DistanceNode.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Vector/DistanceNode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Math/Vector/DistanceNode.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Vector/DistanceNode.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Math/Vector/DistanceNode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Vector/DistanceNode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Math/Vector/DistanceNode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Vector/DistanceNode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Math/Vector/DotProductNode.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Vector/DotProductNode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Math/Vector/DotProductNode.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Vector/DotProductNode.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Math/Vector/DotProductNode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Vector/DotProductNode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Math/Vector/DotProductNode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Vector/DotProductNode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Math/Vector/FresnelEffectNode.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Vector/FresnelEffectNode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Math/Vector/FresnelEffectNode.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Vector/FresnelEffectNode.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Math/Vector/FresnelEffectNode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Vector/FresnelEffectNode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Math/Vector/FresnelEffectNode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Vector/FresnelEffectNode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Math/Vector/ProjectionNode.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Vector/ProjectionNode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Math/Vector/ProjectionNode.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Vector/ProjectionNode.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Math/Vector/ProjectionNode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Vector/ProjectionNode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Math/Vector/ProjectionNode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Vector/ProjectionNode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Math/Vector/ReflectionNode.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Vector/ReflectionNode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Math/Vector/ReflectionNode.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Vector/ReflectionNode.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Math/Vector/ReflectionNode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Vector/ReflectionNode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Math/Vector/ReflectionNode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Vector/ReflectionNode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Math/Vector/RejectionNode.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Vector/RejectionNode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Math/Vector/RejectionNode.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Vector/RejectionNode.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Math/Vector/RejectionNode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Vector/RejectionNode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Math/Vector/RejectionNode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Vector/RejectionNode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Math/Vector/RotateAboutAxisNode.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Vector/RotateAboutAxisNode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Math/Vector/RotateAboutAxisNode.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Vector/RotateAboutAxisNode.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Math/Vector/RotateAboutAxisNode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Vector/RotateAboutAxisNode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Math/Vector/RotateAboutAxisNode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Vector/RotateAboutAxisNode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Math/Vector/SphereMaskNode.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Vector/SphereMaskNode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Math/Vector/SphereMaskNode.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Vector/SphereMaskNode.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Math/Vector/SphereMaskNode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Vector/SphereMaskNode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Math/Vector/SphereMaskNode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Vector/SphereMaskNode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Math/Vector/TransformNode.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Vector/TransformNode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Math/Vector/TransformNode.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Vector/TransformNode.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Math/Vector/TransformNode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Vector/TransformNode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Math/Vector/TransformNode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Vector/TransformNode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Math/Wave.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Wave.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Math/Wave.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Wave.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Math/Wave/NoiseSineWaveNode.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Wave/NoiseSineWaveNode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Math/Wave/NoiseSineWaveNode.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Wave/NoiseSineWaveNode.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Math/Wave/NoiseSineWaveNode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Wave/NoiseSineWaveNode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Math/Wave/NoiseSineWaveNode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Wave/NoiseSineWaveNode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Math/Wave/SawtoothWaveNode.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Wave/SawtoothWaveNode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Math/Wave/SawtoothWaveNode.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Wave/SawtoothWaveNode.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Math/Wave/SawtoothWaveNode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Wave/SawtoothWaveNode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Math/Wave/SawtoothWaveNode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Wave/SawtoothWaveNode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Math/Wave/SquareWaveNode.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Wave/SquareWaveNode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Math/Wave/SquareWaveNode.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Wave/SquareWaveNode.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Math/Wave/SquareWaveNode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Wave/SquareWaveNode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Math/Wave/SquareWaveNode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Wave/SquareWaveNode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Math/Wave/TriangleWaveNode.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Wave/TriangleWaveNode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Math/Wave/TriangleWaveNode.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Wave/TriangleWaveNode.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Math/Wave/TriangleWaveNode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Wave/TriangleWaveNode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Math/Wave/TriangleWaveNode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Math/Wave/TriangleWaveNode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/MeshDeformation.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/MeshDeformation.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/MeshDeformation.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/MeshDeformation.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/MeshDeformation/ComputeDeformNode.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/MeshDeformation/ComputeDeformNode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/MeshDeformation/ComputeDeformNode.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/MeshDeformation/ComputeDeformNode.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/MeshDeformation/ComputeDeformNode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/MeshDeformation/ComputeDeformNode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/MeshDeformation/ComputeDeformNode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/MeshDeformation/ComputeDeformNode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/MeshDeformation/LinearBlendSkinningNode.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/MeshDeformation/LinearBlendSkinningNode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/MeshDeformation/LinearBlendSkinningNode.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/MeshDeformation/LinearBlendSkinningNode.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/MeshDeformation/LinearBlendSkinningNode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/MeshDeformation/LinearBlendSkinningNode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/MeshDeformation/LinearBlendSkinningNode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/MeshDeformation/LinearBlendSkinningNode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/NodeClassCache.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/NodeClassCache.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/NodeClassCache.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/NodeClassCache.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/NodeClassCache.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/NodeClassCache.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/NodeClassCache.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/NodeClassCache.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/NormalMapSpace.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/NormalMapSpace.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/NormalMapSpace.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/NormalMapSpace.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/NormalMapSpace.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/NormalMapSpace.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/NormalMapSpace.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/NormalMapSpace.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Procedural.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Procedural.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Procedural.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Procedural.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Procedural/CheckerboardNode.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/Procedural/CheckerboardNode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Procedural/CheckerboardNode.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Procedural/CheckerboardNode.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Procedural/CheckerboardNode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Procedural/CheckerboardNode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Procedural/CheckerboardNode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Procedural/CheckerboardNode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Procedural/Noise.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Procedural/Noise.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Procedural/Noise.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Procedural/Noise.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Procedural/Noise/GradientNoiseNode.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/Procedural/Noise/GradientNoiseNode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Procedural/Noise/GradientNoiseNode.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Procedural/Noise/GradientNoiseNode.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Procedural/Noise/GradientNoiseNode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Procedural/Noise/GradientNoiseNode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Procedural/Noise/GradientNoiseNode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Procedural/Noise/GradientNoiseNode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Procedural/Noise/SimpleNoiseNode.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/Procedural/Noise/SimpleNoiseNode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Procedural/Noise/SimpleNoiseNode.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Procedural/Noise/SimpleNoiseNode.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Procedural/Noise/SimpleNoiseNode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Procedural/Noise/SimpleNoiseNode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Procedural/Noise/SimpleNoiseNode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Procedural/Noise/SimpleNoiseNode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Procedural/Noise/VoronoiNode.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/Procedural/Noise/VoronoiNode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Procedural/Noise/VoronoiNode.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Procedural/Noise/VoronoiNode.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Procedural/Noise/VoronoiNode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Procedural/Noise/VoronoiNode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Procedural/Noise/VoronoiNode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Procedural/Noise/VoronoiNode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Procedural/Shape.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Procedural/Shape.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Procedural/Shape.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Procedural/Shape.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Procedural/Shape/EllipseNode.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/Procedural/Shape/EllipseNode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Procedural/Shape/EllipseNode.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Procedural/Shape/EllipseNode.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Procedural/Shape/EllipseNode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Procedural/Shape/EllipseNode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Procedural/Shape/EllipseNode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Procedural/Shape/EllipseNode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Procedural/Shape/PolygonNode.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/Procedural/Shape/PolygonNode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Procedural/Shape/PolygonNode.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Procedural/Shape/PolygonNode.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Procedural/Shape/PolygonNode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Procedural/Shape/PolygonNode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Procedural/Shape/PolygonNode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Procedural/Shape/PolygonNode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Procedural/Shape/RectangleNode.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/Procedural/Shape/RectangleNode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Procedural/Shape/RectangleNode.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Procedural/Shape/RectangleNode.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Procedural/Shape/RectangleNode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Procedural/Shape/RectangleNode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Procedural/Shape/RectangleNode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Procedural/Shape/RectangleNode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Procedural/Shape/RoundedPolygonNode.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/Procedural/Shape/RoundedPolygonNode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Procedural/Shape/RoundedPolygonNode.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Procedural/Shape/RoundedPolygonNode.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Procedural/Shape/RoundedPolygonNode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Procedural/Shape/RoundedPolygonNode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Procedural/Shape/RoundedPolygonNode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Procedural/Shape/RoundedPolygonNode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Procedural/Shape/RoundedRectangleNode.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/Procedural/Shape/RoundedRectangleNode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Procedural/Shape/RoundedRectangleNode.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Procedural/Shape/RoundedRectangleNode.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Procedural/Shape/RoundedRectangleNode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Procedural/Shape/RoundedRectangleNode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Procedural/Shape/RoundedRectangleNode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Procedural/Shape/RoundedRectangleNode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/RedirectNode.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/RedirectNode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/RedirectNode.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/RedirectNode.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/RedirectNode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/RedirectNode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/RedirectNode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/RedirectNode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/ShaderStage.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/ShaderStage.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/ShaderStage.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/ShaderStage.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/ShaderStage.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/ShaderStage.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/ShaderStage.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/ShaderStage.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/SlotValue.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/SlotValue.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/SlotValue.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/SlotValue.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/SlotValue.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/SlotValue.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/SlotValue.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/SlotValue.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/TitleAttribute.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/TitleAttribute.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/TitleAttribute.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/TitleAttribute.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/TitleAttribute.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/TitleAttribute.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/TitleAttribute.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/TitleAttribute.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/UV.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/UV.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/UV.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/UV.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/UV/FlipbookNode.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/UV/FlipbookNode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/UV/FlipbookNode.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/UV/FlipbookNode.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/UV/FlipbookNode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/UV/FlipbookNode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/UV/FlipbookNode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/UV/FlipbookNode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/UV/ParallaxMappingNode.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/UV/ParallaxMappingNode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/UV/ParallaxMappingNode.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/UV/ParallaxMappingNode.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/UV/ParallaxMappingNode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/UV/ParallaxMappingNode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/UV/ParallaxMappingNode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/UV/ParallaxMappingNode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/UV/ParallaxOcclusionMappingNode.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/UV/ParallaxOcclusionMappingNode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/UV/ParallaxOcclusionMappingNode.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/UV/ParallaxOcclusionMappingNode.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/UV/ParallaxOcclusionMappingNode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/UV/ParallaxOcclusionMappingNode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/UV/ParallaxOcclusionMappingNode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/UV/ParallaxOcclusionMappingNode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/UV/PolarCoordinatesNode.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/UV/PolarCoordinatesNode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/UV/PolarCoordinatesNode.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/UV/PolarCoordinatesNode.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/UV/PolarCoordinatesNode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/UV/PolarCoordinatesNode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/UV/PolarCoordinatesNode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/UV/PolarCoordinatesNode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/UV/RadialShearNode.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/UV/RadialShearNode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/UV/RadialShearNode.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/UV/RadialShearNode.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/UV/RadialShearNode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/UV/RadialShearNode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/UV/RadialShearNode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/UV/RadialShearNode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/UV/RotateNode.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/UV/RotateNode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/UV/RotateNode.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/UV/RotateNode.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/UV/RotateNode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/UV/RotateNode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/UV/RotateNode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/UV/RotateNode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/UV/SpherizeNode.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/UV/SpherizeNode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/UV/SpherizeNode.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/UV/SpherizeNode.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/UV/SpherizeNode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/UV/SpherizeNode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/UV/SpherizeNode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/UV/SpherizeNode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/UV/TilingAndOffsetNode.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/UV/TilingAndOffsetNode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/UV/TilingAndOffsetNode.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/UV/TilingAndOffsetNode.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/UV/TilingAndOffsetNode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/UV/TilingAndOffsetNode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/UV/TilingAndOffsetNode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/UV/TilingAndOffsetNode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/UV/TriplanarNode.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/UV/TriplanarNode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/UV/TriplanarNode.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/UV/TriplanarNode.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/UV/TriplanarNode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/UV/TriplanarNode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/UV/TriplanarNode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/UV/TriplanarNode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/UV/TwirlNode.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/UV/TwirlNode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/UV/TwirlNode.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/UV/TwirlNode.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/UV/TwirlNode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/UV/TwirlNode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/UV/TwirlNode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/UV/TwirlNode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Utility.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Utility.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Utility.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Utility.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Utility/CustomFunctionNode.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/Utility/CustomFunctionNode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Utility/CustomFunctionNode.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Utility/CustomFunctionNode.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Utility/CustomFunctionNode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Utility/CustomFunctionNode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Utility/CustomFunctionNode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Utility/CustomFunctionNode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Utility/DropdownNode.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/Utility/DropdownNode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Utility/DropdownNode.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Utility/DropdownNode.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Utility/DropdownNode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Utility/DropdownNode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Utility/DropdownNode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Utility/DropdownNode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Utility/KeywordNode.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/Utility/KeywordNode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Utility/KeywordNode.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Utility/KeywordNode.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Utility/KeywordNode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Utility/KeywordNode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Utility/KeywordNode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Utility/KeywordNode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Utility/Logic.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Utility/Logic.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Utility/Logic.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Utility/Logic.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Utility/Logic/AllNode.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/Utility/Logic/AllNode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Utility/Logic/AllNode.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Utility/Logic/AllNode.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Utility/Logic/AllNode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Utility/Logic/AllNode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Utility/Logic/AllNode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Utility/Logic/AllNode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Utility/Logic/AndNode.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/Utility/Logic/AndNode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Utility/Logic/AndNode.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Utility/Logic/AndNode.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Utility/Logic/AndNode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Utility/Logic/AndNode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Utility/Logic/AndNode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Utility/Logic/AndNode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Utility/Logic/AnyNode.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/Utility/Logic/AnyNode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Utility/Logic/AnyNode.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Utility/Logic/AnyNode.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Utility/Logic/AnyNode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Utility/Logic/AnyNode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Utility/Logic/AnyNode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Utility/Logic/AnyNode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Utility/Logic/BranchNode.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/Utility/Logic/BranchNode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Utility/Logic/BranchNode.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Utility/Logic/BranchNode.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Utility/Logic/BranchNode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Utility/Logic/BranchNode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Utility/Logic/BranchNode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Utility/Logic/BranchNode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Utility/Logic/BranchOnInputConnection.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/Utility/Logic/BranchOnInputConnection.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Utility/Logic/BranchOnInputConnection.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Utility/Logic/BranchOnInputConnection.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Utility/Logic/BranchOnInputConnection.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Utility/Logic/BranchOnInputConnection.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Utility/Logic/BranchOnInputConnection.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Utility/Logic/BranchOnInputConnection.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Utility/Logic/ComparisonNode.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/Utility/Logic/ComparisonNode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Utility/Logic/ComparisonNode.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Utility/Logic/ComparisonNode.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Utility/Logic/ComparisonNode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Utility/Logic/ComparisonNode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Utility/Logic/ComparisonNode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Utility/Logic/ComparisonNode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Utility/Logic/IsFrontFaceNode.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/Utility/Logic/IsFrontFaceNode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Utility/Logic/IsFrontFaceNode.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Utility/Logic/IsFrontFaceNode.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Utility/Logic/IsFrontFaceNode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Utility/Logic/IsFrontFaceNode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Utility/Logic/IsFrontFaceNode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Utility/Logic/IsFrontFaceNode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Utility/Logic/IsInfiniteNode.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/Utility/Logic/IsInfiniteNode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Utility/Logic/IsInfiniteNode.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Utility/Logic/IsInfiniteNode.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Utility/Logic/IsInfiniteNode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Utility/Logic/IsInfiniteNode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Utility/Logic/IsInfiniteNode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Utility/Logic/IsInfiniteNode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Utility/Logic/IsNanNode.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/Utility/Logic/IsNanNode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Utility/Logic/IsNanNode.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Utility/Logic/IsNanNode.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Utility/Logic/IsNanNode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Utility/Logic/IsNanNode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Utility/Logic/IsNanNode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Utility/Logic/IsNanNode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Utility/Logic/NandNode.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/Utility/Logic/NandNode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Utility/Logic/NandNode.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Utility/Logic/NandNode.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Utility/Logic/NandNode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Utility/Logic/NandNode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Utility/Logic/NandNode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Utility/Logic/NandNode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Utility/Logic/NotNode.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/Utility/Logic/NotNode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Utility/Logic/NotNode.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Utility/Logic/NotNode.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Utility/Logic/NotNode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Utility/Logic/NotNode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Utility/Logic/NotNode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Utility/Logic/NotNode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Utility/Logic/OrNode.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/Utility/Logic/OrNode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Utility/Logic/OrNode.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Utility/Logic/OrNode.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Utility/Logic/OrNode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Utility/Logic/OrNode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Utility/Logic/OrNode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Utility/Logic/OrNode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Utility/PreviewNode.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/Utility/PreviewNode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Utility/PreviewNode.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Utility/PreviewNode.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Utility/PreviewNode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Utility/PreviewNode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Utility/PreviewNode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Utility/PreviewNode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Utility/RedirectNodeData.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/Utility/RedirectNodeData.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Utility/RedirectNodeData.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Utility/RedirectNodeData.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Utility/RedirectNodeData.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Utility/RedirectNodeData.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Utility/RedirectNodeData.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Utility/RedirectNodeData.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Utility/RedirectNodeView.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/Utility/RedirectNodeView.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Utility/RedirectNodeView.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Utility/RedirectNodeView.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Utility/RedirectNodeView.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Utility/RedirectNodeView.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Utility/RedirectNodeView.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Utility/RedirectNodeView.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Utility/SplitTextureTransformNode.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/Utility/SplitTextureTransformNode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Utility/SplitTextureTransformNode.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Utility/SplitTextureTransformNode.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Utility/SplitTextureTransformNode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Utility/SplitTextureTransformNode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Utility/SplitTextureTransformNode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Utility/SplitTextureTransformNode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Utility/SubGraphNode.cs b/com.unity.shadergraph/Editor/Current/Data/Nodes/Utility/SubGraphNode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Utility/SubGraphNode.cs
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Utility/SubGraphNode.cs
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Utility/SubGraphNode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Nodes/Utility/SubGraphNode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Nodes/Utility/SubGraphNode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Nodes/Utility/SubGraphNode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/SubGraph.meta b/com.unity.shadergraph/Editor/Current/Data/SubGraph.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/SubGraph.meta
rename to com.unity.shadergraph/Editor/Current/Data/SubGraph.meta
diff --git a/com.unity.shadergraph/Editor/Data/SubGraph/SubGraphAsset.cs b/com.unity.shadergraph/Editor/Current/Data/SubGraph/SubGraphAsset.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/SubGraph/SubGraphAsset.cs
rename to com.unity.shadergraph/Editor/Current/Data/SubGraph/SubGraphAsset.cs
diff --git a/com.unity.shadergraph/Editor/Data/SubGraph/SubGraphAsset.cs.meta b/com.unity.shadergraph/Editor/Current/Data/SubGraph/SubGraphAsset.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/SubGraph/SubGraphAsset.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/SubGraph/SubGraphAsset.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/SubGraph/SubGraphOutputNode.cs b/com.unity.shadergraph/Editor/Current/Data/SubGraph/SubGraphOutputNode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/SubGraph/SubGraphOutputNode.cs
rename to com.unity.shadergraph/Editor/Current/Data/SubGraph/SubGraphOutputNode.cs
diff --git a/com.unity.shadergraph/Editor/Data/SubGraph/SubGraphOutputNode.cs.meta b/com.unity.shadergraph/Editor/Current/Data/SubGraph/SubGraphOutputNode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/SubGraph/SubGraphOutputNode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/SubGraph/SubGraphOutputNode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Util.meta b/com.unity.shadergraph/Editor/Current/Data/Util.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Util.meta
rename to com.unity.shadergraph/Editor/Current/Data/Util.meta
diff --git a/com.unity.shadergraph/Editor/Data/Util/FunctionRegistry.cs b/com.unity.shadergraph/Editor/Current/Data/Util/FunctionRegistry.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Util/FunctionRegistry.cs
rename to com.unity.shadergraph/Editor/Current/Data/Util/FunctionRegistry.cs
diff --git a/com.unity.shadergraph/Editor/Data/Util/FunctionRegistry.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Util/FunctionRegistry.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Util/FunctionRegistry.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Util/FunctionRegistry.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Util/GradientUtil.cs b/com.unity.shadergraph/Editor/Current/Data/Util/GradientUtil.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Util/GradientUtil.cs
rename to com.unity.shadergraph/Editor/Current/Data/Util/GradientUtil.cs
diff --git a/com.unity.shadergraph/Editor/Data/Util/GradientUtil.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Util/GradientUtil.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Util/GradientUtil.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Util/GradientUtil.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Util/GraphUtil.cs b/com.unity.shadergraph/Editor/Current/Data/Util/GraphUtil.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Util/GraphUtil.cs
rename to com.unity.shadergraph/Editor/Current/Data/Util/GraphUtil.cs
diff --git a/com.unity.shadergraph/Editor/Data/Util/GraphUtil.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Util/GraphUtil.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Util/GraphUtil.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Util/GraphUtil.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Util/Identifier.cs b/com.unity.shadergraph/Editor/Current/Data/Util/Identifier.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Util/Identifier.cs
rename to com.unity.shadergraph/Editor/Current/Data/Util/Identifier.cs
diff --git a/com.unity.shadergraph/Editor/Data/Util/Identifier.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Util/Identifier.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Util/Identifier.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Util/Identifier.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Util/KeywordCollector.cs b/com.unity.shadergraph/Editor/Current/Data/Util/KeywordCollector.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Util/KeywordCollector.cs
rename to com.unity.shadergraph/Editor/Current/Data/Util/KeywordCollector.cs
diff --git a/com.unity.shadergraph/Editor/Data/Util/KeywordCollector.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Util/KeywordCollector.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Util/KeywordCollector.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Util/KeywordCollector.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Util/KeywordDependentCollection.cs b/com.unity.shadergraph/Editor/Current/Data/Util/KeywordDependentCollection.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Util/KeywordDependentCollection.cs
rename to com.unity.shadergraph/Editor/Current/Data/Util/KeywordDependentCollection.cs
diff --git a/com.unity.shadergraph/Editor/Data/Util/KeywordDependentCollection.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Util/KeywordDependentCollection.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Util/KeywordDependentCollection.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Util/KeywordDependentCollection.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Util/KeywordUtil.cs b/com.unity.shadergraph/Editor/Current/Data/Util/KeywordUtil.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Util/KeywordUtil.cs
rename to com.unity.shadergraph/Editor/Current/Data/Util/KeywordUtil.cs
diff --git a/com.unity.shadergraph/Editor/Data/Util/KeywordUtil.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Util/KeywordUtil.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Util/KeywordUtil.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Util/KeywordUtil.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Util/Logging.cs b/com.unity.shadergraph/Editor/Current/Data/Util/Logging.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Util/Logging.cs
rename to com.unity.shadergraph/Editor/Current/Data/Util/Logging.cs
diff --git a/com.unity.shadergraph/Editor/Data/Util/Logging.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Util/Logging.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Util/Logging.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Util/Logging.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Util/PooledHashSet.cs b/com.unity.shadergraph/Editor/Current/Data/Util/PooledHashSet.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Util/PooledHashSet.cs
rename to com.unity.shadergraph/Editor/Current/Data/Util/PooledHashSet.cs
diff --git a/com.unity.shadergraph/Editor/Data/Util/PooledHashSet.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Util/PooledHashSet.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Util/PooledHashSet.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Util/PooledHashSet.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Util/PooledList.cs b/com.unity.shadergraph/Editor/Current/Data/Util/PooledList.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Util/PooledList.cs
rename to com.unity.shadergraph/Editor/Current/Data/Util/PooledList.cs
diff --git a/com.unity.shadergraph/Editor/Data/Util/PooledList.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Util/PooledList.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Util/PooledList.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Util/PooledList.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Util/PrecisionUtil.cs b/com.unity.shadergraph/Editor/Current/Data/Util/PrecisionUtil.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Util/PrecisionUtil.cs
rename to com.unity.shadergraph/Editor/Current/Data/Util/PrecisionUtil.cs
diff --git a/com.unity.shadergraph/Editor/Data/Util/PrecisionUtil.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Util/PrecisionUtil.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Util/PrecisionUtil.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Util/PrecisionUtil.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Util/PropertyUtil.cs b/com.unity.shadergraph/Editor/Current/Data/Util/PropertyUtil.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Util/PropertyUtil.cs
rename to com.unity.shadergraph/Editor/Current/Data/Util/PropertyUtil.cs
diff --git a/com.unity.shadergraph/Editor/Data/Util/PropertyUtil.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Util/PropertyUtil.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Util/PropertyUtil.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Util/PropertyUtil.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Util/ScreenSpaceType.cs b/com.unity.shadergraph/Editor/Current/Data/Util/ScreenSpaceType.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Util/ScreenSpaceType.cs
rename to com.unity.shadergraph/Editor/Current/Data/Util/ScreenSpaceType.cs
diff --git a/com.unity.shadergraph/Editor/Data/Util/ScreenSpaceType.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Util/ScreenSpaceType.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Util/ScreenSpaceType.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Util/ScreenSpaceType.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Util/SerializationHelper.cs b/com.unity.shadergraph/Editor/Current/Data/Util/SerializationHelper.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Util/SerializationHelper.cs
rename to com.unity.shadergraph/Editor/Current/Data/Util/SerializationHelper.cs
diff --git a/com.unity.shadergraph/Editor/Data/Util/SerializationHelper.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Util/SerializationHelper.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Util/SerializationHelper.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Util/SerializationHelper.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Util/ShaderGraphRequirementsPerKeyword.cs b/com.unity.shadergraph/Editor/Current/Data/Util/ShaderGraphRequirementsPerKeyword.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Util/ShaderGraphRequirementsPerKeyword.cs
rename to com.unity.shadergraph/Editor/Current/Data/Util/ShaderGraphRequirementsPerKeyword.cs
diff --git a/com.unity.shadergraph/Editor/Data/Util/ShaderGraphRequirementsPerKeyword.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Util/ShaderGraphRequirementsPerKeyword.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Util/ShaderGraphRequirementsPerKeyword.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Util/ShaderGraphRequirementsPerKeyword.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Util/SlotValueTypeUtil.cs b/com.unity.shadergraph/Editor/Current/Data/Util/SlotValueTypeUtil.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Util/SlotValueTypeUtil.cs
rename to com.unity.shadergraph/Editor/Current/Data/Util/SlotValueTypeUtil.cs
diff --git a/com.unity.shadergraph/Editor/Data/Util/SlotValueTypeUtil.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Util/SlotValueTypeUtil.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Util/SlotValueTypeUtil.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Util/SlotValueTypeUtil.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Util/StackPool.cs b/com.unity.shadergraph/Editor/Current/Data/Util/StackPool.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Util/StackPool.cs
rename to com.unity.shadergraph/Editor/Current/Data/Util/StackPool.cs
diff --git a/com.unity.shadergraph/Editor/Data/Util/StackPool.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Util/StackPool.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Util/StackPool.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Util/StackPool.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Util/TextUtil.cs b/com.unity.shadergraph/Editor/Current/Data/Util/TextUtil.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Util/TextUtil.cs
rename to com.unity.shadergraph/Editor/Current/Data/Util/TextUtil.cs
diff --git a/com.unity.shadergraph/Editor/Data/Util/TextUtil.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Util/TextUtil.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Util/TextUtil.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Util/TextUtil.cs.meta
diff --git a/com.unity.shadergraph/Editor/Data/Util/UvChannel.cs b/com.unity.shadergraph/Editor/Current/Data/Util/UvChannel.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Util/UvChannel.cs
rename to com.unity.shadergraph/Editor/Current/Data/Util/UvChannel.cs
diff --git a/com.unity.shadergraph/Editor/Data/Util/UvChannel.cs.meta b/com.unity.shadergraph/Editor/Current/Data/Util/UvChannel.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Data/Util/UvChannel.cs.meta
rename to com.unity.shadergraph/Editor/Current/Data/Util/UvChannel.cs.meta
diff --git a/com.unity.shadergraph/Editor/DefaultShaderIncludes.cs b/com.unity.shadergraph/Editor/Current/DefaultShaderIncludes.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/DefaultShaderIncludes.cs
rename to com.unity.shadergraph/Editor/Current/DefaultShaderIncludes.cs
diff --git a/com.unity.shadergraph/Editor/DefaultShaderIncludes.cs.meta b/com.unity.shadergraph/Editor/Current/DefaultShaderIncludes.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/DefaultShaderIncludes.cs.meta
rename to com.unity.shadergraph/Editor/Current/DefaultShaderIncludes.cs.meta
diff --git a/com.unity.shadergraph/Editor/Drawing.meta b/com.unity.shadergraph/Editor/Current/Drawing.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing.meta
rename to com.unity.shadergraph/Editor/Current/Drawing.meta
diff --git a/com.unity.shadergraph/Editor/Drawing/Blackboard.meta b/com.unity.shadergraph/Editor/Current/Drawing/Blackboard.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Blackboard.meta
rename to com.unity.shadergraph/Editor/Current/Drawing/Blackboard.meta
diff --git a/com.unity.shadergraph/Editor/Drawing/Blackboard/BlackboardInputInfo.cs b/com.unity.shadergraph/Editor/Current/Drawing/Blackboard/BlackboardInputInfo.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Blackboard/BlackboardInputInfo.cs
rename to com.unity.shadergraph/Editor/Current/Drawing/Blackboard/BlackboardInputInfo.cs
diff --git a/com.unity.shadergraph/Editor/Drawing/Blackboard/BlackboardInputInfo.cs.meta b/com.unity.shadergraph/Editor/Current/Drawing/Blackboard/BlackboardInputInfo.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Blackboard/BlackboardInputInfo.cs.meta
rename to com.unity.shadergraph/Editor/Current/Drawing/Blackboard/BlackboardInputInfo.cs.meta
diff --git a/com.unity.shadergraph/Editor/Drawing/Blackboard/BlackboardUtils.cs b/com.unity.shadergraph/Editor/Current/Drawing/Blackboard/BlackboardUtils.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Blackboard/BlackboardUtils.cs
rename to com.unity.shadergraph/Editor/Current/Drawing/Blackboard/BlackboardUtils.cs
diff --git a/com.unity.shadergraph/Editor/Drawing/Blackboard/BlackboardUtils.cs.meta b/com.unity.shadergraph/Editor/Current/Drawing/Blackboard/BlackboardUtils.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Blackboard/BlackboardUtils.cs.meta
rename to com.unity.shadergraph/Editor/Current/Drawing/Blackboard/BlackboardUtils.cs.meta
diff --git a/com.unity.shadergraph/Editor/Drawing/Blackboard/SGBlackboard.cs b/com.unity.shadergraph/Editor/Current/Drawing/Blackboard/SGBlackboard.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Blackboard/SGBlackboard.cs
rename to com.unity.shadergraph/Editor/Current/Drawing/Blackboard/SGBlackboard.cs
diff --git a/com.unity.shadergraph/Editor/Drawing/Blackboard/SGBlackboard.cs.meta b/com.unity.shadergraph/Editor/Current/Drawing/Blackboard/SGBlackboard.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Blackboard/SGBlackboard.cs.meta
rename to com.unity.shadergraph/Editor/Current/Drawing/Blackboard/SGBlackboard.cs.meta
diff --git a/com.unity.shadergraph/Editor/Drawing/Blackboard/SGBlackboardCategory.cs b/com.unity.shadergraph/Editor/Current/Drawing/Blackboard/SGBlackboardCategory.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Blackboard/SGBlackboardCategory.cs
rename to com.unity.shadergraph/Editor/Current/Drawing/Blackboard/SGBlackboardCategory.cs
diff --git a/com.unity.shadergraph/Editor/Drawing/Blackboard/SGBlackboardCategory.cs.meta b/com.unity.shadergraph/Editor/Current/Drawing/Blackboard/SGBlackboardCategory.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Blackboard/SGBlackboardCategory.cs.meta
rename to com.unity.shadergraph/Editor/Current/Drawing/Blackboard/SGBlackboardCategory.cs.meta
diff --git a/com.unity.shadergraph/Editor/Drawing/Blackboard/SGBlackboardField.cs b/com.unity.shadergraph/Editor/Current/Drawing/Blackboard/SGBlackboardField.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Blackboard/SGBlackboardField.cs
rename to com.unity.shadergraph/Editor/Current/Drawing/Blackboard/SGBlackboardField.cs
diff --git a/com.unity.shadergraph/Editor/Drawing/Blackboard/SGBlackboardField.cs.meta b/com.unity.shadergraph/Editor/Current/Drawing/Blackboard/SGBlackboardField.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Blackboard/SGBlackboardField.cs.meta
rename to com.unity.shadergraph/Editor/Current/Drawing/Blackboard/SGBlackboardField.cs.meta
diff --git a/com.unity.shadergraph/Editor/Drawing/Blackboard/SGBlackboardRow.cs b/com.unity.shadergraph/Editor/Current/Drawing/Blackboard/SGBlackboardRow.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Blackboard/SGBlackboardRow.cs
rename to com.unity.shadergraph/Editor/Current/Drawing/Blackboard/SGBlackboardRow.cs
diff --git a/com.unity.shadergraph/Editor/Drawing/Blackboard/SGBlackboardRow.cs.meta b/com.unity.shadergraph/Editor/Current/Drawing/Blackboard/SGBlackboardRow.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Blackboard/SGBlackboardRow.cs.meta
rename to com.unity.shadergraph/Editor/Current/Drawing/Blackboard/SGBlackboardRow.cs.meta
diff --git a/com.unity.shadergraph/Editor/Drawing/Colors.meta b/com.unity.shadergraph/Editor/Current/Drawing/Colors.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Colors.meta
rename to com.unity.shadergraph/Editor/Current/Drawing/Colors.meta
diff --git a/com.unity.shadergraph/Editor/Drawing/Colors/CategoryColors.cs b/com.unity.shadergraph/Editor/Current/Drawing/Colors/CategoryColors.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Colors/CategoryColors.cs
rename to com.unity.shadergraph/Editor/Current/Drawing/Colors/CategoryColors.cs
diff --git a/com.unity.shadergraph/Editor/Drawing/Colors/CategoryColors.cs.meta b/com.unity.shadergraph/Editor/Current/Drawing/Colors/CategoryColors.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Colors/CategoryColors.cs.meta
rename to com.unity.shadergraph/Editor/Current/Drawing/Colors/CategoryColors.cs.meta
diff --git a/com.unity.shadergraph/Editor/Drawing/Colors/ColorManager.cs b/com.unity.shadergraph/Editor/Current/Drawing/Colors/ColorManager.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Colors/ColorManager.cs
rename to com.unity.shadergraph/Editor/Current/Drawing/Colors/ColorManager.cs
diff --git a/com.unity.shadergraph/Editor/Drawing/Colors/ColorManager.cs.meta b/com.unity.shadergraph/Editor/Current/Drawing/Colors/ColorManager.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Colors/ColorManager.cs.meta
rename to com.unity.shadergraph/Editor/Current/Drawing/Colors/ColorManager.cs.meta
diff --git a/com.unity.shadergraph/Editor/Drawing/Colors/CustomColorData.cs b/com.unity.shadergraph/Editor/Current/Drawing/Colors/CustomColorData.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Colors/CustomColorData.cs
rename to com.unity.shadergraph/Editor/Current/Drawing/Colors/CustomColorData.cs
diff --git a/com.unity.shadergraph/Editor/Drawing/Colors/CustomColorData.cs.meta b/com.unity.shadergraph/Editor/Current/Drawing/Colors/CustomColorData.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Colors/CustomColorData.cs.meta
rename to com.unity.shadergraph/Editor/Current/Drawing/Colors/CustomColorData.cs.meta
diff --git a/com.unity.shadergraph/Editor/Drawing/Colors/IColorProvider.cs b/com.unity.shadergraph/Editor/Current/Drawing/Colors/IColorProvider.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Colors/IColorProvider.cs
rename to com.unity.shadergraph/Editor/Current/Drawing/Colors/IColorProvider.cs
diff --git a/com.unity.shadergraph/Editor/Drawing/Colors/IColorProvider.cs.meta b/com.unity.shadergraph/Editor/Current/Drawing/Colors/IColorProvider.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Colors/IColorProvider.cs.meta
rename to com.unity.shadergraph/Editor/Current/Drawing/Colors/IColorProvider.cs.meta
diff --git a/com.unity.shadergraph/Editor/Drawing/Colors/NoColors.cs b/com.unity.shadergraph/Editor/Current/Drawing/Colors/NoColors.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Colors/NoColors.cs
rename to com.unity.shadergraph/Editor/Current/Drawing/Colors/NoColors.cs
diff --git a/com.unity.shadergraph/Editor/Drawing/Colors/NoColors.cs.meta b/com.unity.shadergraph/Editor/Current/Drawing/Colors/NoColors.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Colors/NoColors.cs.meta
rename to com.unity.shadergraph/Editor/Current/Drawing/Colors/NoColors.cs.meta
diff --git a/com.unity.shadergraph/Editor/Drawing/Colors/PrecisionColors.cs b/com.unity.shadergraph/Editor/Current/Drawing/Colors/PrecisionColors.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Colors/PrecisionColors.cs
rename to com.unity.shadergraph/Editor/Current/Drawing/Colors/PrecisionColors.cs
diff --git a/com.unity.shadergraph/Editor/Drawing/Colors/PrecisionColors.cs.meta b/com.unity.shadergraph/Editor/Current/Drawing/Colors/PrecisionColors.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Colors/PrecisionColors.cs.meta
rename to com.unity.shadergraph/Editor/Current/Drawing/Colors/PrecisionColors.cs.meta
diff --git a/com.unity.shadergraph/Editor/Drawing/Colors/UserColors.cs b/com.unity.shadergraph/Editor/Current/Drawing/Colors/UserColors.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Colors/UserColors.cs
rename to com.unity.shadergraph/Editor/Current/Drawing/Colors/UserColors.cs
diff --git a/com.unity.shadergraph/Editor/Drawing/Colors/UserColors.cs.meta b/com.unity.shadergraph/Editor/Current/Drawing/Colors/UserColors.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Colors/UserColors.cs.meta
rename to com.unity.shadergraph/Editor/Current/Drawing/Colors/UserColors.cs.meta
diff --git a/com.unity.shadergraph/Editor/Drawing/Controllers.meta b/com.unity.shadergraph/Editor/Current/Drawing/Controllers.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Controllers.meta
rename to com.unity.shadergraph/Editor/Current/Drawing/Controllers.meta
diff --git a/com.unity.shadergraph/Editor/Drawing/Controllers/BlackboardCategoryController.cs b/com.unity.shadergraph/Editor/Current/Drawing/Controllers/BlackboardCategoryController.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Controllers/BlackboardCategoryController.cs
rename to com.unity.shadergraph/Editor/Current/Drawing/Controllers/BlackboardCategoryController.cs
diff --git a/com.unity.shadergraph/Editor/Drawing/Controllers/BlackboardCategoryController.cs.meta b/com.unity.shadergraph/Editor/Current/Drawing/Controllers/BlackboardCategoryController.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Controllers/BlackboardCategoryController.cs.meta
rename to com.unity.shadergraph/Editor/Current/Drawing/Controllers/BlackboardCategoryController.cs.meta
diff --git a/com.unity.shadergraph/Editor/Drawing/Controllers/BlackboardController.cs b/com.unity.shadergraph/Editor/Current/Drawing/Controllers/BlackboardController.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Controllers/BlackboardController.cs
rename to com.unity.shadergraph/Editor/Current/Drawing/Controllers/BlackboardController.cs
diff --git a/com.unity.shadergraph/Editor/Drawing/Controllers/BlackboardController.cs.meta b/com.unity.shadergraph/Editor/Current/Drawing/Controllers/BlackboardController.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Controllers/BlackboardController.cs.meta
rename to com.unity.shadergraph/Editor/Current/Drawing/Controllers/BlackboardController.cs.meta
diff --git a/com.unity.shadergraph/Editor/Drawing/Controllers/SGController.cs b/com.unity.shadergraph/Editor/Current/Drawing/Controllers/SGController.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Controllers/SGController.cs
rename to com.unity.shadergraph/Editor/Current/Drawing/Controllers/SGController.cs
diff --git a/com.unity.shadergraph/Editor/Drawing/Controllers/SGController.cs.meta b/com.unity.shadergraph/Editor/Current/Drawing/Controllers/SGController.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Controllers/SGController.cs.meta
rename to com.unity.shadergraph/Editor/Current/Drawing/Controllers/SGController.cs.meta
diff --git a/com.unity.shadergraph/Editor/Drawing/Controllers/ShaderInputViewController.cs b/com.unity.shadergraph/Editor/Current/Drawing/Controllers/ShaderInputViewController.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Controllers/ShaderInputViewController.cs
rename to com.unity.shadergraph/Editor/Current/Drawing/Controllers/ShaderInputViewController.cs
diff --git a/com.unity.shadergraph/Editor/Drawing/Controllers/ShaderInputViewController.cs.meta b/com.unity.shadergraph/Editor/Current/Drawing/Controllers/ShaderInputViewController.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Controllers/ShaderInputViewController.cs.meta
rename to com.unity.shadergraph/Editor/Current/Drawing/Controllers/ShaderInputViewController.cs.meta
diff --git a/com.unity.shadergraph/Editor/Drawing/Controls.meta b/com.unity.shadergraph/Editor/Current/Drawing/Controls.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Controls.meta
rename to com.unity.shadergraph/Editor/Current/Drawing/Controls.meta
diff --git a/com.unity.shadergraph/Editor/Drawing/Controls/ButtonControl.cs b/com.unity.shadergraph/Editor/Current/Drawing/Controls/ButtonControl.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Controls/ButtonControl.cs
rename to com.unity.shadergraph/Editor/Current/Drawing/Controls/ButtonControl.cs
diff --git a/com.unity.shadergraph/Editor/Drawing/Controls/ButtonControl.cs.meta b/com.unity.shadergraph/Editor/Current/Drawing/Controls/ButtonControl.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Controls/ButtonControl.cs.meta
rename to com.unity.shadergraph/Editor/Current/Drawing/Controls/ButtonControl.cs.meta
diff --git a/com.unity.shadergraph/Editor/Drawing/Controls/ChannelEnumControl.cs b/com.unity.shadergraph/Editor/Current/Drawing/Controls/ChannelEnumControl.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Controls/ChannelEnumControl.cs
rename to com.unity.shadergraph/Editor/Current/Drawing/Controls/ChannelEnumControl.cs
diff --git a/com.unity.shadergraph/Editor/Drawing/Controls/ChannelEnumControl.cs.meta b/com.unity.shadergraph/Editor/Current/Drawing/Controls/ChannelEnumControl.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Controls/ChannelEnumControl.cs.meta
rename to com.unity.shadergraph/Editor/Current/Drawing/Controls/ChannelEnumControl.cs.meta
diff --git a/com.unity.shadergraph/Editor/Drawing/Controls/ChannelEnumMaskControl.cs b/com.unity.shadergraph/Editor/Current/Drawing/Controls/ChannelEnumMaskControl.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Controls/ChannelEnumMaskControl.cs
rename to com.unity.shadergraph/Editor/Current/Drawing/Controls/ChannelEnumMaskControl.cs
diff --git a/com.unity.shadergraph/Editor/Drawing/Controls/ChannelEnumMaskControl.cs.meta b/com.unity.shadergraph/Editor/Current/Drawing/Controls/ChannelEnumMaskControl.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Controls/ChannelEnumMaskControl.cs.meta
rename to com.unity.shadergraph/Editor/Current/Drawing/Controls/ChannelEnumMaskControl.cs.meta
diff --git a/com.unity.shadergraph/Editor/Drawing/Controls/ChannelMixerControl.cs b/com.unity.shadergraph/Editor/Current/Drawing/Controls/ChannelMixerControl.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Controls/ChannelMixerControl.cs
rename to com.unity.shadergraph/Editor/Current/Drawing/Controls/ChannelMixerControl.cs
diff --git a/com.unity.shadergraph/Editor/Drawing/Controls/ChannelMixerControl.cs.meta b/com.unity.shadergraph/Editor/Current/Drawing/Controls/ChannelMixerControl.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Controls/ChannelMixerControl.cs.meta
rename to com.unity.shadergraph/Editor/Current/Drawing/Controls/ChannelMixerControl.cs.meta
diff --git a/com.unity.shadergraph/Editor/Drawing/Controls/ColorControl.cs b/com.unity.shadergraph/Editor/Current/Drawing/Controls/ColorControl.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Controls/ColorControl.cs
rename to com.unity.shadergraph/Editor/Current/Drawing/Controls/ColorControl.cs
diff --git a/com.unity.shadergraph/Editor/Drawing/Controls/ColorControl.cs.meta b/com.unity.shadergraph/Editor/Current/Drawing/Controls/ColorControl.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Controls/ColorControl.cs.meta
rename to com.unity.shadergraph/Editor/Current/Drawing/Controls/ColorControl.cs.meta
diff --git a/com.unity.shadergraph/Editor/Drawing/Controls/CubemapControl.cs b/com.unity.shadergraph/Editor/Current/Drawing/Controls/CubemapControl.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Controls/CubemapControl.cs
rename to com.unity.shadergraph/Editor/Current/Drawing/Controls/CubemapControl.cs
diff --git a/com.unity.shadergraph/Editor/Drawing/Controls/CubemapControl.cs.meta b/com.unity.shadergraph/Editor/Current/Drawing/Controls/CubemapControl.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Controls/CubemapControl.cs.meta
rename to com.unity.shadergraph/Editor/Current/Drawing/Controls/CubemapControl.cs.meta
diff --git a/com.unity.shadergraph/Editor/Drawing/Controls/DefaultControl.cs b/com.unity.shadergraph/Editor/Current/Drawing/Controls/DefaultControl.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Controls/DefaultControl.cs
rename to com.unity.shadergraph/Editor/Current/Drawing/Controls/DefaultControl.cs
diff --git a/com.unity.shadergraph/Editor/Drawing/Controls/DefaultControl.cs.meta b/com.unity.shadergraph/Editor/Current/Drawing/Controls/DefaultControl.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Controls/DefaultControl.cs.meta
rename to com.unity.shadergraph/Editor/Current/Drawing/Controls/DefaultControl.cs.meta
diff --git a/com.unity.shadergraph/Editor/Drawing/Controls/DielectricSpecularControl.cs b/com.unity.shadergraph/Editor/Current/Drawing/Controls/DielectricSpecularControl.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Controls/DielectricSpecularControl.cs
rename to com.unity.shadergraph/Editor/Current/Drawing/Controls/DielectricSpecularControl.cs
diff --git a/com.unity.shadergraph/Editor/Drawing/Controls/DielectricSpecularControl.cs.meta b/com.unity.shadergraph/Editor/Current/Drawing/Controls/DielectricSpecularControl.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Controls/DielectricSpecularControl.cs.meta
rename to com.unity.shadergraph/Editor/Current/Drawing/Controls/DielectricSpecularControl.cs.meta
diff --git a/com.unity.shadergraph/Editor/Drawing/Controls/EnumControl.cs b/com.unity.shadergraph/Editor/Current/Drawing/Controls/EnumControl.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Controls/EnumControl.cs
rename to com.unity.shadergraph/Editor/Current/Drawing/Controls/EnumControl.cs
diff --git a/com.unity.shadergraph/Editor/Drawing/Controls/EnumControl.cs.meta b/com.unity.shadergraph/Editor/Current/Drawing/Controls/EnumControl.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Controls/EnumControl.cs.meta
rename to com.unity.shadergraph/Editor/Current/Drawing/Controls/EnumControl.cs.meta
diff --git a/com.unity.shadergraph/Editor/Drawing/Controls/EnumConversionControl.cs b/com.unity.shadergraph/Editor/Current/Drawing/Controls/EnumConversionControl.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Controls/EnumConversionControl.cs
rename to com.unity.shadergraph/Editor/Current/Drawing/Controls/EnumConversionControl.cs
diff --git a/com.unity.shadergraph/Editor/Drawing/Controls/EnumConversionControl.cs.meta b/com.unity.shadergraph/Editor/Current/Drawing/Controls/EnumConversionControl.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Controls/EnumConversionControl.cs.meta
rename to com.unity.shadergraph/Editor/Current/Drawing/Controls/EnumConversionControl.cs.meta
diff --git a/com.unity.shadergraph/Editor/Drawing/Controls/GradientControl.cs b/com.unity.shadergraph/Editor/Current/Drawing/Controls/GradientControl.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Controls/GradientControl.cs
rename to com.unity.shadergraph/Editor/Current/Drawing/Controls/GradientControl.cs
diff --git a/com.unity.shadergraph/Editor/Drawing/Controls/GradientControl.cs.meta b/com.unity.shadergraph/Editor/Current/Drawing/Controls/GradientControl.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Controls/GradientControl.cs.meta
rename to com.unity.shadergraph/Editor/Current/Drawing/Controls/GradientControl.cs.meta
diff --git a/com.unity.shadergraph/Editor/Drawing/Controls/IControlAttribute.cs b/com.unity.shadergraph/Editor/Current/Drawing/Controls/IControlAttribute.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Controls/IControlAttribute.cs
rename to com.unity.shadergraph/Editor/Current/Drawing/Controls/IControlAttribute.cs
diff --git a/com.unity.shadergraph/Editor/Drawing/Controls/IControlAttribute.cs.meta b/com.unity.shadergraph/Editor/Current/Drawing/Controls/IControlAttribute.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Controls/IControlAttribute.cs.meta
rename to com.unity.shadergraph/Editor/Current/Drawing/Controls/IControlAttribute.cs.meta
diff --git a/com.unity.shadergraph/Editor/Drawing/Controls/IdentifierControl.cs b/com.unity.shadergraph/Editor/Current/Drawing/Controls/IdentifierControl.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Controls/IdentifierControl.cs
rename to com.unity.shadergraph/Editor/Current/Drawing/Controls/IdentifierControl.cs
diff --git a/com.unity.shadergraph/Editor/Drawing/Controls/IdentifierControl.cs.meta b/com.unity.shadergraph/Editor/Current/Drawing/Controls/IdentifierControl.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Controls/IdentifierControl.cs.meta
rename to com.unity.shadergraph/Editor/Current/Drawing/Controls/IdentifierControl.cs.meta
diff --git a/com.unity.shadergraph/Editor/Drawing/Controls/IntegerControl.cs b/com.unity.shadergraph/Editor/Current/Drawing/Controls/IntegerControl.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Controls/IntegerControl.cs
rename to com.unity.shadergraph/Editor/Current/Drawing/Controls/IntegerControl.cs
diff --git a/com.unity.shadergraph/Editor/Drawing/Controls/IntegerControl.cs.meta b/com.unity.shadergraph/Editor/Current/Drawing/Controls/IntegerControl.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Controls/IntegerControl.cs.meta
rename to com.unity.shadergraph/Editor/Current/Drawing/Controls/IntegerControl.cs.meta
diff --git a/com.unity.shadergraph/Editor/Drawing/Controls/ObjectControl.cs b/com.unity.shadergraph/Editor/Current/Drawing/Controls/ObjectControl.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Controls/ObjectControl.cs
rename to com.unity.shadergraph/Editor/Current/Drawing/Controls/ObjectControl.cs
diff --git a/com.unity.shadergraph/Editor/Drawing/Controls/ObjectControl.cs.meta b/com.unity.shadergraph/Editor/Current/Drawing/Controls/ObjectControl.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Controls/ObjectControl.cs.meta
rename to com.unity.shadergraph/Editor/Current/Drawing/Controls/ObjectControl.cs.meta
diff --git a/com.unity.shadergraph/Editor/Drawing/Controls/PopupControl.cs b/com.unity.shadergraph/Editor/Current/Drawing/Controls/PopupControl.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Controls/PopupControl.cs
rename to com.unity.shadergraph/Editor/Current/Drawing/Controls/PopupControl.cs
diff --git a/com.unity.shadergraph/Editor/Drawing/Controls/PopupControl.cs.meta b/com.unity.shadergraph/Editor/Current/Drawing/Controls/PopupControl.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Controls/PopupControl.cs.meta
rename to com.unity.shadergraph/Editor/Current/Drawing/Controls/PopupControl.cs.meta
diff --git a/com.unity.shadergraph/Editor/Drawing/Controls/SliderControl.cs b/com.unity.shadergraph/Editor/Current/Drawing/Controls/SliderControl.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Controls/SliderControl.cs
rename to com.unity.shadergraph/Editor/Current/Drawing/Controls/SliderControl.cs
diff --git a/com.unity.shadergraph/Editor/Drawing/Controls/SliderControl.cs.meta b/com.unity.shadergraph/Editor/Current/Drawing/Controls/SliderControl.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Controls/SliderControl.cs.meta
rename to com.unity.shadergraph/Editor/Current/Drawing/Controls/SliderControl.cs.meta
diff --git a/com.unity.shadergraph/Editor/Drawing/Controls/TextControl.cs b/com.unity.shadergraph/Editor/Current/Drawing/Controls/TextControl.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Controls/TextControl.cs
rename to com.unity.shadergraph/Editor/Current/Drawing/Controls/TextControl.cs
diff --git a/com.unity.shadergraph/Editor/Drawing/Controls/TextControl.cs.meta b/com.unity.shadergraph/Editor/Current/Drawing/Controls/TextControl.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Controls/TextControl.cs.meta
rename to com.unity.shadergraph/Editor/Current/Drawing/Controls/TextControl.cs.meta
diff --git a/com.unity.shadergraph/Editor/Drawing/Controls/Texture3DControl.cs b/com.unity.shadergraph/Editor/Current/Drawing/Controls/Texture3DControl.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Controls/Texture3DControl.cs
rename to com.unity.shadergraph/Editor/Current/Drawing/Controls/Texture3DControl.cs
diff --git a/com.unity.shadergraph/Editor/Drawing/Controls/Texture3DControl.cs.meta b/com.unity.shadergraph/Editor/Current/Drawing/Controls/Texture3DControl.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Controls/Texture3DControl.cs.meta
rename to com.unity.shadergraph/Editor/Current/Drawing/Controls/Texture3DControl.cs.meta
diff --git a/com.unity.shadergraph/Editor/Drawing/Controls/TextureArrayControl.cs b/com.unity.shadergraph/Editor/Current/Drawing/Controls/TextureArrayControl.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Controls/TextureArrayControl.cs
rename to com.unity.shadergraph/Editor/Current/Drawing/Controls/TextureArrayControl.cs
diff --git a/com.unity.shadergraph/Editor/Drawing/Controls/TextureArrayControl.cs.meta b/com.unity.shadergraph/Editor/Current/Drawing/Controls/TextureArrayControl.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Controls/TextureArrayControl.cs.meta
rename to com.unity.shadergraph/Editor/Current/Drawing/Controls/TextureArrayControl.cs.meta
diff --git a/com.unity.shadergraph/Editor/Drawing/Controls/TextureControl.cs b/com.unity.shadergraph/Editor/Current/Drawing/Controls/TextureControl.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Controls/TextureControl.cs
rename to com.unity.shadergraph/Editor/Current/Drawing/Controls/TextureControl.cs
diff --git a/com.unity.shadergraph/Editor/Drawing/Controls/TextureControl.cs.meta b/com.unity.shadergraph/Editor/Current/Drawing/Controls/TextureControl.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Controls/TextureControl.cs.meta
rename to com.unity.shadergraph/Editor/Current/Drawing/Controls/TextureControl.cs.meta
diff --git a/com.unity.shadergraph/Editor/Drawing/Controls/ToggleControl.cs b/com.unity.shadergraph/Editor/Current/Drawing/Controls/ToggleControl.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Controls/ToggleControl.cs
rename to com.unity.shadergraph/Editor/Current/Drawing/Controls/ToggleControl.cs
diff --git a/com.unity.shadergraph/Editor/Drawing/Controls/ToggleControl.cs.meta b/com.unity.shadergraph/Editor/Current/Drawing/Controls/ToggleControl.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Controls/ToggleControl.cs.meta
rename to com.unity.shadergraph/Editor/Current/Drawing/Controls/ToggleControl.cs.meta
diff --git a/com.unity.shadergraph/Editor/Drawing/Controls/VectorControl.cs b/com.unity.shadergraph/Editor/Current/Drawing/Controls/VectorControl.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Controls/VectorControl.cs
rename to com.unity.shadergraph/Editor/Current/Drawing/Controls/VectorControl.cs
diff --git a/com.unity.shadergraph/Editor/Drawing/Controls/VectorControl.cs.meta b/com.unity.shadergraph/Editor/Current/Drawing/Controls/VectorControl.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Controls/VectorControl.cs.meta
rename to com.unity.shadergraph/Editor/Current/Drawing/Controls/VectorControl.cs.meta
diff --git a/com.unity.shadergraph/Editor/Drawing/EdgeConnectorListener.cs b/com.unity.shadergraph/Editor/Current/Drawing/EdgeConnectorListener.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/EdgeConnectorListener.cs
rename to com.unity.shadergraph/Editor/Current/Drawing/EdgeConnectorListener.cs
diff --git a/com.unity.shadergraph/Editor/Drawing/EdgeConnectorListener.cs.meta b/com.unity.shadergraph/Editor/Current/Drawing/EdgeConnectorListener.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/EdgeConnectorListener.cs.meta
rename to com.unity.shadergraph/Editor/Current/Drawing/EdgeConnectorListener.cs.meta
diff --git a/com.unity.shadergraph/Editor/Drawing/INodeModificationListener.cs b/com.unity.shadergraph/Editor/Current/Drawing/INodeModificationListener.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/INodeModificationListener.cs
rename to com.unity.shadergraph/Editor/Current/Drawing/INodeModificationListener.cs
diff --git a/com.unity.shadergraph/Editor/Drawing/INodeModificationListener.cs.meta b/com.unity.shadergraph/Editor/Current/Drawing/INodeModificationListener.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/INodeModificationListener.cs.meta
rename to com.unity.shadergraph/Editor/Current/Drawing/INodeModificationListener.cs.meta
diff --git a/com.unity.shadergraph/Editor/Drawing/Inspector.meta b/com.unity.shadergraph/Editor/Current/Drawing/Inspector.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Inspector.meta
rename to com.unity.shadergraph/Editor/Current/Drawing/Inspector.meta
diff --git a/com.unity.shadergraph/Editor/Drawing/Inspector/InspectorView.cs b/com.unity.shadergraph/Editor/Current/Drawing/Inspector/InspectorView.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Inspector/InspectorView.cs
rename to com.unity.shadergraph/Editor/Current/Drawing/Inspector/InspectorView.cs
diff --git a/com.unity.shadergraph/Editor/Drawing/Inspector/InspectorView.cs.meta b/com.unity.shadergraph/Editor/Current/Drawing/Inspector/InspectorView.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Inspector/InspectorView.cs.meta
rename to com.unity.shadergraph/Editor/Current/Drawing/Inspector/InspectorView.cs.meta
diff --git a/com.unity.shadergraph/Editor/Drawing/Inspector/MasterPreviewView.cs b/com.unity.shadergraph/Editor/Current/Drawing/Inspector/MasterPreviewView.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Inspector/MasterPreviewView.cs
rename to com.unity.shadergraph/Editor/Current/Drawing/Inspector/MasterPreviewView.cs
diff --git a/com.unity.shadergraph/Editor/Drawing/Inspector/MasterPreviewView.cs.meta b/com.unity.shadergraph/Editor/Current/Drawing/Inspector/MasterPreviewView.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Inspector/MasterPreviewView.cs.meta
rename to com.unity.shadergraph/Editor/Current/Drawing/Inspector/MasterPreviewView.cs.meta
diff --git a/com.unity.shadergraph/Editor/Drawing/Inspector/PropertyDrawerUtils.cs b/com.unity.shadergraph/Editor/Current/Drawing/Inspector/PropertyDrawerUtils.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Inspector/PropertyDrawerUtils.cs
rename to com.unity.shadergraph/Editor/Current/Drawing/Inspector/PropertyDrawerUtils.cs
diff --git a/com.unity.shadergraph/Editor/Drawing/Inspector/PropertyDrawerUtils.cs.meta b/com.unity.shadergraph/Editor/Current/Drawing/Inspector/PropertyDrawerUtils.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Inspector/PropertyDrawerUtils.cs.meta
rename to com.unity.shadergraph/Editor/Current/Drawing/Inspector/PropertyDrawerUtils.cs.meta
diff --git a/com.unity.shadergraph/Editor/Drawing/Inspector/PropertyDrawers.meta b/com.unity.shadergraph/Editor/Current/Drawing/Inspector/PropertyDrawers.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Inspector/PropertyDrawers.meta
rename to com.unity.shadergraph/Editor/Current/Drawing/Inspector/PropertyDrawers.meta
diff --git a/com.unity.shadergraph/Editor/Drawing/Inspector/PropertyDrawers/AbstractMaterialNodePropertyDrawer.cs b/com.unity.shadergraph/Editor/Current/Drawing/Inspector/PropertyDrawers/AbstractMaterialNodePropertyDrawer.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Inspector/PropertyDrawers/AbstractMaterialNodePropertyDrawer.cs
rename to com.unity.shadergraph/Editor/Current/Drawing/Inspector/PropertyDrawers/AbstractMaterialNodePropertyDrawer.cs
diff --git a/com.unity.shadergraph/Editor/Drawing/Inspector/PropertyDrawers/AbstractMaterialNodePropertyDrawer.cs.meta b/com.unity.shadergraph/Editor/Current/Drawing/Inspector/PropertyDrawers/AbstractMaterialNodePropertyDrawer.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Inspector/PropertyDrawers/AbstractMaterialNodePropertyDrawer.cs.meta
rename to com.unity.shadergraph/Editor/Current/Drawing/Inspector/PropertyDrawers/AbstractMaterialNodePropertyDrawer.cs.meta
diff --git a/com.unity.shadergraph/Editor/Drawing/Inspector/PropertyDrawers/BoolPropertyDrawer.cs b/com.unity.shadergraph/Editor/Current/Drawing/Inspector/PropertyDrawers/BoolPropertyDrawer.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Inspector/PropertyDrawers/BoolPropertyDrawer.cs
rename to com.unity.shadergraph/Editor/Current/Drawing/Inspector/PropertyDrawers/BoolPropertyDrawer.cs
diff --git a/com.unity.shadergraph/Editor/Drawing/Inspector/PropertyDrawers/BoolPropertyDrawer.cs.meta b/com.unity.shadergraph/Editor/Current/Drawing/Inspector/PropertyDrawers/BoolPropertyDrawer.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Inspector/PropertyDrawers/BoolPropertyDrawer.cs.meta
rename to com.unity.shadergraph/Editor/Current/Drawing/Inspector/PropertyDrawers/BoolPropertyDrawer.cs.meta
diff --git a/com.unity.shadergraph/Editor/Drawing/Inspector/PropertyDrawers/ColorPropertyDrawer.cs b/com.unity.shadergraph/Editor/Current/Drawing/Inspector/PropertyDrawers/ColorPropertyDrawer.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Inspector/PropertyDrawers/ColorPropertyDrawer.cs
rename to com.unity.shadergraph/Editor/Current/Drawing/Inspector/PropertyDrawers/ColorPropertyDrawer.cs
diff --git a/com.unity.shadergraph/Editor/Drawing/Inspector/PropertyDrawers/ColorPropertyDrawer.cs.meta b/com.unity.shadergraph/Editor/Current/Drawing/Inspector/PropertyDrawers/ColorPropertyDrawer.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Inspector/PropertyDrawers/ColorPropertyDrawer.cs.meta
rename to com.unity.shadergraph/Editor/Current/Drawing/Inspector/PropertyDrawers/ColorPropertyDrawer.cs.meta
diff --git a/com.unity.shadergraph/Editor/Drawing/Inspector/PropertyDrawers/CubemapPropertyDrawer.cs b/com.unity.shadergraph/Editor/Current/Drawing/Inspector/PropertyDrawers/CubemapPropertyDrawer.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Inspector/PropertyDrawers/CubemapPropertyDrawer.cs
rename to com.unity.shadergraph/Editor/Current/Drawing/Inspector/PropertyDrawers/CubemapPropertyDrawer.cs
diff --git a/com.unity.shadergraph/Editor/Drawing/Inspector/PropertyDrawers/CubemapPropertyDrawer.cs.meta b/com.unity.shadergraph/Editor/Current/Drawing/Inspector/PropertyDrawers/CubemapPropertyDrawer.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Inspector/PropertyDrawers/CubemapPropertyDrawer.cs.meta
rename to com.unity.shadergraph/Editor/Current/Drawing/Inspector/PropertyDrawers/CubemapPropertyDrawer.cs.meta
diff --git a/com.unity.shadergraph/Editor/Drawing/Inspector/PropertyDrawers/CustomFunctionNodePropertyDrawer.cs b/com.unity.shadergraph/Editor/Current/Drawing/Inspector/PropertyDrawers/CustomFunctionNodePropertyDrawer.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Inspector/PropertyDrawers/CustomFunctionNodePropertyDrawer.cs
rename to com.unity.shadergraph/Editor/Current/Drawing/Inspector/PropertyDrawers/CustomFunctionNodePropertyDrawer.cs
diff --git a/com.unity.shadergraph/Editor/Drawing/Inspector/PropertyDrawers/CustomFunctionNodePropertyDrawer.cs.meta b/com.unity.shadergraph/Editor/Current/Drawing/Inspector/PropertyDrawers/CustomFunctionNodePropertyDrawer.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Inspector/PropertyDrawers/CustomFunctionNodePropertyDrawer.cs.meta
rename to com.unity.shadergraph/Editor/Current/Drawing/Inspector/PropertyDrawers/CustomFunctionNodePropertyDrawer.cs.meta
diff --git a/com.unity.shadergraph/Editor/Drawing/Inspector/PropertyDrawers/DropdownPropertyDrawer.cs b/com.unity.shadergraph/Editor/Current/Drawing/Inspector/PropertyDrawers/DropdownPropertyDrawer.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Inspector/PropertyDrawers/DropdownPropertyDrawer.cs
rename to com.unity.shadergraph/Editor/Current/Drawing/Inspector/PropertyDrawers/DropdownPropertyDrawer.cs
diff --git a/com.unity.shadergraph/Editor/Drawing/Inspector/PropertyDrawers/DropdownPropertyDrawer.cs.meta b/com.unity.shadergraph/Editor/Current/Drawing/Inspector/PropertyDrawers/DropdownPropertyDrawer.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Inspector/PropertyDrawers/DropdownPropertyDrawer.cs.meta
rename to com.unity.shadergraph/Editor/Current/Drawing/Inspector/PropertyDrawers/DropdownPropertyDrawer.cs.meta
diff --git a/com.unity.shadergraph/Editor/Drawing/Inspector/PropertyDrawers/EnumPropertyDrawer.cs b/com.unity.shadergraph/Editor/Current/Drawing/Inspector/PropertyDrawers/EnumPropertyDrawer.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Inspector/PropertyDrawers/EnumPropertyDrawer.cs
rename to com.unity.shadergraph/Editor/Current/Drawing/Inspector/PropertyDrawers/EnumPropertyDrawer.cs
diff --git a/com.unity.shadergraph/Editor/Drawing/Inspector/PropertyDrawers/EnumPropertyDrawer.cs.meta b/com.unity.shadergraph/Editor/Current/Drawing/Inspector/PropertyDrawers/EnumPropertyDrawer.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Inspector/PropertyDrawers/EnumPropertyDrawer.cs.meta
rename to com.unity.shadergraph/Editor/Current/Drawing/Inspector/PropertyDrawers/EnumPropertyDrawer.cs.meta
diff --git a/com.unity.shadergraph/Editor/Drawing/Inspector/PropertyDrawers/FloatPropertyDrawer.cs b/com.unity.shadergraph/Editor/Current/Drawing/Inspector/PropertyDrawers/FloatPropertyDrawer.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Inspector/PropertyDrawers/FloatPropertyDrawer.cs
rename to com.unity.shadergraph/Editor/Current/Drawing/Inspector/PropertyDrawers/FloatPropertyDrawer.cs
diff --git a/com.unity.shadergraph/Editor/Drawing/Inspector/PropertyDrawers/FloatPropertyDrawer.cs.meta b/com.unity.shadergraph/Editor/Current/Drawing/Inspector/PropertyDrawers/FloatPropertyDrawer.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Inspector/PropertyDrawers/FloatPropertyDrawer.cs.meta
rename to com.unity.shadergraph/Editor/Current/Drawing/Inspector/PropertyDrawers/FloatPropertyDrawer.cs.meta
diff --git a/com.unity.shadergraph/Editor/Drawing/Inspector/PropertyDrawers/GradientPropertyDrawer.cs b/com.unity.shadergraph/Editor/Current/Drawing/Inspector/PropertyDrawers/GradientPropertyDrawer.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Inspector/PropertyDrawers/GradientPropertyDrawer.cs
rename to com.unity.shadergraph/Editor/Current/Drawing/Inspector/PropertyDrawers/GradientPropertyDrawer.cs
diff --git a/com.unity.shadergraph/Editor/Drawing/Inspector/PropertyDrawers/GradientPropertyDrawer.cs.meta b/com.unity.shadergraph/Editor/Current/Drawing/Inspector/PropertyDrawers/GradientPropertyDrawer.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Inspector/PropertyDrawers/GradientPropertyDrawer.cs.meta
rename to com.unity.shadergraph/Editor/Current/Drawing/Inspector/PropertyDrawers/GradientPropertyDrawer.cs.meta
diff --git a/com.unity.shadergraph/Editor/Drawing/Inspector/PropertyDrawers/GraphDataPropertyDrawer.cs b/com.unity.shadergraph/Editor/Current/Drawing/Inspector/PropertyDrawers/GraphDataPropertyDrawer.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Inspector/PropertyDrawers/GraphDataPropertyDrawer.cs
rename to com.unity.shadergraph/Editor/Current/Drawing/Inspector/PropertyDrawers/GraphDataPropertyDrawer.cs
diff --git a/com.unity.shadergraph/Editor/Drawing/Inspector/PropertyDrawers/GraphDataPropertyDrawer.cs.meta b/com.unity.shadergraph/Editor/Current/Drawing/Inspector/PropertyDrawers/GraphDataPropertyDrawer.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Inspector/PropertyDrawers/GraphDataPropertyDrawer.cs.meta
rename to com.unity.shadergraph/Editor/Current/Drawing/Inspector/PropertyDrawers/GraphDataPropertyDrawer.cs.meta
diff --git a/com.unity.shadergraph/Editor/Drawing/Inspector/PropertyDrawers/IShaderPropertyDrawer.cs b/com.unity.shadergraph/Editor/Current/Drawing/Inspector/PropertyDrawers/IShaderPropertyDrawer.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Inspector/PropertyDrawers/IShaderPropertyDrawer.cs
rename to com.unity.shadergraph/Editor/Current/Drawing/Inspector/PropertyDrawers/IShaderPropertyDrawer.cs
diff --git a/com.unity.shadergraph/Editor/Drawing/Inspector/PropertyDrawers/IShaderPropertyDrawer.cs.meta b/com.unity.shadergraph/Editor/Current/Drawing/Inspector/PropertyDrawers/IShaderPropertyDrawer.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Inspector/PropertyDrawers/IShaderPropertyDrawer.cs.meta
rename to com.unity.shadergraph/Editor/Current/Drawing/Inspector/PropertyDrawers/IShaderPropertyDrawer.cs.meta
diff --git a/com.unity.shadergraph/Editor/Drawing/Inspector/PropertyDrawers/IntegerPropertyDrawer.cs b/com.unity.shadergraph/Editor/Current/Drawing/Inspector/PropertyDrawers/IntegerPropertyDrawer.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Inspector/PropertyDrawers/IntegerPropertyDrawer.cs
rename to com.unity.shadergraph/Editor/Current/Drawing/Inspector/PropertyDrawers/IntegerPropertyDrawer.cs
diff --git a/com.unity.shadergraph/Editor/Drawing/Inspector/PropertyDrawers/IntegerPropertyDrawer.cs.meta b/com.unity.shadergraph/Editor/Current/Drawing/Inspector/PropertyDrawers/IntegerPropertyDrawer.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Inspector/PropertyDrawers/IntegerPropertyDrawer.cs.meta
rename to com.unity.shadergraph/Editor/Current/Drawing/Inspector/PropertyDrawers/IntegerPropertyDrawer.cs.meta
diff --git a/com.unity.shadergraph/Editor/Drawing/Inspector/PropertyDrawers/MatrixPropertyDrawer.cs b/com.unity.shadergraph/Editor/Current/Drawing/Inspector/PropertyDrawers/MatrixPropertyDrawer.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Inspector/PropertyDrawers/MatrixPropertyDrawer.cs
rename to com.unity.shadergraph/Editor/Current/Drawing/Inspector/PropertyDrawers/MatrixPropertyDrawer.cs
diff --git a/com.unity.shadergraph/Editor/Drawing/Inspector/PropertyDrawers/MatrixPropertyDrawer.cs.meta b/com.unity.shadergraph/Editor/Current/Drawing/Inspector/PropertyDrawers/MatrixPropertyDrawer.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Inspector/PropertyDrawers/MatrixPropertyDrawer.cs.meta
rename to com.unity.shadergraph/Editor/Current/Drawing/Inspector/PropertyDrawers/MatrixPropertyDrawer.cs.meta
diff --git a/com.unity.shadergraph/Editor/Drawing/Inspector/PropertyDrawers/PositionNodePropertyDrawer.cs b/com.unity.shadergraph/Editor/Current/Drawing/Inspector/PropertyDrawers/PositionNodePropertyDrawer.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Inspector/PropertyDrawers/PositionNodePropertyDrawer.cs
rename to com.unity.shadergraph/Editor/Current/Drawing/Inspector/PropertyDrawers/PositionNodePropertyDrawer.cs
diff --git a/com.unity.shadergraph/Editor/Drawing/Inspector/PropertyDrawers/PositionNodePropertyDrawer.cs.meta b/com.unity.shadergraph/Editor/Current/Drawing/Inspector/PropertyDrawers/PositionNodePropertyDrawer.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Inspector/PropertyDrawers/PositionNodePropertyDrawer.cs.meta
rename to com.unity.shadergraph/Editor/Current/Drawing/Inspector/PropertyDrawers/PositionNodePropertyDrawer.cs.meta
diff --git a/com.unity.shadergraph/Editor/Drawing/Inspector/PropertyDrawers/SampleTexture2DArrayNodePropertyDrawer.cs b/com.unity.shadergraph/Editor/Current/Drawing/Inspector/PropertyDrawers/SampleTexture2DArrayNodePropertyDrawer.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Inspector/PropertyDrawers/SampleTexture2DArrayNodePropertyDrawer.cs
rename to com.unity.shadergraph/Editor/Current/Drawing/Inspector/PropertyDrawers/SampleTexture2DArrayNodePropertyDrawer.cs
diff --git a/com.unity.shadergraph/Editor/Drawing/Inspector/PropertyDrawers/SampleTexture2DArrayNodePropertyDrawer.cs.meta b/com.unity.shadergraph/Editor/Current/Drawing/Inspector/PropertyDrawers/SampleTexture2DArrayNodePropertyDrawer.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Inspector/PropertyDrawers/SampleTexture2DArrayNodePropertyDrawer.cs.meta
rename to com.unity.shadergraph/Editor/Current/Drawing/Inspector/PropertyDrawers/SampleTexture2DArrayNodePropertyDrawer.cs.meta
diff --git a/com.unity.shadergraph/Editor/Drawing/Inspector/PropertyDrawers/SampleTexture2DNodePropertyDrawer.cs b/com.unity.shadergraph/Editor/Current/Drawing/Inspector/PropertyDrawers/SampleTexture2DNodePropertyDrawer.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Inspector/PropertyDrawers/SampleTexture2DNodePropertyDrawer.cs
rename to com.unity.shadergraph/Editor/Current/Drawing/Inspector/PropertyDrawers/SampleTexture2DNodePropertyDrawer.cs
diff --git a/com.unity.shadergraph/Editor/Drawing/Inspector/PropertyDrawers/SampleTexture2DNodePropertyDrawer.cs.meta b/com.unity.shadergraph/Editor/Current/Drawing/Inspector/PropertyDrawers/SampleTexture2DNodePropertyDrawer.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Inspector/PropertyDrawers/SampleTexture2DNodePropertyDrawer.cs.meta
rename to com.unity.shadergraph/Editor/Current/Drawing/Inspector/PropertyDrawers/SampleTexture2DNodePropertyDrawer.cs.meta
diff --git a/com.unity.shadergraph/Editor/Drawing/Inspector/PropertyDrawers/SampleVirtualTextureNodePropertyDrawer.cs b/com.unity.shadergraph/Editor/Current/Drawing/Inspector/PropertyDrawers/SampleVirtualTextureNodePropertyDrawer.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Inspector/PropertyDrawers/SampleVirtualTextureNodePropertyDrawer.cs
rename to com.unity.shadergraph/Editor/Current/Drawing/Inspector/PropertyDrawers/SampleVirtualTextureNodePropertyDrawer.cs
diff --git a/com.unity.shadergraph/Editor/Drawing/Inspector/PropertyDrawers/SampleVirtualTextureNodePropertyDrawer.cs.meta b/com.unity.shadergraph/Editor/Current/Drawing/Inspector/PropertyDrawers/SampleVirtualTextureNodePropertyDrawer.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Inspector/PropertyDrawers/SampleVirtualTextureNodePropertyDrawer.cs.meta
rename to com.unity.shadergraph/Editor/Current/Drawing/Inspector/PropertyDrawers/SampleVirtualTextureNodePropertyDrawer.cs.meta
diff --git a/com.unity.shadergraph/Editor/Drawing/Inspector/PropertyDrawers/ShaderInputPropertyDrawer.cs b/com.unity.shadergraph/Editor/Current/Drawing/Inspector/PropertyDrawers/ShaderInputPropertyDrawer.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Inspector/PropertyDrawers/ShaderInputPropertyDrawer.cs
rename to com.unity.shadergraph/Editor/Current/Drawing/Inspector/PropertyDrawers/ShaderInputPropertyDrawer.cs
diff --git a/com.unity.shadergraph/Editor/Drawing/Inspector/PropertyDrawers/ShaderInputPropertyDrawer.cs.meta b/com.unity.shadergraph/Editor/Current/Drawing/Inspector/PropertyDrawers/ShaderInputPropertyDrawer.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Inspector/PropertyDrawers/ShaderInputPropertyDrawer.cs.meta
rename to com.unity.shadergraph/Editor/Current/Drawing/Inspector/PropertyDrawers/ShaderInputPropertyDrawer.cs.meta
diff --git a/com.unity.shadergraph/Editor/Drawing/Inspector/PropertyDrawers/SubGraphOutputNodePropertyDrawer.cs b/com.unity.shadergraph/Editor/Current/Drawing/Inspector/PropertyDrawers/SubGraphOutputNodePropertyDrawer.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Inspector/PropertyDrawers/SubGraphOutputNodePropertyDrawer.cs
rename to com.unity.shadergraph/Editor/Current/Drawing/Inspector/PropertyDrawers/SubGraphOutputNodePropertyDrawer.cs
diff --git a/com.unity.shadergraph/Editor/Drawing/Inspector/PropertyDrawers/SubGraphOutputNodePropertyDrawer.cs.meta b/com.unity.shadergraph/Editor/Current/Drawing/Inspector/PropertyDrawers/SubGraphOutputNodePropertyDrawer.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Inspector/PropertyDrawers/SubGraphOutputNodePropertyDrawer.cs.meta
rename to com.unity.shadergraph/Editor/Current/Drawing/Inspector/PropertyDrawers/SubGraphOutputNodePropertyDrawer.cs.meta
diff --git a/com.unity.shadergraph/Editor/Drawing/Inspector/PropertyDrawers/TextPropertyDrawer.cs b/com.unity.shadergraph/Editor/Current/Drawing/Inspector/PropertyDrawers/TextPropertyDrawer.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Inspector/PropertyDrawers/TextPropertyDrawer.cs
rename to com.unity.shadergraph/Editor/Current/Drawing/Inspector/PropertyDrawers/TextPropertyDrawer.cs
diff --git a/com.unity.shadergraph/Editor/Drawing/Inspector/PropertyDrawers/TextPropertyDrawer.cs.meta b/com.unity.shadergraph/Editor/Current/Drawing/Inspector/PropertyDrawers/TextPropertyDrawer.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Inspector/PropertyDrawers/TextPropertyDrawer.cs.meta
rename to com.unity.shadergraph/Editor/Current/Drawing/Inspector/PropertyDrawers/TextPropertyDrawer.cs.meta
diff --git a/com.unity.shadergraph/Editor/Drawing/Inspector/PropertyDrawers/Texture2DArrayPropertyDrawer.cs b/com.unity.shadergraph/Editor/Current/Drawing/Inspector/PropertyDrawers/Texture2DArrayPropertyDrawer.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Inspector/PropertyDrawers/Texture2DArrayPropertyDrawer.cs
rename to com.unity.shadergraph/Editor/Current/Drawing/Inspector/PropertyDrawers/Texture2DArrayPropertyDrawer.cs
diff --git a/com.unity.shadergraph/Editor/Drawing/Inspector/PropertyDrawers/Texture2DArrayPropertyDrawer.cs.meta b/com.unity.shadergraph/Editor/Current/Drawing/Inspector/PropertyDrawers/Texture2DArrayPropertyDrawer.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Inspector/PropertyDrawers/Texture2DArrayPropertyDrawer.cs.meta
rename to com.unity.shadergraph/Editor/Current/Drawing/Inspector/PropertyDrawers/Texture2DArrayPropertyDrawer.cs.meta
diff --git a/com.unity.shadergraph/Editor/Drawing/Inspector/PropertyDrawers/Texture2DPropertyDrawer.cs b/com.unity.shadergraph/Editor/Current/Drawing/Inspector/PropertyDrawers/Texture2DPropertyDrawer.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Inspector/PropertyDrawers/Texture2DPropertyDrawer.cs
rename to com.unity.shadergraph/Editor/Current/Drawing/Inspector/PropertyDrawers/Texture2DPropertyDrawer.cs
diff --git a/com.unity.shadergraph/Editor/Drawing/Inspector/PropertyDrawers/Texture2DPropertyDrawer.cs.meta b/com.unity.shadergraph/Editor/Current/Drawing/Inspector/PropertyDrawers/Texture2DPropertyDrawer.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Inspector/PropertyDrawers/Texture2DPropertyDrawer.cs.meta
rename to com.unity.shadergraph/Editor/Current/Drawing/Inspector/PropertyDrawers/Texture2DPropertyDrawer.cs.meta
diff --git a/com.unity.shadergraph/Editor/Drawing/Inspector/PropertyDrawers/Texture3DPropertyDrawer.cs b/com.unity.shadergraph/Editor/Current/Drawing/Inspector/PropertyDrawers/Texture3DPropertyDrawer.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Inspector/PropertyDrawers/Texture3DPropertyDrawer.cs
rename to com.unity.shadergraph/Editor/Current/Drawing/Inspector/PropertyDrawers/Texture3DPropertyDrawer.cs
diff --git a/com.unity.shadergraph/Editor/Drawing/Inspector/PropertyDrawers/Texture3DPropertyDrawer.cs.meta b/com.unity.shadergraph/Editor/Current/Drawing/Inspector/PropertyDrawers/Texture3DPropertyDrawer.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Inspector/PropertyDrawers/Texture3DPropertyDrawer.cs.meta
rename to com.unity.shadergraph/Editor/Current/Drawing/Inspector/PropertyDrawers/Texture3DPropertyDrawer.cs.meta
diff --git a/com.unity.shadergraph/Editor/Drawing/Inspector/PropertyDrawers/ToggleDataPropertyDrawer.cs b/com.unity.shadergraph/Editor/Current/Drawing/Inspector/PropertyDrawers/ToggleDataPropertyDrawer.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Inspector/PropertyDrawers/ToggleDataPropertyDrawer.cs
rename to com.unity.shadergraph/Editor/Current/Drawing/Inspector/PropertyDrawers/ToggleDataPropertyDrawer.cs
diff --git a/com.unity.shadergraph/Editor/Drawing/Inspector/PropertyDrawers/ToggleDataPropertyDrawer.cs.meta b/com.unity.shadergraph/Editor/Current/Drawing/Inspector/PropertyDrawers/ToggleDataPropertyDrawer.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Inspector/PropertyDrawers/ToggleDataPropertyDrawer.cs.meta
rename to com.unity.shadergraph/Editor/Current/Drawing/Inspector/PropertyDrawers/ToggleDataPropertyDrawer.cs.meta
diff --git a/com.unity.shadergraph/Editor/Drawing/Inspector/PropertyDrawers/Vector2PropertyDrawer.cs b/com.unity.shadergraph/Editor/Current/Drawing/Inspector/PropertyDrawers/Vector2PropertyDrawer.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Inspector/PropertyDrawers/Vector2PropertyDrawer.cs
rename to com.unity.shadergraph/Editor/Current/Drawing/Inspector/PropertyDrawers/Vector2PropertyDrawer.cs
diff --git a/com.unity.shadergraph/Editor/Drawing/Inspector/PropertyDrawers/Vector2PropertyDrawer.cs.meta b/com.unity.shadergraph/Editor/Current/Drawing/Inspector/PropertyDrawers/Vector2PropertyDrawer.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Inspector/PropertyDrawers/Vector2PropertyDrawer.cs.meta
rename to com.unity.shadergraph/Editor/Current/Drawing/Inspector/PropertyDrawers/Vector2PropertyDrawer.cs.meta
diff --git a/com.unity.shadergraph/Editor/Drawing/Inspector/PropertyDrawers/Vector3PropertyDrawer.cs b/com.unity.shadergraph/Editor/Current/Drawing/Inspector/PropertyDrawers/Vector3PropertyDrawer.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Inspector/PropertyDrawers/Vector3PropertyDrawer.cs
rename to com.unity.shadergraph/Editor/Current/Drawing/Inspector/PropertyDrawers/Vector3PropertyDrawer.cs
diff --git a/com.unity.shadergraph/Editor/Drawing/Inspector/PropertyDrawers/Vector3PropertyDrawer.cs.meta b/com.unity.shadergraph/Editor/Current/Drawing/Inspector/PropertyDrawers/Vector3PropertyDrawer.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Inspector/PropertyDrawers/Vector3PropertyDrawer.cs.meta
rename to com.unity.shadergraph/Editor/Current/Drawing/Inspector/PropertyDrawers/Vector3PropertyDrawer.cs.meta
diff --git a/com.unity.shadergraph/Editor/Drawing/Inspector/PropertyDrawers/Vector4PropertyDrawer.cs b/com.unity.shadergraph/Editor/Current/Drawing/Inspector/PropertyDrawers/Vector4PropertyDrawer.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Inspector/PropertyDrawers/Vector4PropertyDrawer.cs
rename to com.unity.shadergraph/Editor/Current/Drawing/Inspector/PropertyDrawers/Vector4PropertyDrawer.cs
diff --git a/com.unity.shadergraph/Editor/Drawing/Inspector/PropertyDrawers/Vector4PropertyDrawer.cs.meta b/com.unity.shadergraph/Editor/Current/Drawing/Inspector/PropertyDrawers/Vector4PropertyDrawer.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Inspector/PropertyDrawers/Vector4PropertyDrawer.cs.meta
rename to com.unity.shadergraph/Editor/Current/Drawing/Inspector/PropertyDrawers/Vector4PropertyDrawer.cs.meta
diff --git a/com.unity.shadergraph/Editor/Drawing/Inspector/TabbedView.meta b/com.unity.shadergraph/Editor/Current/Drawing/Inspector/TabbedView.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Inspector/TabbedView.meta
rename to com.unity.shadergraph/Editor/Current/Drawing/Inspector/TabbedView.meta
diff --git a/com.unity.shadergraph/Editor/Drawing/Inspector/TabbedView/TabButton.cs b/com.unity.shadergraph/Editor/Current/Drawing/Inspector/TabbedView/TabButton.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Inspector/TabbedView/TabButton.cs
rename to com.unity.shadergraph/Editor/Current/Drawing/Inspector/TabbedView/TabButton.cs
diff --git a/com.unity.shadergraph/Editor/Drawing/Inspector/TabbedView/TabButton.cs.meta b/com.unity.shadergraph/Editor/Current/Drawing/Inspector/TabbedView/TabButton.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Inspector/TabbedView/TabButton.cs.meta
rename to com.unity.shadergraph/Editor/Current/Drawing/Inspector/TabbedView/TabButton.cs.meta
diff --git a/com.unity.shadergraph/Editor/Drawing/Inspector/TabbedView/TabbedView.cs b/com.unity.shadergraph/Editor/Current/Drawing/Inspector/TabbedView/TabbedView.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Inspector/TabbedView/TabbedView.cs
rename to com.unity.shadergraph/Editor/Current/Drawing/Inspector/TabbedView/TabbedView.cs
diff --git a/com.unity.shadergraph/Editor/Drawing/Inspector/TabbedView/TabbedView.cs.meta b/com.unity.shadergraph/Editor/Current/Drawing/Inspector/TabbedView/TabbedView.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Inspector/TabbedView/TabbedView.cs.meta
rename to com.unity.shadergraph/Editor/Current/Drawing/Inspector/TabbedView/TabbedView.cs.meta
diff --git a/com.unity.shadergraph/Editor/Drawing/Inspector/WindowDockingLayout.cs b/com.unity.shadergraph/Editor/Current/Drawing/Inspector/WindowDockingLayout.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Inspector/WindowDockingLayout.cs
rename to com.unity.shadergraph/Editor/Current/Drawing/Inspector/WindowDockingLayout.cs
diff --git a/com.unity.shadergraph/Editor/Drawing/Inspector/WindowDockingLayout.cs.meta b/com.unity.shadergraph/Editor/Current/Drawing/Inspector/WindowDockingLayout.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Inspector/WindowDockingLayout.cs.meta
rename to com.unity.shadergraph/Editor/Current/Drawing/Inspector/WindowDockingLayout.cs.meta
diff --git a/com.unity.shadergraph/Editor/Drawing/Interfaces.meta b/com.unity.shadergraph/Editor/Current/Drawing/Interfaces.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Interfaces.meta
rename to com.unity.shadergraph/Editor/Current/Drawing/Interfaces.meta
diff --git a/com.unity.shadergraph/Editor/Drawing/Interfaces/IRectInterface.cs b/com.unity.shadergraph/Editor/Current/Drawing/Interfaces/IRectInterface.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Interfaces/IRectInterface.cs
rename to com.unity.shadergraph/Editor/Current/Drawing/Interfaces/IRectInterface.cs
diff --git a/com.unity.shadergraph/Editor/Drawing/Interfaces/IRectInterface.cs.meta b/com.unity.shadergraph/Editor/Current/Drawing/Interfaces/IRectInterface.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Interfaces/IRectInterface.cs.meta
rename to com.unity.shadergraph/Editor/Current/Drawing/Interfaces/IRectInterface.cs.meta
diff --git a/com.unity.shadergraph/Editor/Drawing/Interfaces/IResizable.cs b/com.unity.shadergraph/Editor/Current/Drawing/Interfaces/IResizable.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Interfaces/IResizable.cs
rename to com.unity.shadergraph/Editor/Current/Drawing/Interfaces/IResizable.cs
diff --git a/com.unity.shadergraph/Editor/Drawing/Interfaces/IResizable.cs.meta b/com.unity.shadergraph/Editor/Current/Drawing/Interfaces/IResizable.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Interfaces/IResizable.cs.meta
rename to com.unity.shadergraph/Editor/Current/Drawing/Interfaces/IResizable.cs.meta
diff --git a/com.unity.shadergraph/Editor/Drawing/Interfaces/ISGControlledElement.cs b/com.unity.shadergraph/Editor/Current/Drawing/Interfaces/ISGControlledElement.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Interfaces/ISGControlledElement.cs
rename to com.unity.shadergraph/Editor/Current/Drawing/Interfaces/ISGControlledElement.cs
diff --git a/com.unity.shadergraph/Editor/Drawing/Interfaces/ISGControlledElement.cs.meta b/com.unity.shadergraph/Editor/Current/Drawing/Interfaces/ISGControlledElement.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Interfaces/ISGControlledElement.cs.meta
rename to com.unity.shadergraph/Editor/Current/Drawing/Interfaces/ISGControlledElement.cs.meta
diff --git a/com.unity.shadergraph/Editor/Drawing/Interfaces/ISGViewModel.cs b/com.unity.shadergraph/Editor/Current/Drawing/Interfaces/ISGViewModel.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Interfaces/ISGViewModel.cs
rename to com.unity.shadergraph/Editor/Current/Drawing/Interfaces/ISGViewModel.cs
diff --git a/com.unity.shadergraph/Editor/Drawing/Interfaces/ISGViewModel.cs.meta b/com.unity.shadergraph/Editor/Current/Drawing/Interfaces/ISGViewModel.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Interfaces/ISGViewModel.cs.meta
rename to com.unity.shadergraph/Editor/Current/Drawing/Interfaces/ISGViewModel.cs.meta
diff --git a/com.unity.shadergraph/Editor/Drawing/Manipulators.meta b/com.unity.shadergraph/Editor/Current/Drawing/Manipulators.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Manipulators.meta
rename to com.unity.shadergraph/Editor/Current/Drawing/Manipulators.meta
diff --git a/com.unity.shadergraph/Editor/Drawing/Manipulators/Draggable.cs b/com.unity.shadergraph/Editor/Current/Drawing/Manipulators/Draggable.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Manipulators/Draggable.cs
rename to com.unity.shadergraph/Editor/Current/Drawing/Manipulators/Draggable.cs
diff --git a/com.unity.shadergraph/Editor/Drawing/Manipulators/Draggable.cs.meta b/com.unity.shadergraph/Editor/Current/Drawing/Manipulators/Draggable.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Manipulators/Draggable.cs.meta
rename to com.unity.shadergraph/Editor/Current/Drawing/Manipulators/Draggable.cs.meta
diff --git a/com.unity.shadergraph/Editor/Drawing/Manipulators/ElementResizer.cs b/com.unity.shadergraph/Editor/Current/Drawing/Manipulators/ElementResizer.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Manipulators/ElementResizer.cs
rename to com.unity.shadergraph/Editor/Current/Drawing/Manipulators/ElementResizer.cs
diff --git a/com.unity.shadergraph/Editor/Drawing/Manipulators/ElementResizer.cs.meta b/com.unity.shadergraph/Editor/Current/Drawing/Manipulators/ElementResizer.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Manipulators/ElementResizer.cs.meta
rename to com.unity.shadergraph/Editor/Current/Drawing/Manipulators/ElementResizer.cs.meta
diff --git a/com.unity.shadergraph/Editor/Drawing/Manipulators/ResizeBorderFrame.cs b/com.unity.shadergraph/Editor/Current/Drawing/Manipulators/ResizeBorderFrame.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Manipulators/ResizeBorderFrame.cs
rename to com.unity.shadergraph/Editor/Current/Drawing/Manipulators/ResizeBorderFrame.cs
diff --git a/com.unity.shadergraph/Editor/Drawing/Manipulators/ResizeBorderFrame.cs.meta b/com.unity.shadergraph/Editor/Current/Drawing/Manipulators/ResizeBorderFrame.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Manipulators/ResizeBorderFrame.cs.meta
rename to com.unity.shadergraph/Editor/Current/Drawing/Manipulators/ResizeBorderFrame.cs.meta
diff --git a/com.unity.shadergraph/Editor/Drawing/Manipulators/ResizeSideHandle.cs b/com.unity.shadergraph/Editor/Current/Drawing/Manipulators/ResizeSideHandle.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Manipulators/ResizeSideHandle.cs
rename to com.unity.shadergraph/Editor/Current/Drawing/Manipulators/ResizeSideHandle.cs
diff --git a/com.unity.shadergraph/Editor/Drawing/Manipulators/ResizeSideHandle.cs.meta b/com.unity.shadergraph/Editor/Current/Drawing/Manipulators/ResizeSideHandle.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Manipulators/ResizeSideHandle.cs.meta
rename to com.unity.shadergraph/Editor/Current/Drawing/Manipulators/ResizeSideHandle.cs.meta
diff --git a/com.unity.shadergraph/Editor/Drawing/Manipulators/Scrollable.cs b/com.unity.shadergraph/Editor/Current/Drawing/Manipulators/Scrollable.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Manipulators/Scrollable.cs
rename to com.unity.shadergraph/Editor/Current/Drawing/Manipulators/Scrollable.cs
diff --git a/com.unity.shadergraph/Editor/Drawing/Manipulators/Scrollable.cs.meta b/com.unity.shadergraph/Editor/Current/Drawing/Manipulators/Scrollable.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Manipulators/Scrollable.cs.meta
rename to com.unity.shadergraph/Editor/Current/Drawing/Manipulators/Scrollable.cs.meta
diff --git a/com.unity.shadergraph/Editor/Drawing/Manipulators/WindowDraggable.cs b/com.unity.shadergraph/Editor/Current/Drawing/Manipulators/WindowDraggable.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Manipulators/WindowDraggable.cs
rename to com.unity.shadergraph/Editor/Current/Drawing/Manipulators/WindowDraggable.cs
diff --git a/com.unity.shadergraph/Editor/Drawing/Manipulators/WindowDraggable.cs.meta b/com.unity.shadergraph/Editor/Current/Drawing/Manipulators/WindowDraggable.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Manipulators/WindowDraggable.cs.meta
rename to com.unity.shadergraph/Editor/Current/Drawing/Manipulators/WindowDraggable.cs.meta
diff --git a/com.unity.shadergraph/Editor/Drawing/MaterialEditor.meta b/com.unity.shadergraph/Editor/Current/Drawing/MaterialEditor.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/MaterialEditor.meta
rename to com.unity.shadergraph/Editor/Current/Drawing/MaterialEditor.meta
diff --git a/com.unity.shadergraph/Editor/Drawing/MaterialEditor/ShaderGraphPropertyDrawers.cs b/com.unity.shadergraph/Editor/Current/Drawing/MaterialEditor/ShaderGraphPropertyDrawers.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/MaterialEditor/ShaderGraphPropertyDrawers.cs
rename to com.unity.shadergraph/Editor/Current/Drawing/MaterialEditor/ShaderGraphPropertyDrawers.cs
diff --git a/com.unity.shadergraph/Editor/Drawing/MaterialEditor/ShaderGraphPropertyDrawers.cs.meta b/com.unity.shadergraph/Editor/Current/Drawing/MaterialEditor/ShaderGraphPropertyDrawers.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/MaterialEditor/ShaderGraphPropertyDrawers.cs.meta
rename to com.unity.shadergraph/Editor/Current/Drawing/MaterialEditor/ShaderGraphPropertyDrawers.cs.meta
diff --git a/com.unity.shadergraph/Editor/Drawing/MaterialGraphEditWindow.cs b/com.unity.shadergraph/Editor/Current/Drawing/MaterialGraphEditWindow.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/MaterialGraphEditWindow.cs
rename to com.unity.shadergraph/Editor/Current/Drawing/MaterialGraphEditWindow.cs
diff --git a/com.unity.shadergraph/Editor/Drawing/MaterialGraphEditWindow.cs.meta b/com.unity.shadergraph/Editor/Current/Drawing/MaterialGraphEditWindow.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/MaterialGraphEditWindow.cs.meta
rename to com.unity.shadergraph/Editor/Current/Drawing/MaterialGraphEditWindow.cs.meta
diff --git a/com.unity.shadergraph/Editor/Drawing/MaterialGraphPreviewGenerator.cs b/com.unity.shadergraph/Editor/Current/Drawing/MaterialGraphPreviewGenerator.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/MaterialGraphPreviewGenerator.cs
rename to com.unity.shadergraph/Editor/Current/Drawing/MaterialGraphPreviewGenerator.cs
diff --git a/com.unity.shadergraph/Editor/Drawing/MaterialGraphPreviewGenerator.cs.meta b/com.unity.shadergraph/Editor/Current/Drawing/MaterialGraphPreviewGenerator.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/MaterialGraphPreviewGenerator.cs.meta
rename to com.unity.shadergraph/Editor/Current/Drawing/MaterialGraphPreviewGenerator.cs.meta
diff --git a/com.unity.shadergraph/Editor/Drawing/PreviewManager.cs b/com.unity.shadergraph/Editor/Current/Drawing/PreviewManager.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/PreviewManager.cs
rename to com.unity.shadergraph/Editor/Current/Drawing/PreviewManager.cs
diff --git a/com.unity.shadergraph/Editor/Drawing/PreviewManager.cs.meta b/com.unity.shadergraph/Editor/Current/Drawing/PreviewManager.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/PreviewManager.cs.meta
rename to com.unity.shadergraph/Editor/Current/Drawing/PreviewManager.cs.meta
diff --git a/com.unity.shadergraph/Editor/Drawing/SearchWindowAdapter.cs b/com.unity.shadergraph/Editor/Current/Drawing/SearchWindowAdapter.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/SearchWindowAdapter.cs
rename to com.unity.shadergraph/Editor/Current/Drawing/SearchWindowAdapter.cs
diff --git a/com.unity.shadergraph/Editor/Drawing/SearchWindowAdapter.cs.meta b/com.unity.shadergraph/Editor/Current/Drawing/SearchWindowAdapter.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/SearchWindowAdapter.cs.meta
rename to com.unity.shadergraph/Editor/Current/Drawing/SearchWindowAdapter.cs.meta
diff --git a/com.unity.shadergraph/Editor/Drawing/SearchWindowProvider.cs b/com.unity.shadergraph/Editor/Current/Drawing/SearchWindowProvider.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/SearchWindowProvider.cs
rename to com.unity.shadergraph/Editor/Current/Drawing/SearchWindowProvider.cs
diff --git a/com.unity.shadergraph/Editor/Drawing/SearchWindowProvider.cs.meta b/com.unity.shadergraph/Editor/Current/Drawing/SearchWindowProvider.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/SearchWindowProvider.cs.meta
rename to com.unity.shadergraph/Editor/Current/Drawing/SearchWindowProvider.cs.meta
diff --git a/com.unity.shadergraph/Editor/Drawing/ViewModels.meta b/com.unity.shadergraph/Editor/Current/Drawing/ViewModels.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/ViewModels.meta
rename to com.unity.shadergraph/Editor/Current/Drawing/ViewModels.meta
diff --git a/com.unity.shadergraph/Editor/Drawing/ViewModels/BlackboardCategoryViewModel.cs b/com.unity.shadergraph/Editor/Current/Drawing/ViewModels/BlackboardCategoryViewModel.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/ViewModels/BlackboardCategoryViewModel.cs
rename to com.unity.shadergraph/Editor/Current/Drawing/ViewModels/BlackboardCategoryViewModel.cs
diff --git a/com.unity.shadergraph/Editor/Drawing/ViewModels/BlackboardCategoryViewModel.cs.meta b/com.unity.shadergraph/Editor/Current/Drawing/ViewModels/BlackboardCategoryViewModel.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/ViewModels/BlackboardCategoryViewModel.cs.meta
rename to com.unity.shadergraph/Editor/Current/Drawing/ViewModels/BlackboardCategoryViewModel.cs.meta
diff --git a/com.unity.shadergraph/Editor/Drawing/ViewModels/BlackboardViewModel.cs b/com.unity.shadergraph/Editor/Current/Drawing/ViewModels/BlackboardViewModel.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/ViewModels/BlackboardViewModel.cs
rename to com.unity.shadergraph/Editor/Current/Drawing/ViewModels/BlackboardViewModel.cs
diff --git a/com.unity.shadergraph/Editor/Drawing/ViewModels/BlackboardViewModel.cs.meta b/com.unity.shadergraph/Editor/Current/Drawing/ViewModels/BlackboardViewModel.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/ViewModels/BlackboardViewModel.cs.meta
rename to com.unity.shadergraph/Editor/Current/Drawing/ViewModels/BlackboardViewModel.cs.meta
diff --git a/com.unity.shadergraph/Editor/Drawing/ViewModels/InspectorViewModel.cs b/com.unity.shadergraph/Editor/Current/Drawing/ViewModels/InspectorViewModel.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/ViewModels/InspectorViewModel.cs
rename to com.unity.shadergraph/Editor/Current/Drawing/ViewModels/InspectorViewModel.cs
diff --git a/com.unity.shadergraph/Editor/Drawing/ViewModels/InspectorViewModel.cs.meta b/com.unity.shadergraph/Editor/Current/Drawing/ViewModels/InspectorViewModel.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/ViewModels/InspectorViewModel.cs.meta
rename to com.unity.shadergraph/Editor/Current/Drawing/ViewModels/InspectorViewModel.cs.meta
diff --git a/com.unity.shadergraph/Editor/Drawing/ViewModels/ShaderInputViewModel.cs b/com.unity.shadergraph/Editor/Current/Drawing/ViewModels/ShaderInputViewModel.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/ViewModels/ShaderInputViewModel.cs
rename to com.unity.shadergraph/Editor/Current/Drawing/ViewModels/ShaderInputViewModel.cs
diff --git a/com.unity.shadergraph/Editor/Drawing/ViewModels/ShaderInputViewModel.cs.meta b/com.unity.shadergraph/Editor/Current/Drawing/ViewModels/ShaderInputViewModel.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/ViewModels/ShaderInputViewModel.cs.meta
rename to com.unity.shadergraph/Editor/Current/Drawing/ViewModels/ShaderInputViewModel.cs.meta
diff --git a/com.unity.shadergraph/Editor/Drawing/Views.meta b/com.unity.shadergraph/Editor/Current/Drawing/Views.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Views.meta
rename to com.unity.shadergraph/Editor/Current/Drawing/Views.meta
diff --git a/com.unity.shadergraph/Editor/Drawing/Views/ContextView.cs b/com.unity.shadergraph/Editor/Current/Drawing/Views/ContextView.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Views/ContextView.cs
rename to com.unity.shadergraph/Editor/Current/Drawing/Views/ContextView.cs
diff --git a/com.unity.shadergraph/Editor/Drawing/Views/ContextView.cs.meta b/com.unity.shadergraph/Editor/Current/Drawing/Views/ContextView.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Views/ContextView.cs.meta
rename to com.unity.shadergraph/Editor/Current/Drawing/Views/ContextView.cs.meta
diff --git a/com.unity.shadergraph/Editor/Drawing/Views/FloatField.cs b/com.unity.shadergraph/Editor/Current/Drawing/Views/FloatField.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Views/FloatField.cs
rename to com.unity.shadergraph/Editor/Current/Drawing/Views/FloatField.cs
diff --git a/com.unity.shadergraph/Editor/Drawing/Views/FloatField.cs.meta b/com.unity.shadergraph/Editor/Current/Drawing/Views/FloatField.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Views/FloatField.cs.meta
rename to com.unity.shadergraph/Editor/Current/Drawing/Views/FloatField.cs.meta
diff --git a/com.unity.shadergraph/Editor/Drawing/Views/GradientEdge.cs b/com.unity.shadergraph/Editor/Current/Drawing/Views/GradientEdge.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Views/GradientEdge.cs
rename to com.unity.shadergraph/Editor/Current/Drawing/Views/GradientEdge.cs
diff --git a/com.unity.shadergraph/Editor/Drawing/Views/GradientEdge.cs.meta b/com.unity.shadergraph/Editor/Current/Drawing/Views/GradientEdge.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Views/GradientEdge.cs.meta
rename to com.unity.shadergraph/Editor/Current/Drawing/Views/GradientEdge.cs.meta
diff --git a/com.unity.shadergraph/Editor/Drawing/Views/GraphEditorView.cs b/com.unity.shadergraph/Editor/Current/Drawing/Views/GraphEditorView.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Views/GraphEditorView.cs
rename to com.unity.shadergraph/Editor/Current/Drawing/Views/GraphEditorView.cs
diff --git a/com.unity.shadergraph/Editor/Drawing/Views/GraphEditorView.cs.meta b/com.unity.shadergraph/Editor/Current/Drawing/Views/GraphEditorView.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Views/GraphEditorView.cs.meta
rename to com.unity.shadergraph/Editor/Current/Drawing/Views/GraphEditorView.cs.meta
diff --git a/com.unity.shadergraph/Editor/Drawing/Views/GraphSubWindow.cs b/com.unity.shadergraph/Editor/Current/Drawing/Views/GraphSubWindow.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Views/GraphSubWindow.cs
rename to com.unity.shadergraph/Editor/Current/Drawing/Views/GraphSubWindow.cs
diff --git a/com.unity.shadergraph/Editor/Drawing/Views/GraphSubWindow.cs.meta b/com.unity.shadergraph/Editor/Current/Drawing/Views/GraphSubWindow.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Views/GraphSubWindow.cs.meta
rename to com.unity.shadergraph/Editor/Current/Drawing/Views/GraphSubWindow.cs.meta
diff --git a/com.unity.shadergraph/Editor/Drawing/Views/HelpBoxRow.cs b/com.unity.shadergraph/Editor/Current/Drawing/Views/HelpBoxRow.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Views/HelpBoxRow.cs
rename to com.unity.shadergraph/Editor/Current/Drawing/Views/HelpBoxRow.cs
diff --git a/com.unity.shadergraph/Editor/Drawing/Views/HelpBoxRow.cs.meta b/com.unity.shadergraph/Editor/Current/Drawing/Views/HelpBoxRow.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Views/HelpBoxRow.cs.meta
rename to com.unity.shadergraph/Editor/Current/Drawing/Views/HelpBoxRow.cs.meta
diff --git a/com.unity.shadergraph/Editor/Drawing/Views/HlslFunctionView.cs b/com.unity.shadergraph/Editor/Current/Drawing/Views/HlslFunctionView.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Views/HlslFunctionView.cs
rename to com.unity.shadergraph/Editor/Current/Drawing/Views/HlslFunctionView.cs
diff --git a/com.unity.shadergraph/Editor/Drawing/Views/HlslFunctionView.cs.meta b/com.unity.shadergraph/Editor/Current/Drawing/Views/HlslFunctionView.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Views/HlslFunctionView.cs.meta
rename to com.unity.shadergraph/Editor/Current/Drawing/Views/HlslFunctionView.cs.meta
diff --git a/com.unity.shadergraph/Editor/Drawing/Views/IShaderNodeView.cs b/com.unity.shadergraph/Editor/Current/Drawing/Views/IShaderNodeView.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Views/IShaderNodeView.cs
rename to com.unity.shadergraph/Editor/Current/Drawing/Views/IShaderNodeView.cs
diff --git a/com.unity.shadergraph/Editor/Drawing/Views/IShaderNodeView.cs.meta b/com.unity.shadergraph/Editor/Current/Drawing/Views/IShaderNodeView.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Views/IShaderNodeView.cs.meta
rename to com.unity.shadergraph/Editor/Current/Drawing/Views/IShaderNodeView.cs.meta
diff --git a/com.unity.shadergraph/Editor/Drawing/Views/IdentifierField.cs b/com.unity.shadergraph/Editor/Current/Drawing/Views/IdentifierField.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Views/IdentifierField.cs
rename to com.unity.shadergraph/Editor/Current/Drawing/Views/IdentifierField.cs
diff --git a/com.unity.shadergraph/Editor/Drawing/Views/IdentifierField.cs.meta b/com.unity.shadergraph/Editor/Current/Drawing/Views/IdentifierField.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Views/IdentifierField.cs.meta
rename to com.unity.shadergraph/Editor/Current/Drawing/Views/IdentifierField.cs.meta
diff --git a/com.unity.shadergraph/Editor/Drawing/Views/MaterialGraphView.cs b/com.unity.shadergraph/Editor/Current/Drawing/Views/MaterialGraphView.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Views/MaterialGraphView.cs
rename to com.unity.shadergraph/Editor/Current/Drawing/Views/MaterialGraphView.cs
diff --git a/com.unity.shadergraph/Editor/Drawing/Views/MaterialGraphView.cs.meta b/com.unity.shadergraph/Editor/Current/Drawing/Views/MaterialGraphView.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Views/MaterialGraphView.cs.meta
rename to com.unity.shadergraph/Editor/Current/Drawing/Views/MaterialGraphView.cs.meta
diff --git a/com.unity.shadergraph/Editor/Drawing/Views/MaterialNodeView.cs b/com.unity.shadergraph/Editor/Current/Drawing/Views/MaterialNodeView.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Views/MaterialNodeView.cs
rename to com.unity.shadergraph/Editor/Current/Drawing/Views/MaterialNodeView.cs
diff --git a/com.unity.shadergraph/Editor/Drawing/Views/MaterialNodeView.cs.meta b/com.unity.shadergraph/Editor/Current/Drawing/Views/MaterialNodeView.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Views/MaterialNodeView.cs.meta
rename to com.unity.shadergraph/Editor/Current/Drawing/Views/MaterialNodeView.cs.meta
diff --git a/com.unity.shadergraph/Editor/Drawing/Views/NodeSettingsView.cs b/com.unity.shadergraph/Editor/Current/Drawing/Views/NodeSettingsView.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Views/NodeSettingsView.cs
rename to com.unity.shadergraph/Editor/Current/Drawing/Views/NodeSettingsView.cs
diff --git a/com.unity.shadergraph/Editor/Drawing/Views/NodeSettingsView.cs.meta b/com.unity.shadergraph/Editor/Current/Drawing/Views/NodeSettingsView.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Views/NodeSettingsView.cs.meta
rename to com.unity.shadergraph/Editor/Current/Drawing/Views/NodeSettingsView.cs.meta
diff --git a/com.unity.shadergraph/Editor/Drawing/Views/PortInputView.cs b/com.unity.shadergraph/Editor/Current/Drawing/Views/PortInputView.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Views/PortInputView.cs
rename to com.unity.shadergraph/Editor/Current/Drawing/Views/PortInputView.cs
diff --git a/com.unity.shadergraph/Editor/Drawing/Views/PortInputView.cs.meta b/com.unity.shadergraph/Editor/Current/Drawing/Views/PortInputView.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Views/PortInputView.cs.meta
rename to com.unity.shadergraph/Editor/Current/Drawing/Views/PortInputView.cs.meta
diff --git a/com.unity.shadergraph/Editor/Drawing/Views/PreviewSceneResources.cs b/com.unity.shadergraph/Editor/Current/Drawing/Views/PreviewSceneResources.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Views/PreviewSceneResources.cs
rename to com.unity.shadergraph/Editor/Current/Drawing/Views/PreviewSceneResources.cs
diff --git a/com.unity.shadergraph/Editor/Drawing/Views/PreviewSceneResources.cs.meta b/com.unity.shadergraph/Editor/Current/Drawing/Views/PreviewSceneResources.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Views/PreviewSceneResources.cs.meta
rename to com.unity.shadergraph/Editor/Current/Drawing/Views/PreviewSceneResources.cs.meta
diff --git a/com.unity.shadergraph/Editor/Drawing/Views/PropertyNodeView.cs b/com.unity.shadergraph/Editor/Current/Drawing/Views/PropertyNodeView.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Views/PropertyNodeView.cs
rename to com.unity.shadergraph/Editor/Current/Drawing/Views/PropertyNodeView.cs
diff --git a/com.unity.shadergraph/Editor/Drawing/Views/PropertyNodeView.cs.meta b/com.unity.shadergraph/Editor/Current/Drawing/Views/PropertyNodeView.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Views/PropertyNodeView.cs.meta
rename to com.unity.shadergraph/Editor/Current/Drawing/Views/PropertyNodeView.cs.meta
diff --git a/com.unity.shadergraph/Editor/Drawing/Views/PropertyRow.cs b/com.unity.shadergraph/Editor/Current/Drawing/Views/PropertyRow.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Views/PropertyRow.cs
rename to com.unity.shadergraph/Editor/Current/Drawing/Views/PropertyRow.cs
diff --git a/com.unity.shadergraph/Editor/Drawing/Views/PropertyRow.cs.meta b/com.unity.shadergraph/Editor/Current/Drawing/Views/PropertyRow.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Views/PropertyRow.cs.meta
rename to com.unity.shadergraph/Editor/Current/Drawing/Views/PropertyRow.cs.meta
diff --git a/com.unity.shadergraph/Editor/Drawing/Views/PropertySheet.cs b/com.unity.shadergraph/Editor/Current/Drawing/Views/PropertySheet.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Views/PropertySheet.cs
rename to com.unity.shadergraph/Editor/Current/Drawing/Views/PropertySheet.cs
diff --git a/com.unity.shadergraph/Editor/Drawing/Views/PropertySheet.cs.meta b/com.unity.shadergraph/Editor/Current/Drawing/Views/PropertySheet.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Views/PropertySheet.cs.meta
rename to com.unity.shadergraph/Editor/Current/Drawing/Views/PropertySheet.cs.meta
diff --git a/com.unity.shadergraph/Editor/Drawing/Views/ReorderableSlotListView.cs b/com.unity.shadergraph/Editor/Current/Drawing/Views/ReorderableSlotListView.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Views/ReorderableSlotListView.cs
rename to com.unity.shadergraph/Editor/Current/Drawing/Views/ReorderableSlotListView.cs
diff --git a/com.unity.shadergraph/Editor/Drawing/Views/ReorderableSlotListView.cs.meta b/com.unity.shadergraph/Editor/Current/Drawing/Views/ReorderableSlotListView.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Views/ReorderableSlotListView.cs.meta
rename to com.unity.shadergraph/Editor/Current/Drawing/Views/ReorderableSlotListView.cs.meta
diff --git a/com.unity.shadergraph/Editor/Drawing/Views/ReorderableTextListView.cs b/com.unity.shadergraph/Editor/Current/Drawing/Views/ReorderableTextListView.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Views/ReorderableTextListView.cs
rename to com.unity.shadergraph/Editor/Current/Drawing/Views/ReorderableTextListView.cs
diff --git a/com.unity.shadergraph/Editor/Drawing/Views/ReorderableTextListView.cs.meta b/com.unity.shadergraph/Editor/Current/Drawing/Views/ReorderableTextListView.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Views/ReorderableTextListView.cs.meta
rename to com.unity.shadergraph/Editor/Current/Drawing/Views/ReorderableTextListView.cs.meta
diff --git a/com.unity.shadergraph/Editor/Drawing/Views/ResizableElement.cs b/com.unity.shadergraph/Editor/Current/Drawing/Views/ResizableElement.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Views/ResizableElement.cs
rename to com.unity.shadergraph/Editor/Current/Drawing/Views/ResizableElement.cs
diff --git a/com.unity.shadergraph/Editor/Drawing/Views/ResizableElement.cs.meta b/com.unity.shadergraph/Editor/Current/Drawing/Views/ResizableElement.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Views/ResizableElement.cs.meta
rename to com.unity.shadergraph/Editor/Current/Drawing/Views/ResizableElement.cs.meta
diff --git a/com.unity.shadergraph/Editor/Drawing/Views/ShaderGroup.cs b/com.unity.shadergraph/Editor/Current/Drawing/Views/ShaderGroup.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Views/ShaderGroup.cs
rename to com.unity.shadergraph/Editor/Current/Drawing/Views/ShaderGroup.cs
diff --git a/com.unity.shadergraph/Editor/Drawing/Views/ShaderGroup.cs.meta b/com.unity.shadergraph/Editor/Current/Drawing/Views/ShaderGroup.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Views/ShaderGroup.cs.meta
rename to com.unity.shadergraph/Editor/Current/Drawing/Views/ShaderGroup.cs.meta
diff --git a/com.unity.shadergraph/Editor/Drawing/Views/ShaderPort.cs b/com.unity.shadergraph/Editor/Current/Drawing/Views/ShaderPort.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Views/ShaderPort.cs
rename to com.unity.shadergraph/Editor/Current/Drawing/Views/ShaderPort.cs
diff --git a/com.unity.shadergraph/Editor/Drawing/Views/ShaderPort.cs.meta b/com.unity.shadergraph/Editor/Current/Drawing/Views/ShaderPort.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Views/ShaderPort.cs.meta
rename to com.unity.shadergraph/Editor/Current/Drawing/Views/ShaderPort.cs.meta
diff --git a/com.unity.shadergraph/Editor/Drawing/Views/Slots.meta b/com.unity.shadergraph/Editor/Current/Drawing/Views/Slots.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Views/Slots.meta
rename to com.unity.shadergraph/Editor/Current/Drawing/Views/Slots.meta
diff --git a/com.unity.shadergraph/Editor/Drawing/Views/Slots/BooleanSlotControlView.cs b/com.unity.shadergraph/Editor/Current/Drawing/Views/Slots/BooleanSlotControlView.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Views/Slots/BooleanSlotControlView.cs
rename to com.unity.shadergraph/Editor/Current/Drawing/Views/Slots/BooleanSlotControlView.cs
diff --git a/com.unity.shadergraph/Editor/Drawing/Views/Slots/BooleanSlotControlView.cs.meta b/com.unity.shadergraph/Editor/Current/Drawing/Views/Slots/BooleanSlotControlView.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Views/Slots/BooleanSlotControlView.cs.meta
rename to com.unity.shadergraph/Editor/Current/Drawing/Views/Slots/BooleanSlotControlView.cs.meta
diff --git a/com.unity.shadergraph/Editor/Drawing/Views/Slots/ColorRGBSlotControlView.cs b/com.unity.shadergraph/Editor/Current/Drawing/Views/Slots/ColorRGBSlotControlView.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Views/Slots/ColorRGBSlotControlView.cs
rename to com.unity.shadergraph/Editor/Current/Drawing/Views/Slots/ColorRGBSlotControlView.cs
diff --git a/com.unity.shadergraph/Editor/Drawing/Views/Slots/ColorRGBSlotControlView.cs.meta b/com.unity.shadergraph/Editor/Current/Drawing/Views/Slots/ColorRGBSlotControlView.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Views/Slots/ColorRGBSlotControlView.cs.meta
rename to com.unity.shadergraph/Editor/Current/Drawing/Views/Slots/ColorRGBSlotControlView.cs.meta
diff --git a/com.unity.shadergraph/Editor/Drawing/Views/Slots/ColorSlotControlView.cs b/com.unity.shadergraph/Editor/Current/Drawing/Views/Slots/ColorSlotControlView.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Views/Slots/ColorSlotControlView.cs
rename to com.unity.shadergraph/Editor/Current/Drawing/Views/Slots/ColorSlotControlView.cs
diff --git a/com.unity.shadergraph/Editor/Drawing/Views/Slots/ColorSlotControlView.cs.meta b/com.unity.shadergraph/Editor/Current/Drawing/Views/Slots/ColorSlotControlView.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Views/Slots/ColorSlotControlView.cs.meta
rename to com.unity.shadergraph/Editor/Current/Drawing/Views/Slots/ColorSlotControlView.cs.meta
diff --git a/com.unity.shadergraph/Editor/Drawing/Views/Slots/CubemapSlotControlView.cs b/com.unity.shadergraph/Editor/Current/Drawing/Views/Slots/CubemapSlotControlView.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Views/Slots/CubemapSlotControlView.cs
rename to com.unity.shadergraph/Editor/Current/Drawing/Views/Slots/CubemapSlotControlView.cs
diff --git a/com.unity.shadergraph/Editor/Drawing/Views/Slots/CubemapSlotControlView.cs.meta b/com.unity.shadergraph/Editor/Current/Drawing/Views/Slots/CubemapSlotControlView.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Views/Slots/CubemapSlotControlView.cs.meta
rename to com.unity.shadergraph/Editor/Current/Drawing/Views/Slots/CubemapSlotControlView.cs.meta
diff --git a/com.unity.shadergraph/Editor/Drawing/Views/Slots/GradientSlotControlView.cs b/com.unity.shadergraph/Editor/Current/Drawing/Views/Slots/GradientSlotControlView.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Views/Slots/GradientSlotControlView.cs
rename to com.unity.shadergraph/Editor/Current/Drawing/Views/Slots/GradientSlotControlView.cs
diff --git a/com.unity.shadergraph/Editor/Drawing/Views/Slots/GradientSlotControlView.cs.meta b/com.unity.shadergraph/Editor/Current/Drawing/Views/Slots/GradientSlotControlView.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Views/Slots/GradientSlotControlView.cs.meta
rename to com.unity.shadergraph/Editor/Current/Drawing/Views/Slots/GradientSlotControlView.cs.meta
diff --git a/com.unity.shadergraph/Editor/Drawing/Views/Slots/LabelSlotControlView.cs b/com.unity.shadergraph/Editor/Current/Drawing/Views/Slots/LabelSlotControlView.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Views/Slots/LabelSlotControlView.cs
rename to com.unity.shadergraph/Editor/Current/Drawing/Views/Slots/LabelSlotControlView.cs
diff --git a/com.unity.shadergraph/Editor/Drawing/Views/Slots/LabelSlotControlView.cs.meta b/com.unity.shadergraph/Editor/Current/Drawing/Views/Slots/LabelSlotControlView.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Views/Slots/LabelSlotControlView.cs.meta
rename to com.unity.shadergraph/Editor/Current/Drawing/Views/Slots/LabelSlotControlView.cs.meta
diff --git a/com.unity.shadergraph/Editor/Drawing/Views/Slots/MultiFloatSlotControlView.cs b/com.unity.shadergraph/Editor/Current/Drawing/Views/Slots/MultiFloatSlotControlView.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Views/Slots/MultiFloatSlotControlView.cs
rename to com.unity.shadergraph/Editor/Current/Drawing/Views/Slots/MultiFloatSlotControlView.cs
diff --git a/com.unity.shadergraph/Editor/Drawing/Views/Slots/MultiFloatSlotControlView.cs.meta b/com.unity.shadergraph/Editor/Current/Drawing/Views/Slots/MultiFloatSlotControlView.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Views/Slots/MultiFloatSlotControlView.cs.meta
rename to com.unity.shadergraph/Editor/Current/Drawing/Views/Slots/MultiFloatSlotControlView.cs.meta
diff --git a/com.unity.shadergraph/Editor/Drawing/Views/Slots/MultiIntegerSlotControlView.cs b/com.unity.shadergraph/Editor/Current/Drawing/Views/Slots/MultiIntegerSlotControlView.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Views/Slots/MultiIntegerSlotControlView.cs
rename to com.unity.shadergraph/Editor/Current/Drawing/Views/Slots/MultiIntegerSlotControlView.cs
diff --git a/com.unity.shadergraph/Editor/Drawing/Views/Slots/MultiIntegerSlotControlView.cs.meta b/com.unity.shadergraph/Editor/Current/Drawing/Views/Slots/MultiIntegerSlotControlView.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Views/Slots/MultiIntegerSlotControlView.cs.meta
rename to com.unity.shadergraph/Editor/Current/Drawing/Views/Slots/MultiIntegerSlotControlView.cs.meta
diff --git a/com.unity.shadergraph/Editor/Drawing/Views/Slots/PropertyConnectionStateSlotControlView.cs b/com.unity.shadergraph/Editor/Current/Drawing/Views/Slots/PropertyConnectionStateSlotControlView.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Views/Slots/PropertyConnectionStateSlotControlView.cs
rename to com.unity.shadergraph/Editor/Current/Drawing/Views/Slots/PropertyConnectionStateSlotControlView.cs
diff --git a/com.unity.shadergraph/Editor/Drawing/Views/Slots/PropertyConnectionStateSlotControlView.cs.meta b/com.unity.shadergraph/Editor/Current/Drawing/Views/Slots/PropertyConnectionStateSlotControlView.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Views/Slots/PropertyConnectionStateSlotControlView.cs.meta
rename to com.unity.shadergraph/Editor/Current/Drawing/Views/Slots/PropertyConnectionStateSlotControlView.cs.meta
diff --git a/com.unity.shadergraph/Editor/Drawing/Views/Slots/ScreenPositionSlotControlView.cs b/com.unity.shadergraph/Editor/Current/Drawing/Views/Slots/ScreenPositionSlotControlView.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Views/Slots/ScreenPositionSlotControlView.cs
rename to com.unity.shadergraph/Editor/Current/Drawing/Views/Slots/ScreenPositionSlotControlView.cs
diff --git a/com.unity.shadergraph/Editor/Drawing/Views/Slots/ScreenPositionSlotControlView.cs.meta b/com.unity.shadergraph/Editor/Current/Drawing/Views/Slots/ScreenPositionSlotControlView.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Views/Slots/ScreenPositionSlotControlView.cs.meta
rename to com.unity.shadergraph/Editor/Current/Drawing/Views/Slots/ScreenPositionSlotControlView.cs.meta
diff --git a/com.unity.shadergraph/Editor/Drawing/Views/Slots/Texture3DSlotControlView.cs b/com.unity.shadergraph/Editor/Current/Drawing/Views/Slots/Texture3DSlotControlView.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Views/Slots/Texture3DSlotControlView.cs
rename to com.unity.shadergraph/Editor/Current/Drawing/Views/Slots/Texture3DSlotControlView.cs
diff --git a/com.unity.shadergraph/Editor/Drawing/Views/Slots/Texture3DSlotControlView.cs.meta b/com.unity.shadergraph/Editor/Current/Drawing/Views/Slots/Texture3DSlotControlView.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Views/Slots/Texture3DSlotControlView.cs.meta
rename to com.unity.shadergraph/Editor/Current/Drawing/Views/Slots/Texture3DSlotControlView.cs.meta
diff --git a/com.unity.shadergraph/Editor/Drawing/Views/Slots/TextureArraySlotControlView.cs b/com.unity.shadergraph/Editor/Current/Drawing/Views/Slots/TextureArraySlotControlView.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Views/Slots/TextureArraySlotControlView.cs
rename to com.unity.shadergraph/Editor/Current/Drawing/Views/Slots/TextureArraySlotControlView.cs
diff --git a/com.unity.shadergraph/Editor/Drawing/Views/Slots/TextureArraySlotControlView.cs.meta b/com.unity.shadergraph/Editor/Current/Drawing/Views/Slots/TextureArraySlotControlView.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Views/Slots/TextureArraySlotControlView.cs.meta
rename to com.unity.shadergraph/Editor/Current/Drawing/Views/Slots/TextureArraySlotControlView.cs.meta
diff --git a/com.unity.shadergraph/Editor/Drawing/Views/Slots/TextureSlotControlView.cs b/com.unity.shadergraph/Editor/Current/Drawing/Views/Slots/TextureSlotControlView.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Views/Slots/TextureSlotControlView.cs
rename to com.unity.shadergraph/Editor/Current/Drawing/Views/Slots/TextureSlotControlView.cs
diff --git a/com.unity.shadergraph/Editor/Drawing/Views/Slots/TextureSlotControlView.cs.meta b/com.unity.shadergraph/Editor/Current/Drawing/Views/Slots/TextureSlotControlView.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Views/Slots/TextureSlotControlView.cs.meta
rename to com.unity.shadergraph/Editor/Current/Drawing/Views/Slots/TextureSlotControlView.cs.meta
diff --git a/com.unity.shadergraph/Editor/Drawing/Views/Slots/UVSlotControlView.cs b/com.unity.shadergraph/Editor/Current/Drawing/Views/Slots/UVSlotControlView.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Views/Slots/UVSlotControlView.cs
rename to com.unity.shadergraph/Editor/Current/Drawing/Views/Slots/UVSlotControlView.cs
diff --git a/com.unity.shadergraph/Editor/Drawing/Views/Slots/UVSlotControlView.cs.meta b/com.unity.shadergraph/Editor/Current/Drawing/Views/Slots/UVSlotControlView.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Views/Slots/UVSlotControlView.cs.meta
rename to com.unity.shadergraph/Editor/Current/Drawing/Views/Slots/UVSlotControlView.cs.meta
diff --git a/com.unity.shadergraph/Editor/Drawing/Views/StickyNote.cs b/com.unity.shadergraph/Editor/Current/Drawing/Views/StickyNote.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Views/StickyNote.cs
rename to com.unity.shadergraph/Editor/Current/Drawing/Views/StickyNote.cs
diff --git a/com.unity.shadergraph/Editor/Drawing/Views/StickyNote.cs.meta b/com.unity.shadergraph/Editor/Current/Drawing/Views/StickyNote.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Drawing/Views/StickyNote.cs.meta
rename to com.unity.shadergraph/Editor/Current/Drawing/Views/StickyNote.cs.meta
diff --git a/com.unity.shadergraph/Editor/Extensions.meta b/com.unity.shadergraph/Editor/Current/Extensions.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Extensions.meta
rename to com.unity.shadergraph/Editor/Current/Extensions.meta
diff --git a/com.unity.shadergraph/Editor/Extensions/FieldExtensions.cs b/com.unity.shadergraph/Editor/Current/Extensions/FieldExtensions.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Extensions/FieldExtensions.cs
rename to com.unity.shadergraph/Editor/Current/Extensions/FieldExtensions.cs
diff --git a/com.unity.shadergraph/Editor/Extensions/FieldExtensions.cs.meta b/com.unity.shadergraph/Editor/Current/Extensions/FieldExtensions.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Extensions/FieldExtensions.cs.meta
rename to com.unity.shadergraph/Editor/Current/Extensions/FieldExtensions.cs.meta
diff --git a/com.unity.shadergraph/Editor/Extensions/IConditionalExtensions.cs b/com.unity.shadergraph/Editor/Current/Extensions/IConditionalExtensions.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Extensions/IConditionalExtensions.cs
rename to com.unity.shadergraph/Editor/Current/Extensions/IConditionalExtensions.cs
diff --git a/com.unity.shadergraph/Editor/Extensions/IConditionalExtensions.cs.meta b/com.unity.shadergraph/Editor/Current/Extensions/IConditionalExtensions.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Extensions/IConditionalExtensions.cs.meta
rename to com.unity.shadergraph/Editor/Current/Extensions/IConditionalExtensions.cs.meta
diff --git a/com.unity.shadergraph/Editor/Extensions/StencilExtensions.cs b/com.unity.shadergraph/Editor/Current/Extensions/StencilExtensions.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Extensions/StencilExtensions.cs
rename to com.unity.shadergraph/Editor/Current/Extensions/StencilExtensions.cs
diff --git a/com.unity.shadergraph/Editor/Extensions/StencilExtensions.cs.meta b/com.unity.shadergraph/Editor/Current/Extensions/StencilExtensions.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Extensions/StencilExtensions.cs.meta
rename to com.unity.shadergraph/Editor/Current/Extensions/StencilExtensions.cs.meta
diff --git a/com.unity.shadergraph/Editor/Generation.meta b/com.unity.shadergraph/Editor/Current/Generation.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation.meta
rename to com.unity.shadergraph/Editor/Current/Generation.meta
diff --git a/com.unity.shadergraph/Editor/Generation/Attributes.meta b/com.unity.shadergraph/Editor/Current/Generation/Attributes.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Attributes.meta
rename to com.unity.shadergraph/Editor/Current/Generation/Attributes.meta
diff --git a/com.unity.shadergraph/Editor/Generation/Attributes/GenerateBlocksAttribute.cs b/com.unity.shadergraph/Editor/Current/Generation/Attributes/GenerateBlocksAttribute.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Attributes/GenerateBlocksAttribute.cs
rename to com.unity.shadergraph/Editor/Current/Generation/Attributes/GenerateBlocksAttribute.cs
diff --git a/com.unity.shadergraph/Editor/Generation/Attributes/GenerateBlocksAttribute.cs.meta b/com.unity.shadergraph/Editor/Current/Generation/Attributes/GenerateBlocksAttribute.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Attributes/GenerateBlocksAttribute.cs.meta
rename to com.unity.shadergraph/Editor/Current/Generation/Attributes/GenerateBlocksAttribute.cs.meta
diff --git a/com.unity.shadergraph/Editor/Generation/Collections.meta b/com.unity.shadergraph/Editor/Current/Generation/Collections.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Collections.meta
rename to com.unity.shadergraph/Editor/Current/Generation/Collections.meta
diff --git a/com.unity.shadergraph/Editor/Generation/Collections/AdditionalCommandCollection.cs b/com.unity.shadergraph/Editor/Current/Generation/Collections/AdditionalCommandCollection.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Collections/AdditionalCommandCollection.cs
rename to com.unity.shadergraph/Editor/Current/Generation/Collections/AdditionalCommandCollection.cs
diff --git a/com.unity.shadergraph/Editor/Generation/Collections/AdditionalCommandCollection.cs.meta b/com.unity.shadergraph/Editor/Current/Generation/Collections/AdditionalCommandCollection.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Collections/AdditionalCommandCollection.cs.meta
rename to com.unity.shadergraph/Editor/Current/Generation/Collections/AdditionalCommandCollection.cs.meta
diff --git a/com.unity.shadergraph/Editor/Generation/Collections/AssetCollection.cs b/com.unity.shadergraph/Editor/Current/Generation/Collections/AssetCollection.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Collections/AssetCollection.cs
rename to com.unity.shadergraph/Editor/Current/Generation/Collections/AssetCollection.cs
diff --git a/com.unity.shadergraph/Editor/Generation/Collections/AssetCollection.cs.meta b/com.unity.shadergraph/Editor/Current/Generation/Collections/AssetCollection.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Collections/AssetCollection.cs.meta
rename to com.unity.shadergraph/Editor/Current/Generation/Collections/AssetCollection.cs.meta
diff --git a/com.unity.shadergraph/Editor/Generation/Collections/DefineCollection.cs b/com.unity.shadergraph/Editor/Current/Generation/Collections/DefineCollection.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Collections/DefineCollection.cs
rename to com.unity.shadergraph/Editor/Current/Generation/Collections/DefineCollection.cs
diff --git a/com.unity.shadergraph/Editor/Generation/Collections/DefineCollection.cs.meta b/com.unity.shadergraph/Editor/Current/Generation/Collections/DefineCollection.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Collections/DefineCollection.cs.meta
rename to com.unity.shadergraph/Editor/Current/Generation/Collections/DefineCollection.cs.meta
diff --git a/com.unity.shadergraph/Editor/Generation/Collections/DependencyCollection.cs b/com.unity.shadergraph/Editor/Current/Generation/Collections/DependencyCollection.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Collections/DependencyCollection.cs
rename to com.unity.shadergraph/Editor/Current/Generation/Collections/DependencyCollection.cs
diff --git a/com.unity.shadergraph/Editor/Generation/Collections/DependencyCollection.cs.meta b/com.unity.shadergraph/Editor/Current/Generation/Collections/DependencyCollection.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Collections/DependencyCollection.cs.meta
rename to com.unity.shadergraph/Editor/Current/Generation/Collections/DependencyCollection.cs.meta
diff --git a/com.unity.shadergraph/Editor/Generation/Collections/FieldCollection.cs b/com.unity.shadergraph/Editor/Current/Generation/Collections/FieldCollection.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Collections/FieldCollection.cs
rename to com.unity.shadergraph/Editor/Current/Generation/Collections/FieldCollection.cs
diff --git a/com.unity.shadergraph/Editor/Generation/Collections/FieldCollection.cs.meta b/com.unity.shadergraph/Editor/Current/Generation/Collections/FieldCollection.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Collections/FieldCollection.cs.meta
rename to com.unity.shadergraph/Editor/Current/Generation/Collections/FieldCollection.cs.meta
diff --git a/com.unity.shadergraph/Editor/Generation/Collections/IncludeCollection.cs b/com.unity.shadergraph/Editor/Current/Generation/Collections/IncludeCollection.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Collections/IncludeCollection.cs
rename to com.unity.shadergraph/Editor/Current/Generation/Collections/IncludeCollection.cs
diff --git a/com.unity.shadergraph/Editor/Generation/Collections/IncludeCollection.cs.meta b/com.unity.shadergraph/Editor/Current/Generation/Collections/IncludeCollection.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Collections/IncludeCollection.cs.meta
rename to com.unity.shadergraph/Editor/Current/Generation/Collections/IncludeCollection.cs.meta
diff --git a/com.unity.shadergraph/Editor/Generation/Collections/KeywordCollection.cs b/com.unity.shadergraph/Editor/Current/Generation/Collections/KeywordCollection.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Collections/KeywordCollection.cs
rename to com.unity.shadergraph/Editor/Current/Generation/Collections/KeywordCollection.cs
diff --git a/com.unity.shadergraph/Editor/Generation/Collections/KeywordCollection.cs.meta b/com.unity.shadergraph/Editor/Current/Generation/Collections/KeywordCollection.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Collections/KeywordCollection.cs.meta
rename to com.unity.shadergraph/Editor/Current/Generation/Collections/KeywordCollection.cs.meta
diff --git a/com.unity.shadergraph/Editor/Generation/Collections/PassCollection.cs b/com.unity.shadergraph/Editor/Current/Generation/Collections/PassCollection.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Collections/PassCollection.cs
rename to com.unity.shadergraph/Editor/Current/Generation/Collections/PassCollection.cs
diff --git a/com.unity.shadergraph/Editor/Generation/Collections/PassCollection.cs.meta b/com.unity.shadergraph/Editor/Current/Generation/Collections/PassCollection.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Collections/PassCollection.cs.meta
rename to com.unity.shadergraph/Editor/Current/Generation/Collections/PassCollection.cs.meta
diff --git a/com.unity.shadergraph/Editor/Generation/Collections/PragmaCollection.cs b/com.unity.shadergraph/Editor/Current/Generation/Collections/PragmaCollection.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Collections/PragmaCollection.cs
rename to com.unity.shadergraph/Editor/Current/Generation/Collections/PragmaCollection.cs
diff --git a/com.unity.shadergraph/Editor/Generation/Collections/PragmaCollection.cs.meta b/com.unity.shadergraph/Editor/Current/Generation/Collections/PragmaCollection.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Collections/PragmaCollection.cs.meta
rename to com.unity.shadergraph/Editor/Current/Generation/Collections/PragmaCollection.cs.meta
diff --git a/com.unity.shadergraph/Editor/Generation/Collections/RenderStateCollection.cs b/com.unity.shadergraph/Editor/Current/Generation/Collections/RenderStateCollection.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Collections/RenderStateCollection.cs
rename to com.unity.shadergraph/Editor/Current/Generation/Collections/RenderStateCollection.cs
diff --git a/com.unity.shadergraph/Editor/Generation/Collections/RenderStateCollection.cs.meta b/com.unity.shadergraph/Editor/Current/Generation/Collections/RenderStateCollection.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Collections/RenderStateCollection.cs.meta
rename to com.unity.shadergraph/Editor/Current/Generation/Collections/RenderStateCollection.cs.meta
diff --git a/com.unity.shadergraph/Editor/Generation/Collections/StructCollection.cs b/com.unity.shadergraph/Editor/Current/Generation/Collections/StructCollection.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Collections/StructCollection.cs
rename to com.unity.shadergraph/Editor/Current/Generation/Collections/StructCollection.cs
diff --git a/com.unity.shadergraph/Editor/Generation/Collections/StructCollection.cs.meta b/com.unity.shadergraph/Editor/Current/Generation/Collections/StructCollection.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Collections/StructCollection.cs.meta
rename to com.unity.shadergraph/Editor/Current/Generation/Collections/StructCollection.cs.meta
diff --git a/com.unity.shadergraph/Editor/Generation/Contexts.meta b/com.unity.shadergraph/Editor/Current/Generation/Contexts.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Contexts.meta
rename to com.unity.shadergraph/Editor/Current/Generation/Contexts.meta
diff --git a/com.unity.shadergraph/Editor/Generation/Contexts/TargetActiveBlockContext.cs b/com.unity.shadergraph/Editor/Current/Generation/Contexts/TargetActiveBlockContext.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Contexts/TargetActiveBlockContext.cs
rename to com.unity.shadergraph/Editor/Current/Generation/Contexts/TargetActiveBlockContext.cs
diff --git a/com.unity.shadergraph/Editor/Generation/Contexts/TargetActiveBlockContext.cs.meta b/com.unity.shadergraph/Editor/Current/Generation/Contexts/TargetActiveBlockContext.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Contexts/TargetActiveBlockContext.cs.meta
rename to com.unity.shadergraph/Editor/Current/Generation/Contexts/TargetActiveBlockContext.cs.meta
diff --git a/com.unity.shadergraph/Editor/Generation/Contexts/TargetFieldContext.cs b/com.unity.shadergraph/Editor/Current/Generation/Contexts/TargetFieldContext.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Contexts/TargetFieldContext.cs
rename to com.unity.shadergraph/Editor/Current/Generation/Contexts/TargetFieldContext.cs
diff --git a/com.unity.shadergraph/Editor/Generation/Contexts/TargetFieldContext.cs.meta b/com.unity.shadergraph/Editor/Current/Generation/Contexts/TargetFieldContext.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Contexts/TargetFieldContext.cs.meta
rename to com.unity.shadergraph/Editor/Current/Generation/Contexts/TargetFieldContext.cs.meta
diff --git a/com.unity.shadergraph/Editor/Generation/Contexts/TargetPropertyGUIContext.cs b/com.unity.shadergraph/Editor/Current/Generation/Contexts/TargetPropertyGUIContext.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Contexts/TargetPropertyGUIContext.cs
rename to com.unity.shadergraph/Editor/Current/Generation/Contexts/TargetPropertyGUIContext.cs
diff --git a/com.unity.shadergraph/Editor/Generation/Contexts/TargetPropertyGUIContext.cs.meta b/com.unity.shadergraph/Editor/Current/Generation/Contexts/TargetPropertyGUIContext.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Contexts/TargetPropertyGUIContext.cs.meta
rename to com.unity.shadergraph/Editor/Current/Generation/Contexts/TargetPropertyGUIContext.cs.meta
diff --git a/com.unity.shadergraph/Editor/Generation/Contexts/TargetSetupContext.cs b/com.unity.shadergraph/Editor/Current/Generation/Contexts/TargetSetupContext.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Contexts/TargetSetupContext.cs
rename to com.unity.shadergraph/Editor/Current/Generation/Contexts/TargetSetupContext.cs
diff --git a/com.unity.shadergraph/Editor/Generation/Contexts/TargetSetupContext.cs.meta b/com.unity.shadergraph/Editor/Current/Generation/Contexts/TargetSetupContext.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Contexts/TargetSetupContext.cs.meta
rename to com.unity.shadergraph/Editor/Current/Generation/Contexts/TargetSetupContext.cs.meta
diff --git a/com.unity.shadergraph/Editor/Generation/Controls.cs b/com.unity.shadergraph/Editor/Current/Generation/Controls.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Controls.cs
rename to com.unity.shadergraph/Editor/Current/Generation/Controls.cs
diff --git a/com.unity.shadergraph/Editor/Generation/Controls.cs.meta b/com.unity.shadergraph/Editor/Current/Generation/Controls.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Controls.cs.meta
rename to com.unity.shadergraph/Editor/Current/Generation/Controls.cs.meta
diff --git a/com.unity.shadergraph/Editor/Generation/Data.meta b/com.unity.shadergraph/Editor/Current/Generation/Data.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Data.meta
rename to com.unity.shadergraph/Editor/Current/Generation/Data.meta
diff --git a/com.unity.shadergraph/Editor/Generation/Data/ConditionalField.cs b/com.unity.shadergraph/Editor/Current/Generation/Data/ConditionalField.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Data/ConditionalField.cs
rename to com.unity.shadergraph/Editor/Current/Generation/Data/ConditionalField.cs
diff --git a/com.unity.shadergraph/Editor/Generation/Data/ConditionalField.cs.meta b/com.unity.shadergraph/Editor/Current/Generation/Data/ConditionalField.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Data/ConditionalField.cs.meta
rename to com.unity.shadergraph/Editor/Current/Generation/Data/ConditionalField.cs.meta
diff --git a/com.unity.shadergraph/Editor/Generation/Data/DropdownEntry.cs b/com.unity.shadergraph/Editor/Current/Generation/Data/DropdownEntry.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Data/DropdownEntry.cs
rename to com.unity.shadergraph/Editor/Current/Generation/Data/DropdownEntry.cs
diff --git a/com.unity.shadergraph/Editor/Generation/Data/DropdownEntry.cs.meta b/com.unity.shadergraph/Editor/Current/Generation/Data/DropdownEntry.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Data/DropdownEntry.cs.meta
rename to com.unity.shadergraph/Editor/Current/Generation/Data/DropdownEntry.cs.meta
diff --git a/com.unity.shadergraph/Editor/Generation/Data/FieldCondition.cs b/com.unity.shadergraph/Editor/Current/Generation/Data/FieldCondition.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Data/FieldCondition.cs
rename to com.unity.shadergraph/Editor/Current/Generation/Data/FieldCondition.cs
diff --git a/com.unity.shadergraph/Editor/Generation/Data/FieldCondition.cs.meta b/com.unity.shadergraph/Editor/Current/Generation/Data/FieldCondition.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Data/FieldCondition.cs.meta
rename to com.unity.shadergraph/Editor/Current/Generation/Data/FieldCondition.cs.meta
diff --git a/com.unity.shadergraph/Editor/Generation/Data/FieldDependency.cs b/com.unity.shadergraph/Editor/Current/Generation/Data/FieldDependency.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Data/FieldDependency.cs
rename to com.unity.shadergraph/Editor/Current/Generation/Data/FieldDependency.cs
diff --git a/com.unity.shadergraph/Editor/Generation/Data/FieldDependency.cs.meta b/com.unity.shadergraph/Editor/Current/Generation/Data/FieldDependency.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Data/FieldDependency.cs.meta
rename to com.unity.shadergraph/Editor/Current/Generation/Data/FieldDependency.cs.meta
diff --git a/com.unity.shadergraph/Editor/Generation/Data/KeywordEntry.cs b/com.unity.shadergraph/Editor/Current/Generation/Data/KeywordEntry.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Data/KeywordEntry.cs
rename to com.unity.shadergraph/Editor/Current/Generation/Data/KeywordEntry.cs
diff --git a/com.unity.shadergraph/Editor/Generation/Data/KeywordEntry.cs.meta b/com.unity.shadergraph/Editor/Current/Generation/Data/KeywordEntry.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Data/KeywordEntry.cs.meta
rename to com.unity.shadergraph/Editor/Current/Generation/Data/KeywordEntry.cs.meta
diff --git a/com.unity.shadergraph/Editor/Generation/Descriptors.meta b/com.unity.shadergraph/Editor/Current/Generation/Descriptors.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Descriptors.meta
rename to com.unity.shadergraph/Editor/Current/Generation/Descriptors.meta
diff --git a/com.unity.shadergraph/Editor/Generation/Descriptors/AdditionalCommandDescriptor.cs b/com.unity.shadergraph/Editor/Current/Generation/Descriptors/AdditionalCommandDescriptor.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Descriptors/AdditionalCommandDescriptor.cs
rename to com.unity.shadergraph/Editor/Current/Generation/Descriptors/AdditionalCommandDescriptor.cs
diff --git a/com.unity.shadergraph/Editor/Generation/Descriptors/AdditionalCommandDescriptor.cs.meta b/com.unity.shadergraph/Editor/Current/Generation/Descriptors/AdditionalCommandDescriptor.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Descriptors/AdditionalCommandDescriptor.cs.meta
rename to com.unity.shadergraph/Editor/Current/Generation/Descriptors/AdditionalCommandDescriptor.cs.meta
diff --git a/com.unity.shadergraph/Editor/Generation/Descriptors/BlockFieldDescriptor.cs b/com.unity.shadergraph/Editor/Current/Generation/Descriptors/BlockFieldDescriptor.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Descriptors/BlockFieldDescriptor.cs
rename to com.unity.shadergraph/Editor/Current/Generation/Descriptors/BlockFieldDescriptor.cs
diff --git a/com.unity.shadergraph/Editor/Generation/Descriptors/BlockFieldDescriptor.cs.meta b/com.unity.shadergraph/Editor/Current/Generation/Descriptors/BlockFieldDescriptor.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Descriptors/BlockFieldDescriptor.cs.meta
rename to com.unity.shadergraph/Editor/Current/Generation/Descriptors/BlockFieldDescriptor.cs.meta
diff --git a/com.unity.shadergraph/Editor/Generation/Descriptors/FieldDescriptor.cs b/com.unity.shadergraph/Editor/Current/Generation/Descriptors/FieldDescriptor.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Descriptors/FieldDescriptor.cs
rename to com.unity.shadergraph/Editor/Current/Generation/Descriptors/FieldDescriptor.cs
diff --git a/com.unity.shadergraph/Editor/Generation/Descriptors/FieldDescriptor.cs.meta b/com.unity.shadergraph/Editor/Current/Generation/Descriptors/FieldDescriptor.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Descriptors/FieldDescriptor.cs.meta
rename to com.unity.shadergraph/Editor/Current/Generation/Descriptors/FieldDescriptor.cs.meta
diff --git a/com.unity.shadergraph/Editor/Generation/Descriptors/IncludeDescriptor.cs b/com.unity.shadergraph/Editor/Current/Generation/Descriptors/IncludeDescriptor.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Descriptors/IncludeDescriptor.cs
rename to com.unity.shadergraph/Editor/Current/Generation/Descriptors/IncludeDescriptor.cs
diff --git a/com.unity.shadergraph/Editor/Generation/Descriptors/IncludeDescriptor.cs.meta b/com.unity.shadergraph/Editor/Current/Generation/Descriptors/IncludeDescriptor.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Descriptors/IncludeDescriptor.cs.meta
rename to com.unity.shadergraph/Editor/Current/Generation/Descriptors/IncludeDescriptor.cs.meta
diff --git a/com.unity.shadergraph/Editor/Generation/Descriptors/KeywordDescriptor.cs b/com.unity.shadergraph/Editor/Current/Generation/Descriptors/KeywordDescriptor.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Descriptors/KeywordDescriptor.cs
rename to com.unity.shadergraph/Editor/Current/Generation/Descriptors/KeywordDescriptor.cs
diff --git a/com.unity.shadergraph/Editor/Generation/Descriptors/KeywordDescriptor.cs.meta b/com.unity.shadergraph/Editor/Current/Generation/Descriptors/KeywordDescriptor.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Descriptors/KeywordDescriptor.cs.meta
rename to com.unity.shadergraph/Editor/Current/Generation/Descriptors/KeywordDescriptor.cs.meta
diff --git a/com.unity.shadergraph/Editor/Generation/Descriptors/PassDescriptor.cs b/com.unity.shadergraph/Editor/Current/Generation/Descriptors/PassDescriptor.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Descriptors/PassDescriptor.cs
rename to com.unity.shadergraph/Editor/Current/Generation/Descriptors/PassDescriptor.cs
diff --git a/com.unity.shadergraph/Editor/Generation/Descriptors/PassDescriptor.cs.meta b/com.unity.shadergraph/Editor/Current/Generation/Descriptors/PassDescriptor.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Descriptors/PassDescriptor.cs.meta
rename to com.unity.shadergraph/Editor/Current/Generation/Descriptors/PassDescriptor.cs.meta
diff --git a/com.unity.shadergraph/Editor/Generation/Descriptors/PragmaDescriptor.cs b/com.unity.shadergraph/Editor/Current/Generation/Descriptors/PragmaDescriptor.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Descriptors/PragmaDescriptor.cs
rename to com.unity.shadergraph/Editor/Current/Generation/Descriptors/PragmaDescriptor.cs
diff --git a/com.unity.shadergraph/Editor/Generation/Descriptors/PragmaDescriptor.cs.meta b/com.unity.shadergraph/Editor/Current/Generation/Descriptors/PragmaDescriptor.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Descriptors/PragmaDescriptor.cs.meta
rename to com.unity.shadergraph/Editor/Current/Generation/Descriptors/PragmaDescriptor.cs.meta
diff --git a/com.unity.shadergraph/Editor/Generation/Descriptors/RenderStateDescriptor.cs b/com.unity.shadergraph/Editor/Current/Generation/Descriptors/RenderStateDescriptor.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Descriptors/RenderStateDescriptor.cs
rename to com.unity.shadergraph/Editor/Current/Generation/Descriptors/RenderStateDescriptor.cs
diff --git a/com.unity.shadergraph/Editor/Generation/Descriptors/RenderStateDescriptor.cs.meta b/com.unity.shadergraph/Editor/Current/Generation/Descriptors/RenderStateDescriptor.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Descriptors/RenderStateDescriptor.cs.meta
rename to com.unity.shadergraph/Editor/Current/Generation/Descriptors/RenderStateDescriptor.cs.meta
diff --git a/com.unity.shadergraph/Editor/Generation/Descriptors/StencilDescriptor.cs b/com.unity.shadergraph/Editor/Current/Generation/Descriptors/StencilDescriptor.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Descriptors/StencilDescriptor.cs
rename to com.unity.shadergraph/Editor/Current/Generation/Descriptors/StencilDescriptor.cs
diff --git a/com.unity.shadergraph/Editor/Generation/Descriptors/StencilDescriptor.cs.meta b/com.unity.shadergraph/Editor/Current/Generation/Descriptors/StencilDescriptor.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Descriptors/StencilDescriptor.cs.meta
rename to com.unity.shadergraph/Editor/Current/Generation/Descriptors/StencilDescriptor.cs.meta
diff --git a/com.unity.shadergraph/Editor/Generation/Descriptors/StructDescriptor.cs b/com.unity.shadergraph/Editor/Current/Generation/Descriptors/StructDescriptor.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Descriptors/StructDescriptor.cs
rename to com.unity.shadergraph/Editor/Current/Generation/Descriptors/StructDescriptor.cs
diff --git a/com.unity.shadergraph/Editor/Generation/Descriptors/StructDescriptor.cs.meta b/com.unity.shadergraph/Editor/Current/Generation/Descriptors/StructDescriptor.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Descriptors/StructDescriptor.cs.meta
rename to com.unity.shadergraph/Editor/Current/Generation/Descriptors/StructDescriptor.cs.meta
diff --git a/com.unity.shadergraph/Editor/Generation/Descriptors/SubShaderDescriptor.cs b/com.unity.shadergraph/Editor/Current/Generation/Descriptors/SubShaderDescriptor.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Descriptors/SubShaderDescriptor.cs
rename to com.unity.shadergraph/Editor/Current/Generation/Descriptors/SubShaderDescriptor.cs
diff --git a/com.unity.shadergraph/Editor/Generation/Descriptors/SubShaderDescriptor.cs.meta b/com.unity.shadergraph/Editor/Current/Generation/Descriptors/SubShaderDescriptor.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Descriptors/SubShaderDescriptor.cs.meta
rename to com.unity.shadergraph/Editor/Current/Generation/Descriptors/SubShaderDescriptor.cs.meta
diff --git a/com.unity.shadergraph/Editor/Generation/Enumerations.meta b/com.unity.shadergraph/Editor/Current/Generation/Enumerations.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Enumerations.meta
rename to com.unity.shadergraph/Editor/Current/Generation/Enumerations.meta
diff --git a/com.unity.shadergraph/Editor/Generation/Enumerations/Blend.cs b/com.unity.shadergraph/Editor/Current/Generation/Enumerations/Blend.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Enumerations/Blend.cs
rename to com.unity.shadergraph/Editor/Current/Generation/Enumerations/Blend.cs
diff --git a/com.unity.shadergraph/Editor/Generation/Enumerations/Blend.cs.meta b/com.unity.shadergraph/Editor/Current/Generation/Enumerations/Blend.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Enumerations/Blend.cs.meta
rename to com.unity.shadergraph/Editor/Current/Generation/Enumerations/Blend.cs.meta
diff --git a/com.unity.shadergraph/Editor/Generation/Enumerations/BlendOp.cs b/com.unity.shadergraph/Editor/Current/Generation/Enumerations/BlendOp.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Enumerations/BlendOp.cs
rename to com.unity.shadergraph/Editor/Current/Generation/Enumerations/BlendOp.cs
diff --git a/com.unity.shadergraph/Editor/Generation/Enumerations/BlendOp.cs.meta b/com.unity.shadergraph/Editor/Current/Generation/Enumerations/BlendOp.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Enumerations/BlendOp.cs.meta
rename to com.unity.shadergraph/Editor/Current/Generation/Enumerations/BlendOp.cs.meta
diff --git a/com.unity.shadergraph/Editor/Generation/Enumerations/Cull.cs b/com.unity.shadergraph/Editor/Current/Generation/Enumerations/Cull.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Enumerations/Cull.cs
rename to com.unity.shadergraph/Editor/Current/Generation/Enumerations/Cull.cs
diff --git a/com.unity.shadergraph/Editor/Generation/Enumerations/Cull.cs.meta b/com.unity.shadergraph/Editor/Current/Generation/Enumerations/Cull.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Enumerations/Cull.cs.meta
rename to com.unity.shadergraph/Editor/Current/Generation/Enumerations/Cull.cs.meta
diff --git a/com.unity.shadergraph/Editor/Generation/Enumerations/IncludeLocation.cs b/com.unity.shadergraph/Editor/Current/Generation/Enumerations/IncludeLocation.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Enumerations/IncludeLocation.cs
rename to com.unity.shadergraph/Editor/Current/Generation/Enumerations/IncludeLocation.cs
diff --git a/com.unity.shadergraph/Editor/Generation/Enumerations/IncludeLocation.cs.meta b/com.unity.shadergraph/Editor/Current/Generation/Enumerations/IncludeLocation.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Enumerations/IncludeLocation.cs.meta
rename to com.unity.shadergraph/Editor/Current/Generation/Enumerations/IncludeLocation.cs.meta
diff --git a/com.unity.shadergraph/Editor/Generation/Enumerations/InstancingOptions.cs b/com.unity.shadergraph/Editor/Current/Generation/Enumerations/InstancingOptions.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Enumerations/InstancingOptions.cs
rename to com.unity.shadergraph/Editor/Current/Generation/Enumerations/InstancingOptions.cs
diff --git a/com.unity.shadergraph/Editor/Generation/Enumerations/InstancingOptions.cs.meta b/com.unity.shadergraph/Editor/Current/Generation/Enumerations/InstancingOptions.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Enumerations/InstancingOptions.cs.meta
rename to com.unity.shadergraph/Editor/Current/Generation/Enumerations/InstancingOptions.cs.meta
diff --git a/com.unity.shadergraph/Editor/Generation/Enumerations/KeywordDefinition.cs b/com.unity.shadergraph/Editor/Current/Generation/Enumerations/KeywordDefinition.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Enumerations/KeywordDefinition.cs
rename to com.unity.shadergraph/Editor/Current/Generation/Enumerations/KeywordDefinition.cs
diff --git a/com.unity.shadergraph/Editor/Generation/Enumerations/KeywordDefinition.cs.meta b/com.unity.shadergraph/Editor/Current/Generation/Enumerations/KeywordDefinition.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Enumerations/KeywordDefinition.cs.meta
rename to com.unity.shadergraph/Editor/Current/Generation/Enumerations/KeywordDefinition.cs.meta
diff --git a/com.unity.shadergraph/Editor/Generation/Enumerations/KeywordScope.cs b/com.unity.shadergraph/Editor/Current/Generation/Enumerations/KeywordScope.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Enumerations/KeywordScope.cs
rename to com.unity.shadergraph/Editor/Current/Generation/Enumerations/KeywordScope.cs
diff --git a/com.unity.shadergraph/Editor/Generation/Enumerations/KeywordScope.cs.meta b/com.unity.shadergraph/Editor/Current/Generation/Enumerations/KeywordScope.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Enumerations/KeywordScope.cs.meta
rename to com.unity.shadergraph/Editor/Current/Generation/Enumerations/KeywordScope.cs.meta
diff --git a/com.unity.shadergraph/Editor/Generation/Enumerations/KeywordShaderStage.cs b/com.unity.shadergraph/Editor/Current/Generation/Enumerations/KeywordShaderStage.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Enumerations/KeywordShaderStage.cs
rename to com.unity.shadergraph/Editor/Current/Generation/Enumerations/KeywordShaderStage.cs
diff --git a/com.unity.shadergraph/Editor/Generation/Enumerations/KeywordShaderStage.cs.meta b/com.unity.shadergraph/Editor/Current/Generation/Enumerations/KeywordShaderStage.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Enumerations/KeywordShaderStage.cs.meta
rename to com.unity.shadergraph/Editor/Current/Generation/Enumerations/KeywordShaderStage.cs.meta
diff --git a/com.unity.shadergraph/Editor/Generation/Enumerations/KeywordType.cs b/com.unity.shadergraph/Editor/Current/Generation/Enumerations/KeywordType.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Enumerations/KeywordType.cs
rename to com.unity.shadergraph/Editor/Current/Generation/Enumerations/KeywordType.cs
diff --git a/com.unity.shadergraph/Editor/Generation/Enumerations/KeywordType.cs.meta b/com.unity.shadergraph/Editor/Current/Generation/Enumerations/KeywordType.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Enumerations/KeywordType.cs.meta
rename to com.unity.shadergraph/Editor/Current/Generation/Enumerations/KeywordType.cs.meta
diff --git a/com.unity.shadergraph/Editor/Generation/Enumerations/NormalDropOffSpace.cs b/com.unity.shadergraph/Editor/Current/Generation/Enumerations/NormalDropOffSpace.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Enumerations/NormalDropOffSpace.cs
rename to com.unity.shadergraph/Editor/Current/Generation/Enumerations/NormalDropOffSpace.cs
diff --git a/com.unity.shadergraph/Editor/Generation/Enumerations/NormalDropOffSpace.cs.meta b/com.unity.shadergraph/Editor/Current/Generation/Enumerations/NormalDropOffSpace.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Enumerations/NormalDropOffSpace.cs.meta
rename to com.unity.shadergraph/Editor/Current/Generation/Enumerations/NormalDropOffSpace.cs.meta
diff --git a/com.unity.shadergraph/Editor/Generation/Enumerations/Platform.cs b/com.unity.shadergraph/Editor/Current/Generation/Enumerations/Platform.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Enumerations/Platform.cs
rename to com.unity.shadergraph/Editor/Current/Generation/Enumerations/Platform.cs
diff --git a/com.unity.shadergraph/Editor/Generation/Enumerations/Platform.cs.meta b/com.unity.shadergraph/Editor/Current/Generation/Enumerations/Platform.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Enumerations/Platform.cs.meta
rename to com.unity.shadergraph/Editor/Current/Generation/Enumerations/Platform.cs.meta
diff --git a/com.unity.shadergraph/Editor/Generation/Enumerations/PropertyType.cs b/com.unity.shadergraph/Editor/Current/Generation/Enumerations/PropertyType.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Enumerations/PropertyType.cs
rename to com.unity.shadergraph/Editor/Current/Generation/Enumerations/PropertyType.cs
diff --git a/com.unity.shadergraph/Editor/Generation/Enumerations/PropertyType.cs.meta b/com.unity.shadergraph/Editor/Current/Generation/Enumerations/PropertyType.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Enumerations/PropertyType.cs.meta
rename to com.unity.shadergraph/Editor/Current/Generation/Enumerations/PropertyType.cs.meta
diff --git a/com.unity.shadergraph/Editor/Generation/Enumerations/RenderQueue.cs b/com.unity.shadergraph/Editor/Current/Generation/Enumerations/RenderQueue.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Enumerations/RenderQueue.cs
rename to com.unity.shadergraph/Editor/Current/Generation/Enumerations/RenderQueue.cs
diff --git a/com.unity.shadergraph/Editor/Generation/Enumerations/RenderQueue.cs.meta b/com.unity.shadergraph/Editor/Current/Generation/Enumerations/RenderQueue.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Enumerations/RenderQueue.cs.meta
rename to com.unity.shadergraph/Editor/Current/Generation/Enumerations/RenderQueue.cs.meta
diff --git a/com.unity.shadergraph/Editor/Generation/Enumerations/RenderType.cs b/com.unity.shadergraph/Editor/Current/Generation/Enumerations/RenderType.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Enumerations/RenderType.cs
rename to com.unity.shadergraph/Editor/Current/Generation/Enumerations/RenderType.cs
diff --git a/com.unity.shadergraph/Editor/Generation/Enumerations/RenderType.cs.meta b/com.unity.shadergraph/Editor/Current/Generation/Enumerations/RenderType.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Enumerations/RenderType.cs.meta
rename to com.unity.shadergraph/Editor/Current/Generation/Enumerations/RenderType.cs.meta
diff --git a/com.unity.shadergraph/Editor/Generation/Enumerations/ShaderModel.cs b/com.unity.shadergraph/Editor/Current/Generation/Enumerations/ShaderModel.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Enumerations/ShaderModel.cs
rename to com.unity.shadergraph/Editor/Current/Generation/Enumerations/ShaderModel.cs
diff --git a/com.unity.shadergraph/Editor/Generation/Enumerations/ShaderModel.cs.meta b/com.unity.shadergraph/Editor/Current/Generation/Enumerations/ShaderModel.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Enumerations/ShaderModel.cs.meta
rename to com.unity.shadergraph/Editor/Current/Generation/Enumerations/ShaderModel.cs.meta
diff --git a/com.unity.shadergraph/Editor/Generation/Enumerations/ShaderValueType.cs b/com.unity.shadergraph/Editor/Current/Generation/Enumerations/ShaderValueType.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Enumerations/ShaderValueType.cs
rename to com.unity.shadergraph/Editor/Current/Generation/Enumerations/ShaderValueType.cs
diff --git a/com.unity.shadergraph/Editor/Generation/Enumerations/ShaderValueType.cs.meta b/com.unity.shadergraph/Editor/Current/Generation/Enumerations/ShaderValueType.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Enumerations/ShaderValueType.cs.meta
rename to com.unity.shadergraph/Editor/Current/Generation/Enumerations/ShaderValueType.cs.meta
diff --git a/com.unity.shadergraph/Editor/Generation/Enumerations/StructFieldOptions.cs b/com.unity.shadergraph/Editor/Current/Generation/Enumerations/StructFieldOptions.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Enumerations/StructFieldOptions.cs
rename to com.unity.shadergraph/Editor/Current/Generation/Enumerations/StructFieldOptions.cs
diff --git a/com.unity.shadergraph/Editor/Generation/Enumerations/StructFieldOptions.cs.meta b/com.unity.shadergraph/Editor/Current/Generation/Enumerations/StructFieldOptions.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Enumerations/StructFieldOptions.cs.meta
rename to com.unity.shadergraph/Editor/Current/Generation/Enumerations/StructFieldOptions.cs.meta
diff --git a/com.unity.shadergraph/Editor/Generation/Enumerations/ZTest.cs b/com.unity.shadergraph/Editor/Current/Generation/Enumerations/ZTest.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Enumerations/ZTest.cs
rename to com.unity.shadergraph/Editor/Current/Generation/Enumerations/ZTest.cs
diff --git a/com.unity.shadergraph/Editor/Generation/Enumerations/ZTest.cs.meta b/com.unity.shadergraph/Editor/Current/Generation/Enumerations/ZTest.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Enumerations/ZTest.cs.meta
rename to com.unity.shadergraph/Editor/Current/Generation/Enumerations/ZTest.cs.meta
diff --git a/com.unity.shadergraph/Editor/Generation/Enumerations/ZWrite.cs b/com.unity.shadergraph/Editor/Current/Generation/Enumerations/ZWrite.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Enumerations/ZWrite.cs
rename to com.unity.shadergraph/Editor/Current/Generation/Enumerations/ZWrite.cs
diff --git a/com.unity.shadergraph/Editor/Generation/Enumerations/ZWrite.cs.meta b/com.unity.shadergraph/Editor/Current/Generation/Enumerations/ZWrite.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Enumerations/ZWrite.cs.meta
rename to com.unity.shadergraph/Editor/Current/Generation/Enumerations/ZWrite.cs.meta
diff --git a/com.unity.shadergraph/Editor/Generation/GraphCode.cs b/com.unity.shadergraph/Editor/Current/Generation/GraphCode.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/GraphCode.cs
rename to com.unity.shadergraph/Editor/Current/Generation/GraphCode.cs
diff --git a/com.unity.shadergraph/Editor/Generation/GraphCode.cs.meta b/com.unity.shadergraph/Editor/Current/Generation/GraphCode.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/GraphCode.cs.meta
rename to com.unity.shadergraph/Editor/Current/Generation/GraphCode.cs.meta
diff --git a/com.unity.shadergraph/Editor/Generation/IHasMetaData.cs b/com.unity.shadergraph/Editor/Current/Generation/IHasMetaData.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/IHasMetaData.cs
rename to com.unity.shadergraph/Editor/Current/Generation/IHasMetaData.cs
diff --git a/com.unity.shadergraph/Editor/Generation/IHasMetaData.cs.meta b/com.unity.shadergraph/Editor/Current/Generation/IHasMetaData.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/IHasMetaData.cs.meta
rename to com.unity.shadergraph/Editor/Current/Generation/IHasMetaData.cs.meta
diff --git a/com.unity.shadergraph/Editor/Generation/OutputMetadata.cs b/com.unity.shadergraph/Editor/Current/Generation/OutputMetadata.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/OutputMetadata.cs
rename to com.unity.shadergraph/Editor/Current/Generation/OutputMetadata.cs
diff --git a/com.unity.shadergraph/Editor/Generation/OutputMetadata.cs.meta b/com.unity.shadergraph/Editor/Current/Generation/OutputMetadata.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/OutputMetadata.cs.meta
rename to com.unity.shadergraph/Editor/Current/Generation/OutputMetadata.cs.meta
diff --git a/com.unity.shadergraph/Editor/Generation/Processors.meta b/com.unity.shadergraph/Editor/Current/Generation/Processors.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Processors.meta
rename to com.unity.shadergraph/Editor/Current/Generation/Processors.meta
diff --git a/com.unity.shadergraph/Editor/Generation/Processors/ActiveFields.cs b/com.unity.shadergraph/Editor/Current/Generation/Processors/ActiveFields.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Processors/ActiveFields.cs
rename to com.unity.shadergraph/Editor/Current/Generation/Processors/ActiveFields.cs
diff --git a/com.unity.shadergraph/Editor/Generation/Processors/ActiveFields.cs.meta b/com.unity.shadergraph/Editor/Current/Generation/Processors/ActiveFields.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Processors/ActiveFields.cs.meta
rename to com.unity.shadergraph/Editor/Current/Generation/Processors/ActiveFields.cs.meta
diff --git a/com.unity.shadergraph/Editor/Generation/Processors/CustomInterpolatorUtils.cs b/com.unity.shadergraph/Editor/Current/Generation/Processors/CustomInterpolatorUtils.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Processors/CustomInterpolatorUtils.cs
rename to com.unity.shadergraph/Editor/Current/Generation/Processors/CustomInterpolatorUtils.cs
diff --git a/com.unity.shadergraph/Editor/Generation/Processors/CustomInterpolatorUtils.cs.meta b/com.unity.shadergraph/Editor/Current/Generation/Processors/CustomInterpolatorUtils.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Processors/CustomInterpolatorUtils.cs.meta
rename to com.unity.shadergraph/Editor/Current/Generation/Processors/CustomInterpolatorUtils.cs.meta
diff --git a/com.unity.shadergraph/Editor/Generation/Processors/GenerationUtils.cs b/com.unity.shadergraph/Editor/Current/Generation/Processors/GenerationUtils.cs
similarity index 99%
rename from com.unity.shadergraph/Editor/Generation/Processors/GenerationUtils.cs
rename to com.unity.shadergraph/Editor/Current/Generation/Processors/GenerationUtils.cs
index ccd885bbf36..a09db4302ed 100644
--- a/com.unity.shadergraph/Editor/Generation/Processors/GenerationUtils.cs
+++ b/com.unity.shadergraph/Editor/Current/Generation/Processors/GenerationUtils.cs
@@ -1105,7 +1105,7 @@ internal static string GetSpliceCommand(string command, string token)
 
         internal static string GetDefaultTemplatePath(string templateName)
         {
-            var basePath = "Packages/com.unity.shadergraph/Editor/Generation/Templates/";
+            var basePath = "Packages/com.unity.shadergraph/Editor/Current/Generation/Templates/";
             string templatePath = Path.Combine(basePath, templateName);
 
             if (File.Exists(templatePath))
@@ -1116,7 +1116,7 @@ internal static string GetDefaultTemplatePath(string templateName)
 
         internal static string[] defaultDefaultSharedTemplateDirectories = new string[]
         {
-            "Packages/com.unity.shadergraph/Editor/Generation/Templates"
+            "Packages/com.unity.shadergraph/Editor/Current/Generation/Templates"
         };
 
         internal static string[] GetDefaultSharedTemplateDirectories()
diff --git a/com.unity.shadergraph/Editor/Generation/Processors/GenerationUtils.cs.meta b/com.unity.shadergraph/Editor/Current/Generation/Processors/GenerationUtils.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Processors/GenerationUtils.cs.meta
rename to com.unity.shadergraph/Editor/Current/Generation/Processors/GenerationUtils.cs.meta
diff --git a/com.unity.shadergraph/Editor/Generation/Processors/Generator.cs b/com.unity.shadergraph/Editor/Current/Generation/Processors/Generator.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Processors/Generator.cs
rename to com.unity.shadergraph/Editor/Current/Generation/Processors/Generator.cs
diff --git a/com.unity.shadergraph/Editor/Generation/Processors/Generator.cs.meta b/com.unity.shadergraph/Editor/Current/Generation/Processors/Generator.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Processors/Generator.cs.meta
rename to com.unity.shadergraph/Editor/Current/Generation/Processors/Generator.cs.meta
diff --git a/com.unity.shadergraph/Editor/Generation/Processors/GraphCompilationResult.cs b/com.unity.shadergraph/Editor/Current/Generation/Processors/GraphCompilationResult.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Processors/GraphCompilationResult.cs
rename to com.unity.shadergraph/Editor/Current/Generation/Processors/GraphCompilationResult.cs
diff --git a/com.unity.shadergraph/Editor/Generation/Processors/GraphCompilationResult.cs.meta b/com.unity.shadergraph/Editor/Current/Generation/Processors/GraphCompilationResult.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Processors/GraphCompilationResult.cs.meta
rename to com.unity.shadergraph/Editor/Current/Generation/Processors/GraphCompilationResult.cs.meta
diff --git a/com.unity.shadergraph/Editor/Generation/Processors/MatrixNames.cs b/com.unity.shadergraph/Editor/Current/Generation/Processors/MatrixNames.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Processors/MatrixNames.cs
rename to com.unity.shadergraph/Editor/Current/Generation/Processors/MatrixNames.cs
diff --git a/com.unity.shadergraph/Editor/Generation/Processors/MatrixNames.cs.meta b/com.unity.shadergraph/Editor/Current/Generation/Processors/MatrixNames.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Processors/MatrixNames.cs.meta
rename to com.unity.shadergraph/Editor/Current/Generation/Processors/MatrixNames.cs.meta
diff --git a/com.unity.shadergraph/Editor/Generation/Processors/PropertyCollector.cs b/com.unity.shadergraph/Editor/Current/Generation/Processors/PropertyCollector.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Processors/PropertyCollector.cs
rename to com.unity.shadergraph/Editor/Current/Generation/Processors/PropertyCollector.cs
diff --git a/com.unity.shadergraph/Editor/Generation/Processors/PropertyCollector.cs.meta b/com.unity.shadergraph/Editor/Current/Generation/Processors/PropertyCollector.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Processors/PropertyCollector.cs.meta
rename to com.unity.shadergraph/Editor/Current/Generation/Processors/PropertyCollector.cs.meta
diff --git a/com.unity.shadergraph/Editor/Generation/Processors/ShaderGeneratorNames.cs b/com.unity.shadergraph/Editor/Current/Generation/Processors/ShaderGeneratorNames.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Processors/ShaderGeneratorNames.cs
rename to com.unity.shadergraph/Editor/Current/Generation/Processors/ShaderGeneratorNames.cs
diff --git a/com.unity.shadergraph/Editor/Generation/Processors/ShaderGeneratorNames.cs.meta b/com.unity.shadergraph/Editor/Current/Generation/Processors/ShaderGeneratorNames.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Processors/ShaderGeneratorNames.cs.meta
rename to com.unity.shadergraph/Editor/Current/Generation/Processors/ShaderGeneratorNames.cs.meta
diff --git a/com.unity.shadergraph/Editor/Generation/Processors/ShaderSpliceUtil.cs b/com.unity.shadergraph/Editor/Current/Generation/Processors/ShaderSpliceUtil.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Processors/ShaderSpliceUtil.cs
rename to com.unity.shadergraph/Editor/Current/Generation/Processors/ShaderSpliceUtil.cs
diff --git a/com.unity.shadergraph/Editor/Generation/Processors/ShaderSpliceUtil.cs.meta b/com.unity.shadergraph/Editor/Current/Generation/Processors/ShaderSpliceUtil.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Processors/ShaderSpliceUtil.cs.meta
rename to com.unity.shadergraph/Editor/Current/Generation/Processors/ShaderSpliceUtil.cs.meta
diff --git a/com.unity.shadergraph/Editor/Generation/Processors/ShaderStringBuilder.cs b/com.unity.shadergraph/Editor/Current/Generation/Processors/ShaderStringBuilder.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Processors/ShaderStringBuilder.cs
rename to com.unity.shadergraph/Editor/Current/Generation/Processors/ShaderStringBuilder.cs
diff --git a/com.unity.shadergraph/Editor/Generation/Processors/ShaderStringBuilder.cs.meta b/com.unity.shadergraph/Editor/Current/Generation/Processors/ShaderStringBuilder.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Processors/ShaderStringBuilder.cs.meta
rename to com.unity.shadergraph/Editor/Current/Generation/Processors/ShaderStringBuilder.cs.meta
diff --git a/com.unity.shadergraph/Editor/Generation/ShaderGraphVfxAsset.cs b/com.unity.shadergraph/Editor/Current/Generation/ShaderGraphVfxAsset.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/ShaderGraphVfxAsset.cs
rename to com.unity.shadergraph/Editor/Current/Generation/ShaderGraphVfxAsset.cs
diff --git a/com.unity.shadergraph/Editor/Generation/ShaderGraphVfxAsset.cs.meta b/com.unity.shadergraph/Editor/Current/Generation/ShaderGraphVfxAsset.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/ShaderGraphVfxAsset.cs.meta
rename to com.unity.shadergraph/Editor/Current/Generation/ShaderGraphVfxAsset.cs.meta
diff --git a/com.unity.shadergraph/Editor/Generation/SubTarget.cs b/com.unity.shadergraph/Editor/Current/Generation/SubTarget.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/SubTarget.cs
rename to com.unity.shadergraph/Editor/Current/Generation/SubTarget.cs
diff --git a/com.unity.shadergraph/Editor/Generation/SubTarget.cs.meta b/com.unity.shadergraph/Editor/Current/Generation/SubTarget.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/SubTarget.cs.meta
rename to com.unity.shadergraph/Editor/Current/Generation/SubTarget.cs.meta
diff --git a/com.unity.shadergraph/Editor/Generation/Target.cs b/com.unity.shadergraph/Editor/Current/Generation/Target.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Target.cs
rename to com.unity.shadergraph/Editor/Current/Generation/Target.cs
diff --git a/com.unity.shadergraph/Editor/Generation/Target.cs.meta b/com.unity.shadergraph/Editor/Current/Generation/Target.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Target.cs.meta
rename to com.unity.shadergraph/Editor/Current/Generation/Target.cs.meta
diff --git a/com.unity.shadergraph/Editor/Generation/TargetResources.meta b/com.unity.shadergraph/Editor/Current/Generation/TargetResources.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/TargetResources.meta
rename to com.unity.shadergraph/Editor/Current/Generation/TargetResources.meta
diff --git a/com.unity.shadergraph/Editor/Generation/TargetResources/BlockFields.cs b/com.unity.shadergraph/Editor/Current/Generation/TargetResources/BlockFields.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/TargetResources/BlockFields.cs
rename to com.unity.shadergraph/Editor/Current/Generation/TargetResources/BlockFields.cs
diff --git a/com.unity.shadergraph/Editor/Generation/TargetResources/BlockFields.cs.meta b/com.unity.shadergraph/Editor/Current/Generation/TargetResources/BlockFields.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/TargetResources/BlockFields.cs.meta
rename to com.unity.shadergraph/Editor/Current/Generation/TargetResources/BlockFields.cs.meta
diff --git a/com.unity.shadergraph/Editor/Generation/TargetResources/FieldDependencies.cs b/com.unity.shadergraph/Editor/Current/Generation/TargetResources/FieldDependencies.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/TargetResources/FieldDependencies.cs
rename to com.unity.shadergraph/Editor/Current/Generation/TargetResources/FieldDependencies.cs
diff --git a/com.unity.shadergraph/Editor/Generation/TargetResources/FieldDependencies.cs.meta b/com.unity.shadergraph/Editor/Current/Generation/TargetResources/FieldDependencies.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/TargetResources/FieldDependencies.cs.meta
rename to com.unity.shadergraph/Editor/Current/Generation/TargetResources/FieldDependencies.cs.meta
diff --git a/com.unity.shadergraph/Editor/Generation/TargetResources/Fields.cs b/com.unity.shadergraph/Editor/Current/Generation/TargetResources/Fields.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/TargetResources/Fields.cs
rename to com.unity.shadergraph/Editor/Current/Generation/TargetResources/Fields.cs
diff --git a/com.unity.shadergraph/Editor/Generation/TargetResources/Fields.cs.meta b/com.unity.shadergraph/Editor/Current/Generation/TargetResources/Fields.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/TargetResources/Fields.cs.meta
rename to com.unity.shadergraph/Editor/Current/Generation/TargetResources/Fields.cs.meta
diff --git a/com.unity.shadergraph/Editor/Generation/TargetResources/StructFields.cs b/com.unity.shadergraph/Editor/Current/Generation/TargetResources/StructFields.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/TargetResources/StructFields.cs
rename to com.unity.shadergraph/Editor/Current/Generation/TargetResources/StructFields.cs
diff --git a/com.unity.shadergraph/Editor/Generation/TargetResources/StructFields.cs.meta b/com.unity.shadergraph/Editor/Current/Generation/TargetResources/StructFields.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/TargetResources/StructFields.cs.meta
rename to com.unity.shadergraph/Editor/Current/Generation/TargetResources/StructFields.cs.meta
diff --git a/com.unity.shadergraph/Editor/Generation/TargetResources/Structs.cs b/com.unity.shadergraph/Editor/Current/Generation/TargetResources/Structs.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/TargetResources/Structs.cs
rename to com.unity.shadergraph/Editor/Current/Generation/TargetResources/Structs.cs
diff --git a/com.unity.shadergraph/Editor/Generation/TargetResources/Structs.cs.meta b/com.unity.shadergraph/Editor/Current/Generation/TargetResources/Structs.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/TargetResources/Structs.cs.meta
rename to com.unity.shadergraph/Editor/Current/Generation/TargetResources/Structs.cs.meta
diff --git a/com.unity.shadergraph/Editor/Generation/Targets.meta b/com.unity.shadergraph/Editor/Current/Generation/Targets.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Targets.meta
rename to com.unity.shadergraph/Editor/Current/Generation/Targets.meta
diff --git a/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn.meta b/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Targets/BuiltIn.meta
rename to com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn.meta
diff --git a/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor.meta b/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor.meta
rename to com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor.meta
diff --git a/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/AssetPostProcessors.meta b/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/AssetPostProcessors.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/AssetPostProcessors.meta
rename to com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/AssetPostProcessors.meta
diff --git a/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/AssetPostProcessors/MaterialPostprocessor.cs b/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/AssetPostProcessors/MaterialPostprocessor.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/AssetPostProcessors/MaterialPostprocessor.cs
rename to com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/AssetPostProcessors/MaterialPostprocessor.cs
diff --git a/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/AssetPostProcessors/MaterialPostprocessor.cs.meta b/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/AssetPostProcessors/MaterialPostprocessor.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/AssetPostProcessors/MaterialPostprocessor.cs.meta
rename to com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/AssetPostProcessors/MaterialPostprocessor.cs.meta
diff --git a/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/AssetPostProcessors/ShaderGraphMaterialsUpdater.cs b/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/AssetPostProcessors/ShaderGraphMaterialsUpdater.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/AssetPostProcessors/ShaderGraphMaterialsUpdater.cs
rename to com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/AssetPostProcessors/ShaderGraphMaterialsUpdater.cs
diff --git a/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/AssetPostProcessors/ShaderGraphMaterialsUpdater.cs.meta b/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/AssetPostProcessors/ShaderGraphMaterialsUpdater.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/AssetPostProcessors/ShaderGraphMaterialsUpdater.cs.meta
rename to com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/AssetPostProcessors/ShaderGraphMaterialsUpdater.cs.meta
diff --git a/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/AssetVersion.cs b/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/AssetVersion.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/AssetVersion.cs
rename to com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/AssetVersion.cs
diff --git a/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/AssetVersion.cs.meta b/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/AssetVersion.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/AssetVersion.cs.meta
rename to com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/AssetVersion.cs.meta
diff --git a/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGUI.meta b/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderGUI.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGUI.meta
rename to com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderGUI.meta
diff --git a/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGUI/BaseShaderGUI.cs b/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderGUI/BaseShaderGUI.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGUI/BaseShaderGUI.cs
rename to com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderGUI/BaseShaderGUI.cs
diff --git a/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGUI/BaseShaderGUI.cs.meta b/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderGUI/BaseShaderGUI.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGUI/BaseShaderGUI.cs.meta
rename to com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderGUI/BaseShaderGUI.cs.meta
diff --git a/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGUI/BuiltInLitGUI.cs b/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderGUI/BuiltInLitGUI.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGUI/BuiltInLitGUI.cs
rename to com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderGUI/BuiltInLitGUI.cs
diff --git a/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGUI/BuiltInLitGUI.cs.meta b/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderGUI/BuiltInLitGUI.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGUI/BuiltInLitGUI.cs.meta
rename to com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderGUI/BuiltInLitGUI.cs.meta
diff --git a/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGUI/BuiltInUnlitGUI.cs b/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderGUI/BuiltInUnlitGUI.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGUI/BuiltInUnlitGUI.cs
rename to com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderGUI/BuiltInUnlitGUI.cs
diff --git a/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGUI/BuiltInUnlitGUI.cs.meta b/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderGUI/BuiltInUnlitGUI.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGUI/BuiltInUnlitGUI.cs.meta
rename to com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderGUI/BuiltInUnlitGUI.cs.meta
diff --git a/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGUI/MaterialAssemblyReference.meta b/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderGUI/MaterialAssemblyReference.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGUI/MaterialAssemblyReference.meta
rename to com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderGUI/MaterialAssemblyReference.meta
diff --git a/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGUI/MaterialAssemblyReference/MaterialAssemblyReference.asmref b/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderGUI/MaterialAssemblyReference/MaterialAssemblyReference.asmref
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGUI/MaterialAssemblyReference/MaterialAssemblyReference.asmref
rename to com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderGUI/MaterialAssemblyReference/MaterialAssemblyReference.asmref
diff --git a/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGUI/MaterialAssemblyReference/MaterialAssemblyReference.asmref.meta b/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderGUI/MaterialAssemblyReference/MaterialAssemblyReference.asmref.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGUI/MaterialAssemblyReference/MaterialAssemblyReference.asmref.meta
rename to com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderGUI/MaterialAssemblyReference/MaterialAssemblyReference.asmref.meta
diff --git a/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGUI/MaterialAssemblyReference/RawRenderQueue.cs b/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderGUI/MaterialAssemblyReference/RawRenderQueue.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGUI/MaterialAssemblyReference/RawRenderQueue.cs
rename to com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderGUI/MaterialAssemblyReference/RawRenderQueue.cs
diff --git a/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGUI/MaterialAssemblyReference/RawRenderQueue.cs.meta b/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderGUI/MaterialAssemblyReference/RawRenderQueue.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGUI/MaterialAssemblyReference/RawRenderQueue.cs.meta
rename to com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderGUI/MaterialAssemblyReference/RawRenderQueue.cs.meta
diff --git a/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGraph.meta b/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderGraph.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGraph.meta
rename to com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderGraph.meta
diff --git a/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGraph/AssetCallbacks.meta b/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderGraph/AssetCallbacks.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGraph/AssetCallbacks.meta
rename to com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderGraph/AssetCallbacks.meta
diff --git a/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGraph/AssetCallbacks/CreateLitShaderGraph.cs b/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderGraph/AssetCallbacks/CreateLitShaderGraph.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGraph/AssetCallbacks/CreateLitShaderGraph.cs
rename to com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderGraph/AssetCallbacks/CreateLitShaderGraph.cs
diff --git a/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGraph/AssetCallbacks/CreateLitShaderGraph.cs.meta b/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderGraph/AssetCallbacks/CreateLitShaderGraph.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGraph/AssetCallbacks/CreateLitShaderGraph.cs.meta
rename to com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderGraph/AssetCallbacks/CreateLitShaderGraph.cs.meta
diff --git a/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGraph/AssetCallbacks/CreateUnlitShaderGraph.cs b/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderGraph/AssetCallbacks/CreateUnlitShaderGraph.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGraph/AssetCallbacks/CreateUnlitShaderGraph.cs
rename to com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderGraph/AssetCallbacks/CreateUnlitShaderGraph.cs
diff --git a/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGraph/AssetCallbacks/CreateUnlitShaderGraph.cs.meta b/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderGraph/AssetCallbacks/CreateUnlitShaderGraph.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGraph/AssetCallbacks/CreateUnlitShaderGraph.cs.meta
rename to com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderGraph/AssetCallbacks/CreateUnlitShaderGraph.cs.meta
diff --git a/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGraph/BuiltInFields.cs b/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderGraph/BuiltInFields.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGraph/BuiltInFields.cs
rename to com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderGraph/BuiltInFields.cs
diff --git a/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGraph/BuiltInFields.cs.meta b/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderGraph/BuiltInFields.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGraph/BuiltInFields.cs.meta
rename to com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderGraph/BuiltInFields.cs.meta
diff --git a/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGraph/BuiltInMetadata.cs b/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderGraph/BuiltInMetadata.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGraph/BuiltInMetadata.cs
rename to com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderGraph/BuiltInMetadata.cs
diff --git a/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGraph/BuiltInMetadata.cs.meta b/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderGraph/BuiltInMetadata.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGraph/BuiltInMetadata.cs.meta
rename to com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderGraph/BuiltInMetadata.cs.meta
diff --git a/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGraph/BuiltInProperties.cs b/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderGraph/BuiltInProperties.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGraph/BuiltInProperties.cs
rename to com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderGraph/BuiltInProperties.cs
diff --git a/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGraph/BuiltInProperties.cs.meta b/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderGraph/BuiltInProperties.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGraph/BuiltInProperties.cs.meta
rename to com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderGraph/BuiltInProperties.cs.meta
diff --git a/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGraph/BuiltInStructFields.cs b/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderGraph/BuiltInStructFields.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGraph/BuiltInStructFields.cs
rename to com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderGraph/BuiltInStructFields.cs
diff --git a/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGraph/BuiltInStructFields.cs.meta b/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderGraph/BuiltInStructFields.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGraph/BuiltInStructFields.cs.meta
rename to com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderGraph/BuiltInStructFields.cs.meta
diff --git a/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGraph/BuiltInStructs.cs b/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderGraph/BuiltInStructs.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGraph/BuiltInStructs.cs
rename to com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderGraph/BuiltInStructs.cs
diff --git a/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGraph/BuiltInStructs.cs.meta b/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderGraph/BuiltInStructs.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGraph/BuiltInStructs.cs.meta
rename to com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderGraph/BuiltInStructs.cs.meta
diff --git a/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes.meta b/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes.meta
rename to com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes.meta
diff --git a/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes/BuildInputData.hlsl b/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes/BuildInputData.hlsl
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes/BuildInputData.hlsl
rename to com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes/BuildInputData.hlsl
diff --git a/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes/BuildInputData.hlsl.meta b/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes/BuildInputData.hlsl.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes/BuildInputData.hlsl.meta
rename to com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes/BuildInputData.hlsl.meta
diff --git a/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes/DepthOnlyPass.hlsl b/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes/DepthOnlyPass.hlsl
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes/DepthOnlyPass.hlsl
rename to com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes/DepthOnlyPass.hlsl
diff --git a/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes/DepthOnlyPass.hlsl.meta b/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes/DepthOnlyPass.hlsl.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes/DepthOnlyPass.hlsl.meta
rename to com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes/DepthOnlyPass.hlsl.meta
diff --git a/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes/LegacyBuilding.hlsl b/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes/LegacyBuilding.hlsl
similarity index 93%
rename from com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes/LegacyBuilding.hlsl
rename to com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes/LegacyBuilding.hlsl
index 6f7104ea3f6..2d13c1099c7 100644
--- a/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes/LegacyBuilding.hlsl
+++ b/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes/LegacyBuilding.hlsl
@@ -1,7 +1,7 @@
 #ifndef UNITY_LEGACY_BUILDING_INCLUDED
 #define UNITY_LEGACY_BUILDING_INCLUDED
 
-#include "Packages/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/ShaderLibrary/SurfaceData.hlsl"
+#include "Packages/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/ShaderLibrary/SurfaceData.hlsl"
 
 SurfaceData SurfaceDescriptionToSurfaceData(SurfaceDescription surfaceDescription)
 {
diff --git a/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes/LegacyBuilding.hlsl.meta b/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes/LegacyBuilding.hlsl.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes/LegacyBuilding.hlsl.meta
rename to com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes/LegacyBuilding.hlsl.meta
diff --git a/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes/LegacySurfaceVertex.hlsl b/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes/LegacySurfaceVertex.hlsl
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes/LegacySurfaceVertex.hlsl
rename to com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes/LegacySurfaceVertex.hlsl
diff --git a/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes/LegacySurfaceVertex.hlsl.meta b/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes/LegacySurfaceVertex.hlsl.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes/LegacySurfaceVertex.hlsl.meta
rename to com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes/LegacySurfaceVertex.hlsl.meta
diff --git a/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes/LightingMetaPass.hlsl b/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes/LightingMetaPass.hlsl
similarity index 97%
rename from com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes/LightingMetaPass.hlsl
rename to com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes/LightingMetaPass.hlsl
index 5cfa99e58f8..53bbacb6ca4 100644
--- a/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes/LightingMetaPass.hlsl
+++ b/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes/LightingMetaPass.hlsl
@@ -2,7 +2,7 @@
 #define SG_LIT_META_INCLUDED
 
 #include "UnityMetaPass.cginc"
-#include "Packages/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/ShaderLibrary/SurfaceData.hlsl"
+#include "Packages/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/ShaderLibrary/SurfaceData.hlsl"
 
 SurfaceData SurfaceDescriptionToSurfaceData(SurfaceDescription surfaceDescription)
 {
diff --git a/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes/LightingMetaPass.hlsl.meta b/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes/LightingMetaPass.hlsl.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes/LightingMetaPass.hlsl.meta
rename to com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes/LightingMetaPass.hlsl.meta
diff --git a/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes/PBRDeferredPass.hlsl b/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes/PBRDeferredPass.hlsl
similarity index 94%
rename from com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes/PBRDeferredPass.hlsl
rename to com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes/PBRDeferredPass.hlsl
index 2230ce8795d..74c0b6b4f16 100644
--- a/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes/PBRDeferredPass.hlsl
+++ b/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes/PBRDeferredPass.hlsl
@@ -1,7 +1,7 @@
 
-#include "Packages/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes/LegacyBuilding.hlsl"
-#include "Packages/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes/BuildInputData.hlsl"
-#include "Packages/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/ShaderLibrary/UnityGBuffer.hlsl"
+#include "Packages/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes/LegacyBuilding.hlsl"
+#include "Packages/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes/BuildInputData.hlsl"
+#include "Packages/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/ShaderLibrary/UnityGBuffer.hlsl"
 
 v2f_surf PBRDeferredVertex(appdata_full v)
 {
diff --git a/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes/PBRDeferredPass.hlsl.meta b/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes/PBRDeferredPass.hlsl.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes/PBRDeferredPass.hlsl.meta
rename to com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes/PBRDeferredPass.hlsl.meta
diff --git a/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes/PBRForwardAddPass.hlsl b/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes/PBRForwardAddPass.hlsl
similarity index 93%
rename from com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes/PBRForwardAddPass.hlsl
rename to com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes/PBRForwardAddPass.hlsl
index 3f7ad4cf554..9b0c91357a3 100644
--- a/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes/PBRForwardAddPass.hlsl
+++ b/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes/PBRForwardAddPass.hlsl
@@ -1,6 +1,6 @@
 
-#include "Packages/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes/LegacyBuilding.hlsl"
-#include "Packages/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes/BuildInputData.hlsl"
+#include "Packages/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes/LegacyBuilding.hlsl"
+#include "Packages/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes/BuildInputData.hlsl"
 
 v2f_surf PBRForwardAddVertex(appdata_full v)
 {
diff --git a/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes/PBRForwardAddPass.hlsl.meta b/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes/PBRForwardAddPass.hlsl.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes/PBRForwardAddPass.hlsl.meta
rename to com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes/PBRForwardAddPass.hlsl.meta
diff --git a/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes/PBRForwardPass.hlsl b/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes/PBRForwardPass.hlsl
similarity index 96%
rename from com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes/PBRForwardPass.hlsl
rename to com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes/PBRForwardPass.hlsl
index 3b30c0514f3..d463ae3f2d1 100644
--- a/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes/PBRForwardPass.hlsl
+++ b/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes/PBRForwardPass.hlsl
@@ -1,6 +1,6 @@
 
-#include "Packages/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes/LegacyBuilding.hlsl"
-#include "Packages/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes/BuildInputData.hlsl"
+#include "Packages/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes/LegacyBuilding.hlsl"
+#include "Packages/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes/BuildInputData.hlsl"
 
 v2f_surf PBRStandardVertex(appdata_full v)
 {
diff --git a/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes/PBRForwardPass.hlsl.meta b/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes/PBRForwardPass.hlsl.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes/PBRForwardPass.hlsl.meta
rename to com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes/PBRForwardPass.hlsl.meta
diff --git a/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes/PBRGBufferPass.hlsl b/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes/PBRGBufferPass.hlsl
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes/PBRGBufferPass.hlsl
rename to com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes/PBRGBufferPass.hlsl
diff --git a/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes/PBRGBufferPass.hlsl.meta b/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes/PBRGBufferPass.hlsl.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes/PBRGBufferPass.hlsl.meta
rename to com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes/PBRGBufferPass.hlsl.meta
diff --git a/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes/ShaderPass.hlsl b/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes/ShaderPass.hlsl
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes/ShaderPass.hlsl
rename to com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes/ShaderPass.hlsl
diff --git a/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes/ShaderPass.hlsl.meta b/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes/ShaderPass.hlsl.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes/ShaderPass.hlsl.meta
rename to com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes/ShaderPass.hlsl.meta
diff --git a/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes/ShadowCasterPass.hlsl b/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes/ShadowCasterPass.hlsl
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes/ShadowCasterPass.hlsl
rename to com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes/ShadowCasterPass.hlsl
diff --git a/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes/ShadowCasterPass.hlsl.meta b/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes/ShadowCasterPass.hlsl.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes/ShadowCasterPass.hlsl.meta
rename to com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes/ShadowCasterPass.hlsl.meta
diff --git a/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes/SpriteForwardPass.hlsl b/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes/SpriteForwardPass.hlsl
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes/SpriteForwardPass.hlsl
rename to com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes/SpriteForwardPass.hlsl
diff --git a/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes/SpriteForwardPass.hlsl.meta b/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes/SpriteForwardPass.hlsl.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes/SpriteForwardPass.hlsl.meta
rename to com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes/SpriteForwardPass.hlsl.meta
diff --git a/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes/SpriteLitPass.hlsl b/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes/SpriteLitPass.hlsl
similarity index 89%
rename from com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes/SpriteLitPass.hlsl
rename to com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes/SpriteLitPass.hlsl
index 026a7573016..b4c8efb0283 100644
--- a/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes/SpriteLitPass.hlsl
+++ b/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes/SpriteLitPass.hlsl
@@ -14,7 +14,7 @@ SHAPE_LIGHT(2)
 SHAPE_LIGHT(3)
 #endif
 
-#include "Packages/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Shaders/2D/Include/CombinedShapeLightShared.hlsl"
+#include "Packages/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Shaders/2D/Include/CombinedShapeLightShared.hlsl"
 
 PackedVaryings vert(Attributes input)
 {
diff --git a/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes/SpriteLitPass.hlsl.meta b/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes/SpriteLitPass.hlsl.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes/SpriteLitPass.hlsl.meta
rename to com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes/SpriteLitPass.hlsl.meta
diff --git a/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes/SpriteNormalPass.hlsl b/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes/SpriteNormalPass.hlsl
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes/SpriteNormalPass.hlsl
rename to com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes/SpriteNormalPass.hlsl
diff --git a/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes/SpriteNormalPass.hlsl.meta b/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes/SpriteNormalPass.hlsl.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes/SpriteNormalPass.hlsl.meta
rename to com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes/SpriteNormalPass.hlsl.meta
diff --git a/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes/SpriteUnlitPass.hlsl b/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes/SpriteUnlitPass.hlsl
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes/SpriteUnlitPass.hlsl
rename to com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes/SpriteUnlitPass.hlsl
diff --git a/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes/SpriteUnlitPass.hlsl.meta b/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes/SpriteUnlitPass.hlsl.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes/SpriteUnlitPass.hlsl.meta
rename to com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes/SpriteUnlitPass.hlsl.meta
diff --git a/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes/UnlitPass.hlsl b/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes/UnlitPass.hlsl
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes/UnlitPass.hlsl
rename to com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes/UnlitPass.hlsl
diff --git a/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes/UnlitPass.hlsl.meta b/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes/UnlitPass.hlsl.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes/UnlitPass.hlsl.meta
rename to com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes/UnlitPass.hlsl.meta
diff --git a/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes/Varyings.hlsl b/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes/Varyings.hlsl
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes/Varyings.hlsl
rename to com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes/Varyings.hlsl
diff --git a/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes/Varyings.hlsl.meta b/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes/Varyings.hlsl.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes/Varyings.hlsl.meta
rename to com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes/Varyings.hlsl.meta
diff --git a/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGraph/Targets.meta b/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderGraph/Targets.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGraph/Targets.meta
rename to com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderGraph/Targets.meta
diff --git a/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGraph/Targets/BuiltInLitSubTarget.cs b/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderGraph/Targets/BuiltInLitSubTarget.cs
similarity index 97%
rename from com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGraph/Targets/BuiltInLitSubTarget.cs
rename to com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderGraph/Targets/BuiltInLitSubTarget.cs
index 9ef5126cd3a..c338d715732 100644
--- a/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGraph/Targets/BuiltInLitSubTarget.cs
+++ b/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderGraph/Targets/BuiltInLitSubTarget.cs
@@ -588,14 +588,14 @@ static class LitKeywords
         #region Includes
         static class LitIncludes
         {
-            const string kShadows = "Packages/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/ShaderLibrary/Shadows.hlsl";
-            const string kMetaInput = "Packages/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/ShaderLibrary/MetaInput.hlsl";
-            const string kForwardPass = "Packages/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes/PBRForwardPass.hlsl";
-            const string kForwardAddPass = "Packages/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes/PBRForwardAddPass.hlsl";
-            const string kDeferredPass = "Packages/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes/PBRDeferredPass.hlsl";
-            const string kGBuffer = "Packages/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/ShaderLibrary/UnityGBuffer.hlsl";
-            const string kPBRGBufferPass = "Packages/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes/PBRGBufferPass.hlsl";
-            const string kLightingMetaPass = "Packages/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes/LightingMetaPass.hlsl";
+            const string kShadows = "Packages/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/ShaderLibrary/Shadows.hlsl";
+            const string kMetaInput = "Packages/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/ShaderLibrary/MetaInput.hlsl";
+            const string kForwardPass = "Packages/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes/PBRForwardPass.hlsl";
+            const string kForwardAddPass = "Packages/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes/PBRForwardAddPass.hlsl";
+            const string kDeferredPass = "Packages/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes/PBRDeferredPass.hlsl";
+            const string kGBuffer = "Packages/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/ShaderLibrary/UnityGBuffer.hlsl";
+            const string kPBRGBufferPass = "Packages/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes/PBRGBufferPass.hlsl";
+            const string kLightingMetaPass = "Packages/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes/LightingMetaPass.hlsl";
 
             public static readonly IncludeCollection Forward = new IncludeCollection
             {
diff --git a/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGraph/Targets/BuiltInLitSubTarget.cs.meta b/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderGraph/Targets/BuiltInLitSubTarget.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGraph/Targets/BuiltInLitSubTarget.cs.meta
rename to com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderGraph/Targets/BuiltInLitSubTarget.cs.meta
diff --git a/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGraph/Targets/BuiltInSubTarget.cs b/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderGraph/Targets/BuiltInSubTarget.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGraph/Targets/BuiltInSubTarget.cs
rename to com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderGraph/Targets/BuiltInSubTarget.cs
diff --git a/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGraph/Targets/BuiltInSubTarget.cs.meta b/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderGraph/Targets/BuiltInSubTarget.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGraph/Targets/BuiltInSubTarget.cs.meta
rename to com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderGraph/Targets/BuiltInSubTarget.cs.meta
diff --git a/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGraph/Targets/BuiltInTarget.cs b/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderGraph/Targets/BuiltInTarget.cs
similarity index 97%
rename from com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGraph/Targets/BuiltInTarget.cs
rename to com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderGraph/Targets/BuiltInTarget.cs
index ee227802fed..6bd0a28f5d8 100644
--- a/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGraph/Targets/BuiltInTarget.cs
+++ b/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderGraph/Targets/BuiltInTarget.cs
@@ -73,8 +73,8 @@ sealed class BuiltInTarget : Target, IHasMetadata
         public const string kPipelineTag = "BuiltInPipeline";
         public const string kLitMaterialTypeTag = "\"BuiltInMaterialType\" = \"Lit\"";
         public const string kUnlitMaterialTypeTag = "\"BuiltInMaterialType\" = \"Unlit\"";
-        public static readonly string[] kSharedTemplateDirectories = GenerationUtils.GetDefaultSharedTemplateDirectories().Union(new string[] { "Packages/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGraph/Templates" }).ToArray();
-        public const string kTemplatePath = "Packages/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGraph/Templates/ShaderPass.template";
+        public static readonly string[] kSharedTemplateDirectories = GenerationUtils.GetDefaultSharedTemplateDirectories().Union(new string[] { "Packages/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderGraph/Templates" }).ToArray();
+        public const string kTemplatePath = "Packages/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderGraph/Templates/ShaderPass.template";
 
         // SubTarget
         List<SubTarget> m_SubTargets;
@@ -986,16 +986,16 @@ static class CoreIncludes
     {
         const string kColor = "Packages/com.unity.render-pipelines.core/ShaderLibrary/Color.hlsl";
         const string kTexture = "Packages/com.unity.render-pipelines.core/ShaderLibrary/Texture.hlsl";
-        const string kCore = "Packages/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/ShaderLibrary/Core.hlsl";
-        const string kLighting = "Packages/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/ShaderLibrary/Lighting.hlsl";
-        const string kGraphFunctions = "Packages/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/ShaderLibrary/ShaderGraphFunctions.hlsl";
-        const string kVaryings = "Packages/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes/Varyings.hlsl";
-        const string kShaderPass = "Packages/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes/ShaderPass.hlsl";
-        const string kDepthOnlyPass = "Packages/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes/DepthOnlyPass.hlsl";
-        const string kShadowCasterPass = "Packages/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes/ShadowCasterPass.hlsl";
-
-        const string kShims = "Packages/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/ShaderLibrary/Shim/Shims.hlsl";
-        const string kLegacySurfaceVertex = "Packages/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes/LegacySurfaceVertex.hlsl";
+        const string kCore = "Packages/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/ShaderLibrary/Core.hlsl";
+        const string kLighting = "Packages/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/ShaderLibrary/Lighting.hlsl";
+        const string kGraphFunctions = "Packages/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/ShaderLibrary/ShaderGraphFunctions.hlsl";
+        const string kVaryings = "Packages/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes/Varyings.hlsl";
+        const string kShaderPass = "Packages/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes/ShaderPass.hlsl";
+        const string kDepthOnlyPass = "Packages/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes/DepthOnlyPass.hlsl";
+        const string kShadowCasterPass = "Packages/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes/ShadowCasterPass.hlsl";
+
+        const string kShims = "Packages/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/ShaderLibrary/Shim/Shims.hlsl";
+        const string kLegacySurfaceVertex = "Packages/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes/LegacySurfaceVertex.hlsl";
 
         public static readonly IncludeCollection CorePregraph = new IncludeCollection
         {
diff --git a/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGraph/Targets/BuiltInTarget.cs.meta b/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderGraph/Targets/BuiltInTarget.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGraph/Targets/BuiltInTarget.cs.meta
rename to com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderGraph/Targets/BuiltInTarget.cs.meta
diff --git a/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGraph/Targets/BuiltInUnlitSubTarget.cs b/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderGraph/Targets/BuiltInUnlitSubTarget.cs
similarity index 99%
rename from com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGraph/Targets/BuiltInUnlitSubTarget.cs
rename to com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderGraph/Targets/BuiltInUnlitSubTarget.cs
index 78c98e214a0..533e00f61a2 100644
--- a/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGraph/Targets/BuiltInUnlitSubTarget.cs
+++ b/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderGraph/Targets/BuiltInUnlitSubTarget.cs
@@ -193,7 +193,7 @@ public static KeywordCollection Unlit(BuiltInTarget target)
         #region Includes
         static class UnlitIncludes
         {
-            const string kUnlitPass = "Packages/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes/UnlitPass.hlsl";
+            const string kUnlitPass = "Packages/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes/UnlitPass.hlsl";
 
             public static IncludeCollection Unlit = new IncludeCollection
             {
diff --git a/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGraph/Targets/BuiltInUnlitSubTarget.cs.meta b/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderGraph/Targets/BuiltInUnlitSubTarget.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGraph/Targets/BuiltInUnlitSubTarget.cs.meta
rename to com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderGraph/Targets/BuiltInUnlitSubTarget.cs.meta
diff --git a/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGraph/Templates.meta b/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderGraph/Templates.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGraph/Templates.meta
rename to com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderGraph/Templates.meta
diff --git a/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGraph/Templates/ShaderPass.template b/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderGraph/Templates/ShaderPass.template
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGraph/Templates/ShaderPass.template
rename to com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderGraph/Templates/ShaderPass.template
diff --git a/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGraph/Templates/ShaderPass.template.meta b/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderGraph/Templates/ShaderPass.template.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGraph/Templates/ShaderPass.template.meta
rename to com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderGraph/Templates/ShaderPass.template.meta
diff --git a/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGraph/Templates/SharedCode.template.hlsl b/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderGraph/Templates/SharedCode.template.hlsl
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGraph/Templates/SharedCode.template.hlsl
rename to com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderGraph/Templates/SharedCode.template.hlsl
diff --git a/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGraph/Templates/SharedCode.template.hlsl.meta b/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderGraph/Templates/SharedCode.template.hlsl.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGraph/Templates/SharedCode.template.hlsl.meta
rename to com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderGraph/Templates/SharedCode.template.hlsl.meta
diff --git a/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderPreprocessor.cs b/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderPreprocessor.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderPreprocessor.cs
rename to com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderPreprocessor.cs
diff --git a/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderPreprocessor.cs.meta b/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderPreprocessor.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderPreprocessor.cs.meta
rename to com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderPreprocessor.cs.meta
diff --git a/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderUtils.cs b/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderUtils.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderUtils.cs
rename to com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderUtils.cs
diff --git a/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderUtils.cs.meta b/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderUtils.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderUtils.cs.meta
rename to com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/Editor/ShaderUtils.cs.meta
diff --git a/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/ShaderLibrary.meta b/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/ShaderLibrary.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/ShaderLibrary.meta
rename to com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/ShaderLibrary.meta
diff --git a/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/ShaderLibrary/BuiltInDOTSInstancing.hlsl b/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/ShaderLibrary/BuiltInDOTSInstancing.hlsl
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/ShaderLibrary/BuiltInDOTSInstancing.hlsl
rename to com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/ShaderLibrary/BuiltInDOTSInstancing.hlsl
diff --git a/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/ShaderLibrary/BuiltInDOTSInstancing.hlsl.meta b/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/ShaderLibrary/BuiltInDOTSInstancing.hlsl.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/ShaderLibrary/BuiltInDOTSInstancing.hlsl.meta
rename to com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/ShaderLibrary/BuiltInDOTSInstancing.hlsl.meta
diff --git a/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/ShaderLibrary/Core.hlsl b/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/ShaderLibrary/Core.hlsl
similarity index 94%
rename from com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/ShaderLibrary/Core.hlsl
rename to com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/ShaderLibrary/Core.hlsl
index 2e13cedd801..78e22b29b91 100644
--- a/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/ShaderLibrary/Core.hlsl
+++ b/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/ShaderLibrary/Core.hlsl
@@ -8,7 +8,7 @@
 #include "Packages/com.unity.render-pipelines.core/ShaderLibrary/Common.hlsl"
 #include "Packages/com.unity.render-pipelines.core/ShaderLibrary/Packing.hlsl"
 #include "Packages/com.unity.render-pipelines.core/ShaderLibrary/Version.hlsl"
-#include "Packages/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/ShaderLibrary/Input.hlsl"
+#include "Packages/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/ShaderLibrary/Input.hlsl"
 
 #if !defined(SHADER_HINT_NICE_QUALITY)
     #if defined(SHADER_API_MOBILE) || defined(SHADER_API_SWITCH)
@@ -111,7 +111,7 @@ struct VertexNormalInputs
     float3 normalWS;
 };
 
-#include "Packages/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/ShaderLibrary/ShaderVariablesFunctions.hlsl"
-#include "Packages/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/ShaderLibrary/Deprecated.hlsl"
+#include "Packages/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/ShaderLibrary/ShaderVariablesFunctions.hlsl"
+#include "Packages/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/ShaderLibrary/Deprecated.hlsl"
 
 #endif
diff --git a/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/ShaderLibrary/Core.hlsl.meta b/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/ShaderLibrary/Core.hlsl.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/ShaderLibrary/Core.hlsl.meta
rename to com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/ShaderLibrary/Core.hlsl.meta
diff --git a/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/ShaderLibrary/DeclareDepthTexture.hlsl b/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/ShaderLibrary/DeclareDepthTexture.hlsl
similarity index 79%
rename from com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/ShaderLibrary/DeclareDepthTexture.hlsl
rename to com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/ShaderLibrary/DeclareDepthTexture.hlsl
index 4cdfe91c914..0d1a419af30 100644
--- a/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/ShaderLibrary/DeclareDepthTexture.hlsl
+++ b/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/ShaderLibrary/DeclareDepthTexture.hlsl
@@ -1,6 +1,6 @@
 #ifndef UNITY_DECLARE_DEPTH_TEXTURE_INCLUDED
 #define UNITY_DECLARE_DEPTH_TEXTURE_INCLUDED
-#include "Packages/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/ShaderLibrary/Core.hlsl"
+#include "Packages/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/ShaderLibrary/Core.hlsl"
 
 TEXTURE2D_X_FLOAT(_CameraDepthTexture);
 SAMPLER(sampler_CameraDepthTexture);
diff --git a/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/ShaderLibrary/DeclareDepthTexture.hlsl.meta b/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/ShaderLibrary/DeclareDepthTexture.hlsl.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/ShaderLibrary/DeclareDepthTexture.hlsl.meta
rename to com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/ShaderLibrary/DeclareDepthTexture.hlsl.meta
diff --git a/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/ShaderLibrary/DeclareNormalsTexture.hlsl b/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/ShaderLibrary/DeclareNormalsTexture.hlsl
similarity index 90%
rename from com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/ShaderLibrary/DeclareNormalsTexture.hlsl
rename to com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/ShaderLibrary/DeclareNormalsTexture.hlsl
index 43c46be2195..36f25082bd7 100644
--- a/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/ShaderLibrary/DeclareNormalsTexture.hlsl
+++ b/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/ShaderLibrary/DeclareNormalsTexture.hlsl
@@ -1,6 +1,6 @@
 #ifndef UNITY_DECLARE_NORMALS_TEXTURE_INCLUDED
 #define UNITY_DECLARE_NORMALS_TEXTURE_INCLUDED
-#include "Packages/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/ShaderLibrary/Core.hlsl"
+#include "Packages/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/ShaderLibrary/Core.hlsl"
 
 TEXTURE2D_X_FLOAT(_CameraNormalsTexture);
 SAMPLER(sampler_CameraNormalsTexture);
diff --git a/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/ShaderLibrary/DeclareNormalsTexture.hlsl.meta b/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/ShaderLibrary/DeclareNormalsTexture.hlsl.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/ShaderLibrary/DeclareNormalsTexture.hlsl.meta
rename to com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/ShaderLibrary/DeclareNormalsTexture.hlsl.meta
diff --git a/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/ShaderLibrary/DeclareOpaqueTexture.hlsl b/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/ShaderLibrary/DeclareOpaqueTexture.hlsl
similarity index 80%
rename from com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/ShaderLibrary/DeclareOpaqueTexture.hlsl
rename to com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/ShaderLibrary/DeclareOpaqueTexture.hlsl
index b1ef1c6e203..221b6ea914a 100644
--- a/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/ShaderLibrary/DeclareOpaqueTexture.hlsl
+++ b/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/ShaderLibrary/DeclareOpaqueTexture.hlsl
@@ -1,6 +1,6 @@
 #ifndef UNITY_DECLARE_OPAQUE_TEXTURE_INCLUDED
 #define UNITY_DECLARE_OPAQUE_TEXTURE_INCLUDED
-#include "Packages/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/ShaderLibrary/Core.hlsl"
+#include "Packages/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/ShaderLibrary/Core.hlsl"
 
 TEXTURE2D_X(_CameraOpaqueTexture);
 SAMPLER(sampler_CameraOpaqueTexture);
diff --git a/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/ShaderLibrary/DeclareOpaqueTexture.hlsl.meta b/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/ShaderLibrary/DeclareOpaqueTexture.hlsl.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/ShaderLibrary/DeclareOpaqueTexture.hlsl.meta
rename to com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/ShaderLibrary/DeclareOpaqueTexture.hlsl.meta
diff --git a/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/ShaderLibrary/Deprecated.hlsl b/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/ShaderLibrary/Deprecated.hlsl
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/ShaderLibrary/Deprecated.hlsl
rename to com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/ShaderLibrary/Deprecated.hlsl
diff --git a/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/ShaderLibrary/Deprecated.hlsl.meta b/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/ShaderLibrary/Deprecated.hlsl.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/ShaderLibrary/Deprecated.hlsl.meta
rename to com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/ShaderLibrary/Deprecated.hlsl.meta
diff --git a/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/ShaderLibrary/Input.hlsl b/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/ShaderLibrary/Input.hlsl
similarity index 88%
rename from com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/ShaderLibrary/Input.hlsl
rename to com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/ShaderLibrary/Input.hlsl
index c1f4cfa54ce..6b7eeb48309 100644
--- a/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/ShaderLibrary/Input.hlsl
+++ b/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/ShaderLibrary/Input.hlsl
@@ -7,8 +7,8 @@
 // Keep in sync with RenderingUtils.useStructuredBuffer
 #define USE_STRUCTURED_BUFFER_FOR_LIGHT_DATA 0
 
-#include "Packages/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/ShaderLibrary/ShaderTypes.cs.hlsl"
-#include "Packages/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/ShaderLibrary/Deprecated.hlsl"
+#include "Packages/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/ShaderLibrary/ShaderTypes.cs.hlsl"
+#include "Packages/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/ShaderLibrary/Deprecated.hlsl"
 
 #if defined(SHADER_API_MOBILE) && (defined(SHADER_API_GLES) || defined(SHADER_API_GLES30))
     #define MAX_VISIBLE_LIGHTS 16
@@ -99,9 +99,9 @@ CBUFFER_END
 // UnityInput.hlsl must be included before UnityInstancing.hlsl, so constant buffer
 // declarations don't fail because of instancing macros.
 // BuiltInDOTSInstancing.hlsl must be included after UnityInstancing.hlsl
-#include "Packages/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/ShaderLibrary/UnityInput.hlsl"
+#include "Packages/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/ShaderLibrary/UnityInput.hlsl"
 #include "Packages/com.unity.render-pipelines.core/ShaderLibrary/UnityInstancing.hlsl"
-#include "Packages/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/ShaderLibrary/BuiltInDOTSInstancing.hlsl"
+#include "Packages/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/ShaderLibrary/BuiltInDOTSInstancing.hlsl"
 #include "Packages/com.unity.render-pipelines.core/ShaderLibrary/SpaceTransforms.hlsl"
 
 #endif
diff --git a/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/ShaderLibrary/Input.hlsl.meta b/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/ShaderLibrary/Input.hlsl.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/ShaderLibrary/Input.hlsl.meta
rename to com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/ShaderLibrary/Input.hlsl.meta
diff --git a/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/ShaderLibrary/Lighting.hlsl b/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/ShaderLibrary/Lighting.hlsl
similarity index 98%
rename from com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/ShaderLibrary/Lighting.hlsl
rename to com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/ShaderLibrary/Lighting.hlsl
index e5b153a4301..68ddcb36db5 100644
--- a/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/ShaderLibrary/Lighting.hlsl
+++ b/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/ShaderLibrary/Lighting.hlsl
@@ -6,10 +6,10 @@
 #include "Packages/com.unity.render-pipelines.core/ShaderLibrary/EntityLighting.hlsl"
 #include "Packages/com.unity.render-pipelines.core/ShaderLibrary/ImageBasedLighting.hlsl"
 #include "Packages/com.unity.render-pipelines.core/ShaderLibrary/BSDF.hlsl"
-#include "Packages/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/ShaderLibrary/Core.hlsl"
-#include "Packages/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/ShaderLibrary/Deprecated.hlsl"
-#include "Packages/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/ShaderLibrary/SurfaceData.hlsl"
-#include "Packages/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/ShaderLibrary/Shadows.hlsl"
+#include "Packages/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/ShaderLibrary/Core.hlsl"
+#include "Packages/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/ShaderLibrary/Deprecated.hlsl"
+#include "Packages/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/ShaderLibrary/SurfaceData.hlsl"
+#include "Packages/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/ShaderLibrary/Shadows.hlsl"
 
 // If lightmap is not defined than we evaluate GI (ambient + probes) from SH
 // We might do it fully or partially in vertex to save shader ALU
diff --git a/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/ShaderLibrary/Lighting.hlsl.meta b/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/ShaderLibrary/Lighting.hlsl.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/ShaderLibrary/Lighting.hlsl.meta
rename to com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/ShaderLibrary/Lighting.hlsl.meta
diff --git a/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/ShaderLibrary/MetaInput.hlsl b/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/ShaderLibrary/MetaInput.hlsl
similarity index 94%
rename from com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/ShaderLibrary/MetaInput.hlsl
rename to com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/ShaderLibrary/MetaInput.hlsl
index b612011c9a7..b849212217b 100644
--- a/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/ShaderLibrary/MetaInput.hlsl
+++ b/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/ShaderLibrary/MetaInput.hlsl
@@ -1,7 +1,7 @@
 #ifndef BUILTIN_META_PASS_INCLUDED
 #define BUILTIN_META_PASS_INCLUDED
 
-#include "Packages/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/ShaderLibrary/Lighting.hlsl"
+#include "Packages/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/ShaderLibrary/Lighting.hlsl"
 #include "Packages/com.unity.render-pipelines.core/ShaderLibrary/Color.hlsl"
 
 CBUFFER_START(UnityMetaPass)
diff --git a/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/ShaderLibrary/MetaInput.hlsl.meta b/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/ShaderLibrary/MetaInput.hlsl.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/ShaderLibrary/MetaInput.hlsl.meta
rename to com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/ShaderLibrary/MetaInput.hlsl.meta
diff --git a/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/ShaderLibrary/Particles.hlsl b/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/ShaderLibrary/Particles.hlsl
similarity index 93%
rename from com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/ShaderLibrary/Particles.hlsl
rename to com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/ShaderLibrary/Particles.hlsl
index c4bf6177b56..7942567f0cc 100644
--- a/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/ShaderLibrary/Particles.hlsl
+++ b/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/ShaderLibrary/Particles.hlsl
@@ -1,12 +1,12 @@
 #ifndef BUILTIN_PARTICLES_INCLUDED
 #define BUILTIN_PARTICLES_INCLUDED
 
-#include "Packages/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/ShaderLibrary/Core.hlsl"
+#include "Packages/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/ShaderLibrary/Core.hlsl"
 #include "Packages/com.unity.render-pipelines.core/ShaderLibrary/Color.hlsl"
-#include "Packages/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/ShaderLibrary/SurfaceInput.hlsl"
-#include "Packages/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/ShaderLibrary/DeclareDepthTexture.hlsl"
-#include "Packages/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/ShaderLibrary/DeclareOpaqueTexture.hlsl"
-#include "Packages/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/ShaderLibrary/ParticlesInstancing.hlsl"
+#include "Packages/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/ShaderLibrary/SurfaceInput.hlsl"
+#include "Packages/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/ShaderLibrary/DeclareDepthTexture.hlsl"
+#include "Packages/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/ShaderLibrary/DeclareOpaqueTexture.hlsl"
+#include "Packages/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/ShaderLibrary/ParticlesInstancing.hlsl"
 
 struct ParticleParams
 {
diff --git a/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/ShaderLibrary/Particles.hlsl.meta b/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/ShaderLibrary/Particles.hlsl.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/ShaderLibrary/Particles.hlsl.meta
rename to com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/ShaderLibrary/Particles.hlsl.meta
diff --git a/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/ShaderLibrary/ParticlesInstancing.hlsl b/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/ShaderLibrary/ParticlesInstancing.hlsl
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/ShaderLibrary/ParticlesInstancing.hlsl
rename to com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/ShaderLibrary/ParticlesInstancing.hlsl
diff --git a/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/ShaderLibrary/ParticlesInstancing.hlsl.meta b/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/ShaderLibrary/ParticlesInstancing.hlsl.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/ShaderLibrary/ParticlesInstancing.hlsl.meta
rename to com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/ShaderLibrary/ParticlesInstancing.hlsl.meta
diff --git a/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/ShaderLibrary/SSAO.hlsl b/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/ShaderLibrary/SSAO.hlsl
similarity index 97%
rename from com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/ShaderLibrary/SSAO.hlsl
rename to com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/ShaderLibrary/SSAO.hlsl
index 2840c128fc6..84324addba4 100644
--- a/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/ShaderLibrary/SSAO.hlsl
+++ b/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/ShaderLibrary/SSAO.hlsl
@@ -3,9 +3,9 @@
 
 // Includes
 #include "Packages/com.unity.render-pipelines.core/ShaderLibrary/Common.hlsl"
-#include "Packages/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/ShaderLibrary/ShaderVariablesFunctions.hlsl"
-#include "Packages/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/ShaderLibrary/DeclareDepthTexture.hlsl"
-#include "Packages/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/ShaderLibrary/DeclareNormalsTexture.hlsl"
+#include "Packages/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/ShaderLibrary/ShaderVariablesFunctions.hlsl"
+#include "Packages/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/ShaderLibrary/DeclareDepthTexture.hlsl"
+#include "Packages/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/ShaderLibrary/DeclareNormalsTexture.hlsl"
 
 // Textures & Samplers
 TEXTURE2D_X(_BaseMap);
diff --git a/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/ShaderLibrary/SSAO.hlsl.meta b/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/ShaderLibrary/SSAO.hlsl.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/ShaderLibrary/SSAO.hlsl.meta
rename to com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/ShaderLibrary/SSAO.hlsl.meta
diff --git a/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/ShaderLibrary/ShaderGraphFunctions.hlsl b/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/ShaderLibrary/ShaderGraphFunctions.hlsl
similarity index 93%
rename from com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/ShaderLibrary/ShaderGraphFunctions.hlsl
rename to com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/ShaderLibrary/ShaderGraphFunctions.hlsl
index b48cb052603..cf60d3648ac 100644
--- a/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/ShaderLibrary/ShaderGraphFunctions.hlsl
+++ b/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/ShaderLibrary/ShaderGraphFunctions.hlsl
@@ -11,11 +11,11 @@
 #define SHADERGRAPH_AMBIENT_GROUND unity_AmbientGround
 
 #if defined(REQUIRE_DEPTH_TEXTURE)
-#include "Packages/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/ShaderLibrary/DeclareDepthTexture.hlsl"
+#include "Packages/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/ShaderLibrary/DeclareDepthTexture.hlsl"
 #endif
 
 #if defined(REQUIRE_OPAQUE_TEXTURE)
-#include "Packages/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/ShaderLibrary/DeclareOpaqueTexture.hlsl"
+#include "Packages/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/ShaderLibrary/DeclareOpaqueTexture.hlsl"
 #endif
 
 float shadergraph_LWSampleSceneDepth(float2 uv)
diff --git a/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/ShaderLibrary/ShaderGraphFunctions.hlsl.meta b/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/ShaderLibrary/ShaderGraphFunctions.hlsl.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/ShaderLibrary/ShaderGraphFunctions.hlsl.meta
rename to com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/ShaderLibrary/ShaderGraphFunctions.hlsl.meta
diff --git a/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/ShaderLibrary/ShaderTypes.cs.hlsl b/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/ShaderLibrary/ShaderTypes.cs.hlsl
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/ShaderLibrary/ShaderTypes.cs.hlsl
rename to com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/ShaderLibrary/ShaderTypes.cs.hlsl
diff --git a/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/ShaderLibrary/ShaderTypes.cs.hlsl.meta b/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/ShaderLibrary/ShaderTypes.cs.hlsl.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/ShaderLibrary/ShaderTypes.cs.hlsl.meta
rename to com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/ShaderLibrary/ShaderTypes.cs.hlsl.meta
diff --git a/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/ShaderLibrary/ShaderVariablesFunctions.deprecated.hlsl b/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/ShaderLibrary/ShaderVariablesFunctions.deprecated.hlsl
similarity index 86%
rename from com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/ShaderLibrary/ShaderVariablesFunctions.deprecated.hlsl
rename to com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/ShaderLibrary/ShaderVariablesFunctions.deprecated.hlsl
index 9fae1e31850..f74df0f71cd 100644
--- a/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/ShaderLibrary/ShaderVariablesFunctions.deprecated.hlsl
+++ b/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/ShaderLibrary/ShaderVariablesFunctions.deprecated.hlsl
@@ -1,7 +1,7 @@
 #ifndef UNITY_SHADER_VARIABLES_FUNCTIONS_DEPRECATED_INCLUDED
 #define UNITY_SHADER_VARIABLES_FUNCTIONS_DEPRECATED_INCLUDED
 
-#include "Packages/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/ShaderLibrary/Input.hlsl"
+#include "Packages/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/ShaderLibrary/Input.hlsl"
 
 // Deprecated: A confusingly named and duplicate function that scales clipspace to unity NDC range. (-w < x(-y) < w --> 0 < xy < w)
 // Use GetVertexPositionInputs().positionNDC instead for vertex shader
diff --git a/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/ShaderLibrary/ShaderVariablesFunctions.deprecated.hlsl.meta b/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/ShaderLibrary/ShaderVariablesFunctions.deprecated.hlsl.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/ShaderLibrary/ShaderVariablesFunctions.deprecated.hlsl.meta
rename to com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/ShaderLibrary/ShaderVariablesFunctions.deprecated.hlsl.meta
diff --git a/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/ShaderLibrary/ShaderVariablesFunctions.hlsl b/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/ShaderLibrary/ShaderVariablesFunctions.hlsl
similarity index 98%
rename from com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/ShaderLibrary/ShaderVariablesFunctions.hlsl
rename to com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/ShaderLibrary/ShaderVariablesFunctions.hlsl
index 84b2225b066..4f75588b237 100644
--- a/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/ShaderLibrary/ShaderVariablesFunctions.hlsl
+++ b/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/ShaderLibrary/ShaderVariablesFunctions.hlsl
@@ -1,7 +1,7 @@
 #ifndef UNITY_SHADER_VARIABLES_FUNCTIONS_INCLUDED
 #define UNITY_SHADER_VARIABLES_FUNCTIONS_INCLUDED
 
-#include "Packages/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/ShaderLibrary/ShaderVariablesFunctions.deprecated.hlsl"
+#include "Packages/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/ShaderLibrary/ShaderVariablesFunctions.deprecated.hlsl"
 
 VertexPositionInputs GetVertexPositionInputs(float3 positionOS)
 {
diff --git a/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/ShaderLibrary/ShaderVariablesFunctions.hlsl.meta b/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/ShaderLibrary/ShaderVariablesFunctions.hlsl.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/ShaderLibrary/ShaderVariablesFunctions.hlsl.meta
rename to com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/ShaderLibrary/ShaderVariablesFunctions.hlsl.meta
diff --git a/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/ShaderLibrary/Shadows.hlsl b/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/ShaderLibrary/Shadows.hlsl
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/ShaderLibrary/Shadows.hlsl
rename to com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/ShaderLibrary/Shadows.hlsl
diff --git a/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/ShaderLibrary/Shadows.hlsl.meta b/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/ShaderLibrary/Shadows.hlsl.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/ShaderLibrary/Shadows.hlsl.meta
rename to com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/ShaderLibrary/Shadows.hlsl.meta
diff --git a/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/ShaderLibrary/Shim.meta b/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/ShaderLibrary/Shim.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/ShaderLibrary/Shim.meta
rename to com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/ShaderLibrary/Shim.meta
diff --git a/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/ShaderLibrary/Shim/HLSLSupportShim.hlsl b/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/ShaderLibrary/Shim/HLSLSupportShim.hlsl
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/ShaderLibrary/Shim/HLSLSupportShim.hlsl
rename to com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/ShaderLibrary/Shim/HLSLSupportShim.hlsl
diff --git a/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/ShaderLibrary/Shim/HLSLSupportShim.hlsl.meta b/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/ShaderLibrary/Shim/HLSLSupportShim.hlsl.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/ShaderLibrary/Shim/HLSLSupportShim.hlsl.meta
rename to com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/ShaderLibrary/Shim/HLSLSupportShim.hlsl.meta
diff --git a/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/ShaderLibrary/Shim/InputsShim.hlsl b/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/ShaderLibrary/Shim/InputsShim.hlsl
similarity index 93%
rename from com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/ShaderLibrary/Shim/InputsShim.hlsl
rename to com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/ShaderLibrary/Shim/InputsShim.hlsl
index 6822b74c3d7..6b7135fda49 100644
--- a/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/ShaderLibrary/Shim/InputsShim.hlsl
+++ b/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/ShaderLibrary/Shim/InputsShim.hlsl
@@ -44,7 +44,7 @@ float4x4 OptimizeProjectionMatrix(float4x4 M)
 }
 
 #include "Packages/com.unity.render-pipelines.core/ShaderLibrary/UnityInstancing.hlsl"
-#include "Packages/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/ShaderLibrary/BuiltInDOTSInstancing.hlsl"
+#include "Packages/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/ShaderLibrary/BuiltInDOTSInstancing.hlsl"
 //#include "Packages/com.unity.render-pipelines.core/ShaderLibrary/SpaceTransforms.hlsl"
 
 #endif // UNITY_INPUTS_SHIM_INCLUDED
diff --git a/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/ShaderLibrary/Shim/InputsShim.hlsl.meta b/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/ShaderLibrary/Shim/InputsShim.hlsl.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/ShaderLibrary/Shim/InputsShim.hlsl.meta
rename to com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/ShaderLibrary/Shim/InputsShim.hlsl.meta
diff --git a/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/ShaderLibrary/Shim/Shims.hlsl b/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/ShaderLibrary/Shim/Shims.hlsl
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/ShaderLibrary/Shim/Shims.hlsl
rename to com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/ShaderLibrary/Shim/Shims.hlsl
diff --git a/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/ShaderLibrary/Shim/Shims.hlsl.meta b/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/ShaderLibrary/Shim/Shims.hlsl.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/ShaderLibrary/Shim/Shims.hlsl.meta
rename to com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/ShaderLibrary/Shim/Shims.hlsl.meta
diff --git a/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/ShaderLibrary/Shim/SurfaceShaderProxy.hlsl b/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/ShaderLibrary/Shim/SurfaceShaderProxy.hlsl
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/ShaderLibrary/Shim/SurfaceShaderProxy.hlsl
rename to com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/ShaderLibrary/Shim/SurfaceShaderProxy.hlsl
diff --git a/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/ShaderLibrary/Shim/SurfaceShaderProxy.hlsl.meta b/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/ShaderLibrary/Shim/SurfaceShaderProxy.hlsl.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/ShaderLibrary/Shim/SurfaceShaderProxy.hlsl.meta
rename to com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/ShaderLibrary/Shim/SurfaceShaderProxy.hlsl.meta
diff --git a/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/ShaderLibrary/SurfaceData.hlsl b/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/ShaderLibrary/SurfaceData.hlsl
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/ShaderLibrary/SurfaceData.hlsl
rename to com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/ShaderLibrary/SurfaceData.hlsl
diff --git a/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/ShaderLibrary/SurfaceData.hlsl.meta b/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/ShaderLibrary/SurfaceData.hlsl.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/ShaderLibrary/SurfaceData.hlsl.meta
rename to com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/ShaderLibrary/SurfaceData.hlsl.meta
diff --git a/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/ShaderLibrary/SurfaceInput.hlsl b/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/ShaderLibrary/SurfaceInput.hlsl
similarity index 88%
rename from com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/ShaderLibrary/SurfaceInput.hlsl
rename to com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/ShaderLibrary/SurfaceInput.hlsl
index 166c66fffb5..c0f7e9b21b5 100644
--- a/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/ShaderLibrary/SurfaceInput.hlsl
+++ b/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/ShaderLibrary/SurfaceInput.hlsl
@@ -1,8 +1,8 @@
 #ifndef BUILTIN_INPUT_SURFACE_INCLUDED
 #define BUILTIN_INPUT_SURFACE_INCLUDED
 
-#include "Packages/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/ShaderLibrary/Core.hlsl"
-#include "Packages/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/ShaderLibrary/SurfaceData.hlsl"
+#include "Packages/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/ShaderLibrary/Core.hlsl"
+#include "Packages/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/ShaderLibrary/SurfaceData.hlsl"
 #include "Packages/com.unity.render-pipelines.core/ShaderLibrary/Packing.hlsl"
 #include "Packages/com.unity.render-pipelines.core/ShaderLibrary/CommonMaterial.hlsl"
 
diff --git a/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/ShaderLibrary/SurfaceInput.hlsl.meta b/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/ShaderLibrary/SurfaceInput.hlsl.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/ShaderLibrary/SurfaceInput.hlsl.meta
rename to com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/ShaderLibrary/SurfaceInput.hlsl.meta
diff --git a/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/ShaderLibrary/UnityGBuffer.hlsl b/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/ShaderLibrary/UnityGBuffer.hlsl
similarity index 98%
rename from com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/ShaderLibrary/UnityGBuffer.hlsl
rename to com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/ShaderLibrary/UnityGBuffer.hlsl
index 5a5691d0197..3dbd140fab2 100644
--- a/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/ShaderLibrary/UnityGBuffer.hlsl
+++ b/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/ShaderLibrary/UnityGBuffer.hlsl
@@ -1,8 +1,8 @@
 #ifndef BUILTIN_GBUFFERUTIL_INCLUDED
 #define BUILTIN_GBUFFERUTIL_INCLUDED
 
-#include "Packages/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/ShaderLibrary/SurfaceData.hlsl"
-#include "Packages/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/ShaderLibrary/Lighting.hlsl"
+#include "Packages/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/ShaderLibrary/SurfaceData.hlsl"
+#include "Packages/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/ShaderLibrary/Lighting.hlsl"
 
 // inspired from [builtin_shaders]/CGIncludes/UnityGBuffer.cginc
 
diff --git a/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/ShaderLibrary/UnityGBuffer.hlsl.meta b/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/ShaderLibrary/UnityGBuffer.hlsl.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/ShaderLibrary/UnityGBuffer.hlsl.meta
rename to com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/ShaderLibrary/UnityGBuffer.hlsl.meta
diff --git a/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/ShaderLibrary/UnityInput.hlsl b/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/ShaderLibrary/UnityInput.hlsl
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/ShaderLibrary/UnityInput.hlsl
rename to com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/ShaderLibrary/UnityInput.hlsl
diff --git a/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/ShaderLibrary/UnityInput.hlsl.meta b/com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/ShaderLibrary/UnityInput.hlsl.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/ShaderLibrary/UnityInput.hlsl.meta
rename to com.unity.shadergraph/Editor/Current/Generation/Targets/BuiltIn/ShaderLibrary/UnityInput.hlsl.meta
diff --git a/com.unity.shadergraph/Editor/Generation/Targets/PreviewTarget.cs b/com.unity.shadergraph/Editor/Current/Generation/Targets/PreviewTarget.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Targets/PreviewTarget.cs
rename to com.unity.shadergraph/Editor/Current/Generation/Targets/PreviewTarget.cs
diff --git a/com.unity.shadergraph/Editor/Generation/Targets/PreviewTarget.cs.meta b/com.unity.shadergraph/Editor/Current/Generation/Targets/PreviewTarget.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Targets/PreviewTarget.cs.meta
rename to com.unity.shadergraph/Editor/Current/Generation/Targets/PreviewTarget.cs.meta
diff --git a/com.unity.shadergraph/Editor/Generation/Targets/VFXTarget.cs b/com.unity.shadergraph/Editor/Current/Generation/Targets/VFXTarget.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Targets/VFXTarget.cs
rename to com.unity.shadergraph/Editor/Current/Generation/Targets/VFXTarget.cs
diff --git a/com.unity.shadergraph/Editor/Generation/Targets/VFXTarget.cs.meta b/com.unity.shadergraph/Editor/Current/Generation/Targets/VFXTarget.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Targets/VFXTarget.cs.meta
rename to com.unity.shadergraph/Editor/Current/Generation/Targets/VFXTarget.cs.meta
diff --git a/com.unity.shadergraph/Editor/Generation/Templates.meta b/com.unity.shadergraph/Editor/Current/Generation/Templates.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Templates.meta
rename to com.unity.shadergraph/Editor/Current/Generation/Templates.meta
diff --git a/com.unity.shadergraph/Editor/Generation/Templates/BuildSurfaceDescriptionInputs.template.hlsl b/com.unity.shadergraph/Editor/Current/Generation/Templates/BuildSurfaceDescriptionInputs.template.hlsl
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Templates/BuildSurfaceDescriptionInputs.template.hlsl
rename to com.unity.shadergraph/Editor/Current/Generation/Templates/BuildSurfaceDescriptionInputs.template.hlsl
diff --git a/com.unity.shadergraph/Editor/Generation/Templates/BuildSurfaceDescriptionInputs.template.hlsl.meta b/com.unity.shadergraph/Editor/Current/Generation/Templates/BuildSurfaceDescriptionInputs.template.hlsl.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Templates/BuildSurfaceDescriptionInputs.template.hlsl.meta
rename to com.unity.shadergraph/Editor/Current/Generation/Templates/BuildSurfaceDescriptionInputs.template.hlsl.meta
diff --git a/com.unity.shadergraph/Editor/Generation/Templates/BuildVertexDescriptionInputs.template.hlsl b/com.unity.shadergraph/Editor/Current/Generation/Templates/BuildVertexDescriptionInputs.template.hlsl
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Templates/BuildVertexDescriptionInputs.template.hlsl
rename to com.unity.shadergraph/Editor/Current/Generation/Templates/BuildVertexDescriptionInputs.template.hlsl
diff --git a/com.unity.shadergraph/Editor/Generation/Templates/BuildVertexDescriptionInputs.template.hlsl.meta b/com.unity.shadergraph/Editor/Current/Generation/Templates/BuildVertexDescriptionInputs.template.hlsl.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Templates/BuildVertexDescriptionInputs.template.hlsl.meta
rename to com.unity.shadergraph/Editor/Current/Generation/Templates/BuildVertexDescriptionInputs.template.hlsl.meta
diff --git a/com.unity.shadergraph/Editor/Generation/Templates/PassMesh.template b/com.unity.shadergraph/Editor/Current/Generation/Templates/PassMesh.template
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Templates/PassMesh.template
rename to com.unity.shadergraph/Editor/Current/Generation/Templates/PassMesh.template
diff --git a/com.unity.shadergraph/Editor/Generation/Templates/PassMesh.template.meta b/com.unity.shadergraph/Editor/Current/Generation/Templates/PassMesh.template.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Templates/PassMesh.template.meta
rename to com.unity.shadergraph/Editor/Current/Generation/Templates/PassMesh.template.meta
diff --git a/com.unity.shadergraph/Editor/Generation/Utils.meta b/com.unity.shadergraph/Editor/Current/Generation/Utils.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Utils.meta
rename to com.unity.shadergraph/Editor/Current/Generation/Utils.meta
diff --git a/com.unity.shadergraph/Editor/Generation/Utils/TargetUtils.cs b/com.unity.shadergraph/Editor/Current/Generation/Utils/TargetUtils.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Utils/TargetUtils.cs
rename to com.unity.shadergraph/Editor/Current/Generation/Utils/TargetUtils.cs
diff --git a/com.unity.shadergraph/Editor/Generation/Utils/TargetUtils.cs.meta b/com.unity.shadergraph/Editor/Current/Generation/Utils/TargetUtils.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Generation/Utils/TargetUtils.cs.meta
rename to com.unity.shadergraph/Editor/Current/Generation/Utils/TargetUtils.cs.meta
diff --git a/com.unity.shadergraph/Editor/Importers.meta b/com.unity.shadergraph/Editor/Current/Importers.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Importers.meta
rename to com.unity.shadergraph/Editor/Current/Importers.meta
diff --git a/com.unity.shadergraph/Editor/Importers/ShaderGraphAssetPostProcessor.cs b/com.unity.shadergraph/Editor/Current/Importers/ShaderGraphAssetPostProcessor.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Importers/ShaderGraphAssetPostProcessor.cs
rename to com.unity.shadergraph/Editor/Current/Importers/ShaderGraphAssetPostProcessor.cs
diff --git a/com.unity.shadergraph/Editor/Importers/ShaderGraphAssetPostProcessor.cs.meta b/com.unity.shadergraph/Editor/Current/Importers/ShaderGraphAssetPostProcessor.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Importers/ShaderGraphAssetPostProcessor.cs.meta
rename to com.unity.shadergraph/Editor/Current/Importers/ShaderGraphAssetPostProcessor.cs.meta
diff --git a/com.unity.shadergraph/Editor/Importers/ShaderGraphImporter.cs b/com.unity.shadergraph/Editor/Current/Importers/ShaderGraphImporter.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Importers/ShaderGraphImporter.cs
rename to com.unity.shadergraph/Editor/Current/Importers/ShaderGraphImporter.cs
diff --git a/com.unity.shadergraph/Editor/Importers/ShaderGraphImporter.cs.meta b/com.unity.shadergraph/Editor/Current/Importers/ShaderGraphImporter.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Importers/ShaderGraphImporter.cs.meta
rename to com.unity.shadergraph/Editor/Current/Importers/ShaderGraphImporter.cs.meta
diff --git a/com.unity.shadergraph/Editor/Importers/ShaderGraphImporterEditor.cs b/com.unity.shadergraph/Editor/Current/Importers/ShaderGraphImporterEditor.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Importers/ShaderGraphImporterEditor.cs
rename to com.unity.shadergraph/Editor/Current/Importers/ShaderGraphImporterEditor.cs
diff --git a/com.unity.shadergraph/Editor/Importers/ShaderGraphImporterEditor.cs.meta b/com.unity.shadergraph/Editor/Current/Importers/ShaderGraphImporterEditor.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Importers/ShaderGraphImporterEditor.cs.meta
rename to com.unity.shadergraph/Editor/Current/Importers/ShaderGraphImporterEditor.cs.meta
diff --git a/com.unity.shadergraph/Editor/Importers/ShaderGraphMetadata.cs b/com.unity.shadergraph/Editor/Current/Importers/ShaderGraphMetadata.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Importers/ShaderGraphMetadata.cs
rename to com.unity.shadergraph/Editor/Current/Importers/ShaderGraphMetadata.cs
diff --git a/com.unity.shadergraph/Editor/Importers/ShaderGraphMetadata.cs.meta b/com.unity.shadergraph/Editor/Current/Importers/ShaderGraphMetadata.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Importers/ShaderGraphMetadata.cs.meta
rename to com.unity.shadergraph/Editor/Current/Importers/ShaderGraphMetadata.cs.meta
diff --git a/com.unity.shadergraph/Editor/Importers/ShaderSubGraphImporter.cs b/com.unity.shadergraph/Editor/Current/Importers/ShaderSubGraphImporter.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Importers/ShaderSubGraphImporter.cs
rename to com.unity.shadergraph/Editor/Current/Importers/ShaderSubGraphImporter.cs
diff --git a/com.unity.shadergraph/Editor/Importers/ShaderSubGraphImporter.cs.meta b/com.unity.shadergraph/Editor/Current/Importers/ShaderSubGraphImporter.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Importers/ShaderSubGraphImporter.cs.meta
rename to com.unity.shadergraph/Editor/Current/Importers/ShaderSubGraphImporter.cs.meta
diff --git a/com.unity.shadergraph/Editor/Importers/ShaderSubGraphImporterEditor.cs b/com.unity.shadergraph/Editor/Current/Importers/ShaderSubGraphImporterEditor.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Importers/ShaderSubGraphImporterEditor.cs
rename to com.unity.shadergraph/Editor/Current/Importers/ShaderSubGraphImporterEditor.cs
diff --git a/com.unity.shadergraph/Editor/Importers/ShaderSubGraphImporterEditor.cs.meta b/com.unity.shadergraph/Editor/Current/Importers/ShaderSubGraphImporterEditor.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Importers/ShaderSubGraphImporterEditor.cs.meta
rename to com.unity.shadergraph/Editor/Current/Importers/ShaderSubGraphImporterEditor.cs.meta
diff --git a/com.unity.shadergraph/Editor/Importers/ShaderSubGraphMetadata.cs b/com.unity.shadergraph/Editor/Current/Importers/ShaderSubGraphMetadata.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Importers/ShaderSubGraphMetadata.cs
rename to com.unity.shadergraph/Editor/Current/Importers/ShaderSubGraphMetadata.cs
diff --git a/com.unity.shadergraph/Editor/Importers/ShaderSubGraphMetadata.cs.meta b/com.unity.shadergraph/Editor/Current/Importers/ShaderSubGraphMetadata.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Importers/ShaderSubGraphMetadata.cs.meta
rename to com.unity.shadergraph/Editor/Current/Importers/ShaderSubGraphMetadata.cs.meta
diff --git a/com.unity.shadergraph/Editor/Importers/_.sgsubgraphdb b/com.unity.shadergraph/Editor/Current/Importers/_.sgsubgraphdb
similarity index 100%
rename from com.unity.shadergraph/Editor/Importers/_.sgsubgraphdb
rename to com.unity.shadergraph/Editor/Current/Importers/_.sgsubgraphdb
diff --git a/com.unity.shadergraph/Editor/Importers/_.sgsubgraphdb.meta b/com.unity.shadergraph/Editor/Current/Importers/_.sgsubgraphdb.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Importers/_.sgsubgraphdb.meta
rename to com.unity.shadergraph/Editor/Current/Importers/_.sgsubgraphdb.meta
diff --git a/com.unity.shadergraph/Editor/Interface.meta b/com.unity.shadergraph/Editor/Current/Interface.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Interface.meta
rename to com.unity.shadergraph/Editor/Current/Interface.meta
diff --git a/com.unity.shadergraph/Editor/Interface/IConditional.cs b/com.unity.shadergraph/Editor/Current/Interface/IConditional.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Interface/IConditional.cs
rename to com.unity.shadergraph/Editor/Current/Interface/IConditional.cs
diff --git a/com.unity.shadergraph/Editor/Interface/IConditional.cs.meta b/com.unity.shadergraph/Editor/Current/Interface/IConditional.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Interface/IConditional.cs.meta
rename to com.unity.shadergraph/Editor/Current/Interface/IConditional.cs.meta
diff --git a/com.unity.shadergraph/Editor/Resources.meta b/com.unity.shadergraph/Editor/Current/Resources.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources.meta
rename to com.unity.shadergraph/Editor/Current/Resources.meta
diff --git a/com.unity.shadergraph/Editor/Resources/GraphView.meta b/com.unity.shadergraph/Editor/Current/Resources/GraphView.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/GraphView.meta
rename to com.unity.shadergraph/Editor/Current/Resources/GraphView.meta
diff --git a/com.unity.shadergraph/Editor/Resources/GraphView/Nodes.meta b/com.unity.shadergraph/Editor/Current/Resources/GraphView/Nodes.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/GraphView/Nodes.meta
rename to com.unity.shadergraph/Editor/Current/Resources/GraphView/Nodes.meta
diff --git a/com.unity.shadergraph/Editor/Resources/GraphView/Nodes/BlackboardFieldExposed.png b/com.unity.shadergraph/Editor/Current/Resources/GraphView/Nodes/BlackboardFieldExposed.png
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/GraphView/Nodes/BlackboardFieldExposed.png
rename to com.unity.shadergraph/Editor/Current/Resources/GraphView/Nodes/BlackboardFieldExposed.png
diff --git a/com.unity.shadergraph/Editor/Resources/GraphView/Nodes/BlackboardFieldExposed.png.meta b/com.unity.shadergraph/Editor/Current/Resources/GraphView/Nodes/BlackboardFieldExposed.png.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/GraphView/Nodes/BlackboardFieldExposed.png.meta
rename to com.unity.shadergraph/Editor/Current/Resources/GraphView/Nodes/BlackboardFieldExposed.png.meta
diff --git a/com.unity.shadergraph/Editor/Resources/GraphView/Nodes/BlackboardFieldPillBackground.png b/com.unity.shadergraph/Editor/Current/Resources/GraphView/Nodes/BlackboardFieldPillBackground.png
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/GraphView/Nodes/BlackboardFieldPillBackground.png
rename to com.unity.shadergraph/Editor/Current/Resources/GraphView/Nodes/BlackboardFieldPillBackground.png
diff --git a/com.unity.shadergraph/Editor/Resources/GraphView/Nodes/BlackboardFieldPillBackground.png.meta b/com.unity.shadergraph/Editor/Current/Resources/GraphView/Nodes/BlackboardFieldPillBackground.png.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/GraphView/Nodes/BlackboardFieldPillBackground.png.meta
rename to com.unity.shadergraph/Editor/Current/Resources/GraphView/Nodes/BlackboardFieldPillBackground.png.meta
diff --git a/com.unity.shadergraph/Editor/Resources/GraphView/Nodes/NodeChevronDown.png b/com.unity.shadergraph/Editor/Current/Resources/GraphView/Nodes/NodeChevronDown.png
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/GraphView/Nodes/NodeChevronDown.png
rename to com.unity.shadergraph/Editor/Current/Resources/GraphView/Nodes/NodeChevronDown.png
diff --git a/com.unity.shadergraph/Editor/Resources/GraphView/Nodes/NodeChevronDown.png.meta b/com.unity.shadergraph/Editor/Current/Resources/GraphView/Nodes/NodeChevronDown.png.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/GraphView/Nodes/NodeChevronDown.png.meta
rename to com.unity.shadergraph/Editor/Current/Resources/GraphView/Nodes/NodeChevronDown.png.meta
diff --git a/com.unity.shadergraph/Editor/Resources/GraphView/Nodes/NodeChevronDown@2x.png b/com.unity.shadergraph/Editor/Current/Resources/GraphView/Nodes/NodeChevronDown@2x.png
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/GraphView/Nodes/NodeChevronDown@2x.png
rename to com.unity.shadergraph/Editor/Current/Resources/GraphView/Nodes/NodeChevronDown@2x.png
diff --git a/com.unity.shadergraph/Editor/Resources/GraphView/Nodes/NodeChevronDown@2x.png.meta b/com.unity.shadergraph/Editor/Current/Resources/GraphView/Nodes/NodeChevronDown@2x.png.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/GraphView/Nodes/NodeChevronDown@2x.png.meta
rename to com.unity.shadergraph/Editor/Current/Resources/GraphView/Nodes/NodeChevronDown@2x.png.meta
diff --git a/com.unity.shadergraph/Editor/Resources/GraphView/Nodes/NodeChevronLeft.png b/com.unity.shadergraph/Editor/Current/Resources/GraphView/Nodes/NodeChevronLeft.png
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/GraphView/Nodes/NodeChevronLeft.png
rename to com.unity.shadergraph/Editor/Current/Resources/GraphView/Nodes/NodeChevronLeft.png
diff --git a/com.unity.shadergraph/Editor/Resources/GraphView/Nodes/NodeChevronLeft.png.meta b/com.unity.shadergraph/Editor/Current/Resources/GraphView/Nodes/NodeChevronLeft.png.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/GraphView/Nodes/NodeChevronLeft.png.meta
rename to com.unity.shadergraph/Editor/Current/Resources/GraphView/Nodes/NodeChevronLeft.png.meta
diff --git a/com.unity.shadergraph/Editor/Resources/GraphView/Nodes/NodeChevronLeft@2x.png b/com.unity.shadergraph/Editor/Current/Resources/GraphView/Nodes/NodeChevronLeft@2x.png
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/GraphView/Nodes/NodeChevronLeft@2x.png
rename to com.unity.shadergraph/Editor/Current/Resources/GraphView/Nodes/NodeChevronLeft@2x.png
diff --git a/com.unity.shadergraph/Editor/Resources/GraphView/Nodes/NodeChevronLeft@2x.png.meta b/com.unity.shadergraph/Editor/Current/Resources/GraphView/Nodes/NodeChevronLeft@2x.png.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/GraphView/Nodes/NodeChevronLeft@2x.png.meta
rename to com.unity.shadergraph/Editor/Current/Resources/GraphView/Nodes/NodeChevronLeft@2x.png.meta
diff --git a/com.unity.shadergraph/Editor/Resources/GraphView/Nodes/NodeChevronRight.png b/com.unity.shadergraph/Editor/Current/Resources/GraphView/Nodes/NodeChevronRight.png
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/GraphView/Nodes/NodeChevronRight.png
rename to com.unity.shadergraph/Editor/Current/Resources/GraphView/Nodes/NodeChevronRight.png
diff --git a/com.unity.shadergraph/Editor/Resources/GraphView/Nodes/NodeChevronRight.png.meta b/com.unity.shadergraph/Editor/Current/Resources/GraphView/Nodes/NodeChevronRight.png.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/GraphView/Nodes/NodeChevronRight.png.meta
rename to com.unity.shadergraph/Editor/Current/Resources/GraphView/Nodes/NodeChevronRight.png.meta
diff --git a/com.unity.shadergraph/Editor/Resources/GraphView/Nodes/NodeChevronRight@2x.png b/com.unity.shadergraph/Editor/Current/Resources/GraphView/Nodes/NodeChevronRight@2x.png
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/GraphView/Nodes/NodeChevronRight@2x.png
rename to com.unity.shadergraph/Editor/Current/Resources/GraphView/Nodes/NodeChevronRight@2x.png
diff --git a/com.unity.shadergraph/Editor/Resources/GraphView/Nodes/NodeChevronRight@2x.png.meta b/com.unity.shadergraph/Editor/Current/Resources/GraphView/Nodes/NodeChevronRight@2x.png.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/GraphView/Nodes/NodeChevronRight@2x.png.meta
rename to com.unity.shadergraph/Editor/Current/Resources/GraphView/Nodes/NodeChevronRight@2x.png.meta
diff --git a/com.unity.shadergraph/Editor/Resources/GraphView/Nodes/NodeChevronUp.png b/com.unity.shadergraph/Editor/Current/Resources/GraphView/Nodes/NodeChevronUp.png
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/GraphView/Nodes/NodeChevronUp.png
rename to com.unity.shadergraph/Editor/Current/Resources/GraphView/Nodes/NodeChevronUp.png
diff --git a/com.unity.shadergraph/Editor/Resources/GraphView/Nodes/NodeChevronUp.png.meta b/com.unity.shadergraph/Editor/Current/Resources/GraphView/Nodes/NodeChevronUp.png.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/GraphView/Nodes/NodeChevronUp.png.meta
rename to com.unity.shadergraph/Editor/Current/Resources/GraphView/Nodes/NodeChevronUp.png.meta
diff --git a/com.unity.shadergraph/Editor/Resources/GraphView/Nodes/NodeChevronUp@2x.png b/com.unity.shadergraph/Editor/Current/Resources/GraphView/Nodes/NodeChevronUp@2x.png
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/GraphView/Nodes/NodeChevronUp@2x.png
rename to com.unity.shadergraph/Editor/Current/Resources/GraphView/Nodes/NodeChevronUp@2x.png
diff --git a/com.unity.shadergraph/Editor/Resources/GraphView/Nodes/NodeChevronUp@2x.png.meta b/com.unity.shadergraph/Editor/Current/Resources/GraphView/Nodes/NodeChevronUp@2x.png.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/GraphView/Nodes/NodeChevronUp@2x.png.meta
rename to com.unity.shadergraph/Editor/Current/Resources/GraphView/Nodes/NodeChevronUp@2x.png.meta
diff --git a/com.unity.shadergraph/Editor/Resources/GraphView/Nodes/PreviewCollapse.png b/com.unity.shadergraph/Editor/Current/Resources/GraphView/Nodes/PreviewCollapse.png
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/GraphView/Nodes/PreviewCollapse.png
rename to com.unity.shadergraph/Editor/Current/Resources/GraphView/Nodes/PreviewCollapse.png
diff --git a/com.unity.shadergraph/Editor/Resources/GraphView/Nodes/PreviewCollapse.png.meta b/com.unity.shadergraph/Editor/Current/Resources/GraphView/Nodes/PreviewCollapse.png.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/GraphView/Nodes/PreviewCollapse.png.meta
rename to com.unity.shadergraph/Editor/Current/Resources/GraphView/Nodes/PreviewCollapse.png.meta
diff --git a/com.unity.shadergraph/Editor/Resources/GraphView/Nodes/PreviewCollapse@2x.png b/com.unity.shadergraph/Editor/Current/Resources/GraphView/Nodes/PreviewCollapse@2x.png
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/GraphView/Nodes/PreviewCollapse@2x.png
rename to com.unity.shadergraph/Editor/Current/Resources/GraphView/Nodes/PreviewCollapse@2x.png
diff --git a/com.unity.shadergraph/Editor/Resources/GraphView/Nodes/PreviewCollapse@2x.png.meta b/com.unity.shadergraph/Editor/Current/Resources/GraphView/Nodes/PreviewCollapse@2x.png.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/GraphView/Nodes/PreviewCollapse@2x.png.meta
rename to com.unity.shadergraph/Editor/Current/Resources/GraphView/Nodes/PreviewCollapse@2x.png.meta
diff --git a/com.unity.shadergraph/Editor/Resources/GraphView/Nodes/PreviewExpand.png b/com.unity.shadergraph/Editor/Current/Resources/GraphView/Nodes/PreviewExpand.png
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/GraphView/Nodes/PreviewExpand.png
rename to com.unity.shadergraph/Editor/Current/Resources/GraphView/Nodes/PreviewExpand.png
diff --git a/com.unity.shadergraph/Editor/Resources/GraphView/Nodes/PreviewExpand.png.meta b/com.unity.shadergraph/Editor/Current/Resources/GraphView/Nodes/PreviewExpand.png.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/GraphView/Nodes/PreviewExpand.png.meta
rename to com.unity.shadergraph/Editor/Current/Resources/GraphView/Nodes/PreviewExpand.png.meta
diff --git a/com.unity.shadergraph/Editor/Resources/GraphView/Nodes/PreviewExpand@2x.png b/com.unity.shadergraph/Editor/Current/Resources/GraphView/Nodes/PreviewExpand@2x.png
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/GraphView/Nodes/PreviewExpand@2x.png
rename to com.unity.shadergraph/Editor/Current/Resources/GraphView/Nodes/PreviewExpand@2x.png
diff --git a/com.unity.shadergraph/Editor/Resources/GraphView/Nodes/PreviewExpand@2x.png.meta b/com.unity.shadergraph/Editor/Current/Resources/GraphView/Nodes/PreviewExpand@2x.png.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/GraphView/Nodes/PreviewExpand@2x.png.meta
rename to com.unity.shadergraph/Editor/Current/Resources/GraphView/Nodes/PreviewExpand@2x.png.meta
diff --git a/com.unity.shadergraph/Editor/Resources/Icons.meta b/com.unity.shadergraph/Editor/Current/Resources/Icons.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/Icons.meta
rename to com.unity.shadergraph/Editor/Current/Resources/Icons.meta
diff --git a/com.unity.shadergraph/Editor/Resources/Icons/SettingsIcons.png b/com.unity.shadergraph/Editor/Current/Resources/Icons/SettingsIcons.png
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/Icons/SettingsIcons.png
rename to com.unity.shadergraph/Editor/Current/Resources/Icons/SettingsIcons.png
diff --git a/com.unity.shadergraph/Editor/Resources/Icons/SettingsIcons.png.meta b/com.unity.shadergraph/Editor/Current/Resources/Icons/SettingsIcons.png.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/Icons/SettingsIcons.png.meta
rename to com.unity.shadergraph/Editor/Current/Resources/Icons/SettingsIcons.png.meta
diff --git a/com.unity.shadergraph/Editor/Resources/Icons/SettingsIcons@2x.png b/com.unity.shadergraph/Editor/Current/Resources/Icons/SettingsIcons@2x.png
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/Icons/SettingsIcons@2x.png
rename to com.unity.shadergraph/Editor/Current/Resources/Icons/SettingsIcons@2x.png
diff --git a/com.unity.shadergraph/Editor/Resources/Icons/SettingsIcons@2x.png.meta b/com.unity.shadergraph/Editor/Current/Resources/Icons/SettingsIcons@2x.png.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/Icons/SettingsIcons@2x.png.meta
rename to com.unity.shadergraph/Editor/Current/Resources/Icons/SettingsIcons@2x.png.meta
diff --git a/com.unity.shadergraph/Editor/Resources/Icons/SettingsIcons_hover.png b/com.unity.shadergraph/Editor/Current/Resources/Icons/SettingsIcons_hover.png
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/Icons/SettingsIcons_hover.png
rename to com.unity.shadergraph/Editor/Current/Resources/Icons/SettingsIcons_hover.png
diff --git a/com.unity.shadergraph/Editor/Resources/Icons/SettingsIcons_hover.png.meta b/com.unity.shadergraph/Editor/Current/Resources/Icons/SettingsIcons_hover.png.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/Icons/SettingsIcons_hover.png.meta
rename to com.unity.shadergraph/Editor/Current/Resources/Icons/SettingsIcons_hover.png.meta
diff --git a/com.unity.shadergraph/Editor/Resources/Icons/SettingsIcons_hover@2x.png b/com.unity.shadergraph/Editor/Current/Resources/Icons/SettingsIcons_hover@2x.png
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/Icons/SettingsIcons_hover@2x.png
rename to com.unity.shadergraph/Editor/Current/Resources/Icons/SettingsIcons_hover@2x.png
diff --git a/com.unity.shadergraph/Editor/Resources/Icons/SettingsIcons_hover@2x.png.meta b/com.unity.shadergraph/Editor/Current/Resources/Icons/SettingsIcons_hover@2x.png.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/Icons/SettingsIcons_hover@2x.png.meta
rename to com.unity.shadergraph/Editor/Current/Resources/Icons/SettingsIcons_hover@2x.png.meta
diff --git a/com.unity.shadergraph/Editor/Resources/Icons/Settings_Flyout_9slice.png b/com.unity.shadergraph/Editor/Current/Resources/Icons/Settings_Flyout_9slice.png
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/Icons/Settings_Flyout_9slice.png
rename to com.unity.shadergraph/Editor/Current/Resources/Icons/Settings_Flyout_9slice.png
diff --git a/com.unity.shadergraph/Editor/Resources/Icons/Settings_Flyout_9slice.png.meta b/com.unity.shadergraph/Editor/Current/Resources/Icons/Settings_Flyout_9slice.png.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/Icons/Settings_Flyout_9slice.png.meta
rename to com.unity.shadergraph/Editor/Current/Resources/Icons/Settings_Flyout_9slice.png.meta
diff --git a/com.unity.shadergraph/Editor/Resources/Icons/Settings_Flyout_9slice@2x.png b/com.unity.shadergraph/Editor/Current/Resources/Icons/Settings_Flyout_9slice@2x.png
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/Icons/Settings_Flyout_9slice@2x.png
rename to com.unity.shadergraph/Editor/Current/Resources/Icons/Settings_Flyout_9slice@2x.png
diff --git a/com.unity.shadergraph/Editor/Resources/Icons/Settings_Flyout_9slice@2x.png.meta b/com.unity.shadergraph/Editor/Current/Resources/Icons/Settings_Flyout_9slice@2x.png.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/Icons/Settings_Flyout_9slice@2x.png.meta
rename to com.unity.shadergraph/Editor/Current/Resources/Icons/Settings_Flyout_9slice@2x.png.meta
diff --git a/com.unity.shadergraph/Editor/Resources/Icons/settings_button.png b/com.unity.shadergraph/Editor/Current/Resources/Icons/settings_button.png
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/Icons/settings_button.png
rename to com.unity.shadergraph/Editor/Current/Resources/Icons/settings_button.png
diff --git a/com.unity.shadergraph/Editor/Resources/Icons/settings_button.png.meta b/com.unity.shadergraph/Editor/Current/Resources/Icons/settings_button.png.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/Icons/settings_button.png.meta
rename to com.unity.shadergraph/Editor/Current/Resources/Icons/settings_button.png.meta
diff --git a/com.unity.shadergraph/Editor/Resources/Icons/settingsbutton.png b/com.unity.shadergraph/Editor/Current/Resources/Icons/settingsbutton.png
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/Icons/settingsbutton.png
rename to com.unity.shadergraph/Editor/Current/Resources/Icons/settingsbutton.png
diff --git a/com.unity.shadergraph/Editor/Resources/Icons/settingsbutton.png.meta b/com.unity.shadergraph/Editor/Current/Resources/Icons/settingsbutton.png.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/Icons/settingsbutton.png.meta
rename to com.unity.shadergraph/Editor/Current/Resources/Icons/settingsbutton.png.meta
diff --git a/com.unity.shadergraph/Editor/Resources/Icons/sg_graph_icon.png b/com.unity.shadergraph/Editor/Current/Resources/Icons/sg_graph_icon.png
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/Icons/sg_graph_icon.png
rename to com.unity.shadergraph/Editor/Current/Resources/Icons/sg_graph_icon.png
diff --git a/com.unity.shadergraph/Editor/Resources/Icons/sg_graph_icon.png.meta b/com.unity.shadergraph/Editor/Current/Resources/Icons/sg_graph_icon.png.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/Icons/sg_graph_icon.png.meta
rename to com.unity.shadergraph/Editor/Current/Resources/Icons/sg_graph_icon.png.meta
diff --git a/com.unity.shadergraph/Editor/Resources/Icons/sg_graph_icon_gray_dark.png b/com.unity.shadergraph/Editor/Current/Resources/Icons/sg_graph_icon_gray_dark.png
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/Icons/sg_graph_icon_gray_dark.png
rename to com.unity.shadergraph/Editor/Current/Resources/Icons/sg_graph_icon_gray_dark.png
diff --git a/com.unity.shadergraph/Editor/Resources/Icons/sg_graph_icon_gray_dark.png.meta b/com.unity.shadergraph/Editor/Current/Resources/Icons/sg_graph_icon_gray_dark.png.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/Icons/sg_graph_icon_gray_dark.png.meta
rename to com.unity.shadergraph/Editor/Current/Resources/Icons/sg_graph_icon_gray_dark.png.meta
diff --git a/com.unity.shadergraph/Editor/Resources/Icons/sg_graph_icon_gray_light.png b/com.unity.shadergraph/Editor/Current/Resources/Icons/sg_graph_icon_gray_light.png
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/Icons/sg_graph_icon_gray_light.png
rename to com.unity.shadergraph/Editor/Current/Resources/Icons/sg_graph_icon_gray_light.png
diff --git a/com.unity.shadergraph/Editor/Resources/Icons/sg_graph_icon_gray_light.png.meta b/com.unity.shadergraph/Editor/Current/Resources/Icons/sg_graph_icon_gray_light.png.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/Icons/sg_graph_icon_gray_light.png.meta
rename to com.unity.shadergraph/Editor/Current/Resources/Icons/sg_graph_icon_gray_light.png.meta
diff --git a/com.unity.shadergraph/Editor/Resources/Icons/sg_subgraph_icon.png b/com.unity.shadergraph/Editor/Current/Resources/Icons/sg_subgraph_icon.png
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/Icons/sg_subgraph_icon.png
rename to com.unity.shadergraph/Editor/Current/Resources/Icons/sg_subgraph_icon.png
diff --git a/com.unity.shadergraph/Editor/Resources/Icons/sg_subgraph_icon.png.meta b/com.unity.shadergraph/Editor/Current/Resources/Icons/sg_subgraph_icon.png.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/Icons/sg_subgraph_icon.png.meta
rename to com.unity.shadergraph/Editor/Current/Resources/Icons/sg_subgraph_icon.png.meta
diff --git a/com.unity.shadergraph/Editor/Resources/Icons/sg_subgraph_icon_gray_dark.png b/com.unity.shadergraph/Editor/Current/Resources/Icons/sg_subgraph_icon_gray_dark.png
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/Icons/sg_subgraph_icon_gray_dark.png
rename to com.unity.shadergraph/Editor/Current/Resources/Icons/sg_subgraph_icon_gray_dark.png
diff --git a/com.unity.shadergraph/Editor/Resources/Icons/sg_subgraph_icon_gray_dark.png.meta b/com.unity.shadergraph/Editor/Current/Resources/Icons/sg_subgraph_icon_gray_dark.png.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/Icons/sg_subgraph_icon_gray_dark.png.meta
rename to com.unity.shadergraph/Editor/Current/Resources/Icons/sg_subgraph_icon_gray_dark.png.meta
diff --git a/com.unity.shadergraph/Editor/Resources/Icons/sg_subgraph_icon_gray_light.png b/com.unity.shadergraph/Editor/Current/Resources/Icons/sg_subgraph_icon_gray_light.png
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/Icons/sg_subgraph_icon_gray_light.png
rename to com.unity.shadergraph/Editor/Current/Resources/Icons/sg_subgraph_icon_gray_light.png
diff --git a/com.unity.shadergraph/Editor/Resources/Icons/sg_subgraph_icon_gray_light.png.meta b/com.unity.shadergraph/Editor/Current/Resources/Icons/sg_subgraph_icon_gray_light.png.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/Icons/sg_subgraph_icon_gray_light.png.meta
rename to com.unity.shadergraph/Editor/Current/Resources/Icons/sg_subgraph_icon_gray_light.png.meta
diff --git a/com.unity.shadergraph/Editor/Resources/Resizable.uss b/com.unity.shadergraph/Editor/Current/Resources/Resizable.uss
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/Resizable.uss
rename to com.unity.shadergraph/Editor/Current/Resources/Resizable.uss
diff --git a/com.unity.shadergraph/Editor/Resources/Resizable.uss.meta b/com.unity.shadergraph/Editor/Current/Resources/Resizable.uss.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/Resizable.uss.meta
rename to com.unity.shadergraph/Editor/Current/Resources/Resizable.uss.meta
diff --git a/com.unity.shadergraph/Editor/Resources/Selectable.uss b/com.unity.shadergraph/Editor/Current/Resources/Selectable.uss
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/Selectable.uss
rename to com.unity.shadergraph/Editor/Current/Resources/Selectable.uss
diff --git a/com.unity.shadergraph/Editor/Resources/Selectable.uss.meta b/com.unity.shadergraph/Editor/Current/Resources/Selectable.uss.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/Selectable.uss.meta
rename to com.unity.shadergraph/Editor/Current/Resources/Selectable.uss.meta
diff --git a/com.unity.shadergraph/Editor/Resources/Shaders.meta b/com.unity.shadergraph/Editor/Current/Resources/Shaders.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/Shaders.meta
rename to com.unity.shadergraph/Editor/Current/Resources/Shaders.meta
diff --git a/com.unity.shadergraph/Editor/Resources/Shaders/BlitNoAlpha.shader b/com.unity.shadergraph/Editor/Current/Resources/Shaders/BlitNoAlpha.shader
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/Shaders/BlitNoAlpha.shader
rename to com.unity.shadergraph/Editor/Current/Resources/Shaders/BlitNoAlpha.shader
diff --git a/com.unity.shadergraph/Editor/Resources/Shaders/BlitNoAlpha.shader.meta b/com.unity.shadergraph/Editor/Current/Resources/Shaders/BlitNoAlpha.shader.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/Shaders/BlitNoAlpha.shader.meta
rename to com.unity.shadergraph/Editor/Current/Resources/Shaders/BlitNoAlpha.shader.meta
diff --git a/com.unity.shadergraph/Editor/Resources/Shaders/Checkerboard.shader b/com.unity.shadergraph/Editor/Current/Resources/Shaders/Checkerboard.shader
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/Shaders/Checkerboard.shader
rename to com.unity.shadergraph/Editor/Current/Resources/Shaders/Checkerboard.shader
diff --git a/com.unity.shadergraph/Editor/Resources/Shaders/Checkerboard.shader.meta b/com.unity.shadergraph/Editor/Current/Resources/Shaders/Checkerboard.shader.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/Shaders/Checkerboard.shader.meta
rename to com.unity.shadergraph/Editor/Current/Resources/Shaders/Checkerboard.shader.meta
diff --git a/com.unity.shadergraph/Editor/Resources/Shaders/FallbackError.shader b/com.unity.shadergraph/Editor/Current/Resources/Shaders/FallbackError.shader
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/Shaders/FallbackError.shader
rename to com.unity.shadergraph/Editor/Current/Resources/Shaders/FallbackError.shader
diff --git a/com.unity.shadergraph/Editor/Resources/Shaders/FallbackError.shader.meta b/com.unity.shadergraph/Editor/Current/Resources/Shaders/FallbackError.shader.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/Shaders/FallbackError.shader.meta
rename to com.unity.shadergraph/Editor/Current/Resources/Shaders/FallbackError.shader.meta
diff --git a/com.unity.shadergraph/Editor/Resources/StickyNote.uss b/com.unity.shadergraph/Editor/Current/Resources/StickyNote.uss
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/StickyNote.uss
rename to com.unity.shadergraph/Editor/Current/Resources/StickyNote.uss
diff --git a/com.unity.shadergraph/Editor/Resources/StickyNote.uss.meta b/com.unity.shadergraph/Editor/Current/Resources/StickyNote.uss.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/StickyNote.uss.meta
rename to com.unity.shadergraph/Editor/Current/Resources/StickyNote.uss.meta
diff --git a/com.unity.shadergraph/Editor/Resources/Styles.meta b/com.unity.shadergraph/Editor/Current/Resources/Styles.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/Styles.meta
rename to com.unity.shadergraph/Editor/Current/Resources/Styles.meta
diff --git a/com.unity.shadergraph/Editor/Resources/Styles/ColorMode.uss b/com.unity.shadergraph/Editor/Current/Resources/Styles/ColorMode.uss
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/Styles/ColorMode.uss
rename to com.unity.shadergraph/Editor/Current/Resources/Styles/ColorMode.uss
diff --git a/com.unity.shadergraph/Editor/Resources/Styles/ColorMode.uss.meta b/com.unity.shadergraph/Editor/Current/Resources/Styles/ColorMode.uss.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/Styles/ColorMode.uss.meta
rename to com.unity.shadergraph/Editor/Current/Resources/Styles/ColorMode.uss.meta
diff --git a/com.unity.shadergraph/Editor/Resources/Styles/Controls.meta b/com.unity.shadergraph/Editor/Current/Resources/Styles/Controls.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/Styles/Controls.meta
rename to com.unity.shadergraph/Editor/Current/Resources/Styles/Controls.meta
diff --git a/com.unity.shadergraph/Editor/Resources/Styles/Controls/BooleanSlotControlView.uss b/com.unity.shadergraph/Editor/Current/Resources/Styles/Controls/BooleanSlotControlView.uss
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/Styles/Controls/BooleanSlotControlView.uss
rename to com.unity.shadergraph/Editor/Current/Resources/Styles/Controls/BooleanSlotControlView.uss
diff --git a/com.unity.shadergraph/Editor/Resources/Styles/Controls/BooleanSlotControlView.uss.meta b/com.unity.shadergraph/Editor/Current/Resources/Styles/Controls/BooleanSlotControlView.uss.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/Styles/Controls/BooleanSlotControlView.uss.meta
rename to com.unity.shadergraph/Editor/Current/Resources/Styles/Controls/BooleanSlotControlView.uss.meta
diff --git a/com.unity.shadergraph/Editor/Resources/Styles/Controls/ChannelEnumControlView.uss b/com.unity.shadergraph/Editor/Current/Resources/Styles/Controls/ChannelEnumControlView.uss
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/Styles/Controls/ChannelEnumControlView.uss
rename to com.unity.shadergraph/Editor/Current/Resources/Styles/Controls/ChannelEnumControlView.uss
diff --git a/com.unity.shadergraph/Editor/Resources/Styles/Controls/ChannelEnumControlView.uss.meta b/com.unity.shadergraph/Editor/Current/Resources/Styles/Controls/ChannelEnumControlView.uss.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/Styles/Controls/ChannelEnumControlView.uss.meta
rename to com.unity.shadergraph/Editor/Current/Resources/Styles/Controls/ChannelEnumControlView.uss.meta
diff --git a/com.unity.shadergraph/Editor/Resources/Styles/Controls/ChannelEnumMaskControlView.uss b/com.unity.shadergraph/Editor/Current/Resources/Styles/Controls/ChannelEnumMaskControlView.uss
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/Styles/Controls/ChannelEnumMaskControlView.uss
rename to com.unity.shadergraph/Editor/Current/Resources/Styles/Controls/ChannelEnumMaskControlView.uss
diff --git a/com.unity.shadergraph/Editor/Resources/Styles/Controls/ChannelEnumMaskControlView.uss.meta b/com.unity.shadergraph/Editor/Current/Resources/Styles/Controls/ChannelEnumMaskControlView.uss.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/Styles/Controls/ChannelEnumMaskControlView.uss.meta
rename to com.unity.shadergraph/Editor/Current/Resources/Styles/Controls/ChannelEnumMaskControlView.uss.meta
diff --git a/com.unity.shadergraph/Editor/Resources/Styles/Controls/ChannelMixerControlView.uss b/com.unity.shadergraph/Editor/Current/Resources/Styles/Controls/ChannelMixerControlView.uss
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/Styles/Controls/ChannelMixerControlView.uss
rename to com.unity.shadergraph/Editor/Current/Resources/Styles/Controls/ChannelMixerControlView.uss
diff --git a/com.unity.shadergraph/Editor/Resources/Styles/Controls/ChannelMixerControlView.uss.meta b/com.unity.shadergraph/Editor/Current/Resources/Styles/Controls/ChannelMixerControlView.uss.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/Styles/Controls/ChannelMixerControlView.uss.meta
rename to com.unity.shadergraph/Editor/Current/Resources/Styles/Controls/ChannelMixerControlView.uss.meta
diff --git a/com.unity.shadergraph/Editor/Resources/Styles/Controls/ColorControlView.uss b/com.unity.shadergraph/Editor/Current/Resources/Styles/Controls/ColorControlView.uss
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/Styles/Controls/ColorControlView.uss
rename to com.unity.shadergraph/Editor/Current/Resources/Styles/Controls/ColorControlView.uss
diff --git a/com.unity.shadergraph/Editor/Resources/Styles/Controls/ColorControlView.uss.meta b/com.unity.shadergraph/Editor/Current/Resources/Styles/Controls/ColorControlView.uss.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/Styles/Controls/ColorControlView.uss.meta
rename to com.unity.shadergraph/Editor/Current/Resources/Styles/Controls/ColorControlView.uss.meta
diff --git a/com.unity.shadergraph/Editor/Resources/Styles/Controls/ColorRGBASlotControlView.uss b/com.unity.shadergraph/Editor/Current/Resources/Styles/Controls/ColorRGBASlotControlView.uss
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/Styles/Controls/ColorRGBASlotControlView.uss
rename to com.unity.shadergraph/Editor/Current/Resources/Styles/Controls/ColorRGBASlotControlView.uss
diff --git a/com.unity.shadergraph/Editor/Resources/Styles/Controls/ColorRGBASlotControlView.uss.meta b/com.unity.shadergraph/Editor/Current/Resources/Styles/Controls/ColorRGBASlotControlView.uss.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/Styles/Controls/ColorRGBASlotControlView.uss.meta
rename to com.unity.shadergraph/Editor/Current/Resources/Styles/Controls/ColorRGBASlotControlView.uss.meta
diff --git a/com.unity.shadergraph/Editor/Resources/Styles/Controls/ColorRGBSlotControlView.uss b/com.unity.shadergraph/Editor/Current/Resources/Styles/Controls/ColorRGBSlotControlView.uss
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/Styles/Controls/ColorRGBSlotControlView.uss
rename to com.unity.shadergraph/Editor/Current/Resources/Styles/Controls/ColorRGBSlotControlView.uss
diff --git a/com.unity.shadergraph/Editor/Resources/Styles/Controls/ColorRGBSlotControlView.uss.meta b/com.unity.shadergraph/Editor/Current/Resources/Styles/Controls/ColorRGBSlotControlView.uss.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/Styles/Controls/ColorRGBSlotControlView.uss.meta
rename to com.unity.shadergraph/Editor/Current/Resources/Styles/Controls/ColorRGBSlotControlView.uss.meta
diff --git a/com.unity.shadergraph/Editor/Resources/Styles/Controls/CubemapSlotControlView.uss b/com.unity.shadergraph/Editor/Current/Resources/Styles/Controls/CubemapSlotControlView.uss
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/Styles/Controls/CubemapSlotControlView.uss
rename to com.unity.shadergraph/Editor/Current/Resources/Styles/Controls/CubemapSlotControlView.uss
diff --git a/com.unity.shadergraph/Editor/Resources/Styles/Controls/CubemapSlotControlView.uss.meta b/com.unity.shadergraph/Editor/Current/Resources/Styles/Controls/CubemapSlotControlView.uss.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/Styles/Controls/CubemapSlotControlView.uss.meta
rename to com.unity.shadergraph/Editor/Current/Resources/Styles/Controls/CubemapSlotControlView.uss.meta
diff --git a/com.unity.shadergraph/Editor/Resources/Styles/Controls/DielectricSpecularControlView.uss b/com.unity.shadergraph/Editor/Current/Resources/Styles/Controls/DielectricSpecularControlView.uss
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/Styles/Controls/DielectricSpecularControlView.uss
rename to com.unity.shadergraph/Editor/Current/Resources/Styles/Controls/DielectricSpecularControlView.uss
diff --git a/com.unity.shadergraph/Editor/Resources/Styles/Controls/DielectricSpecularControlView.uss.meta b/com.unity.shadergraph/Editor/Current/Resources/Styles/Controls/DielectricSpecularControlView.uss.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/Styles/Controls/DielectricSpecularControlView.uss.meta
rename to com.unity.shadergraph/Editor/Current/Resources/Styles/Controls/DielectricSpecularControlView.uss.meta
diff --git a/com.unity.shadergraph/Editor/Resources/Styles/Controls/EnumControlView.uss b/com.unity.shadergraph/Editor/Current/Resources/Styles/Controls/EnumControlView.uss
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/Styles/Controls/EnumControlView.uss
rename to com.unity.shadergraph/Editor/Current/Resources/Styles/Controls/EnumControlView.uss
diff --git a/com.unity.shadergraph/Editor/Resources/Styles/Controls/EnumControlView.uss.meta b/com.unity.shadergraph/Editor/Current/Resources/Styles/Controls/EnumControlView.uss.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/Styles/Controls/EnumControlView.uss.meta
rename to com.unity.shadergraph/Editor/Current/Resources/Styles/Controls/EnumControlView.uss.meta
diff --git a/com.unity.shadergraph/Editor/Resources/Styles/Controls/EnumConversionControlView.uss b/com.unity.shadergraph/Editor/Current/Resources/Styles/Controls/EnumConversionControlView.uss
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/Styles/Controls/EnumConversionControlView.uss
rename to com.unity.shadergraph/Editor/Current/Resources/Styles/Controls/EnumConversionControlView.uss
diff --git a/com.unity.shadergraph/Editor/Resources/Styles/Controls/EnumConversionControlView.uss.meta b/com.unity.shadergraph/Editor/Current/Resources/Styles/Controls/EnumConversionControlView.uss.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/Styles/Controls/EnumConversionControlView.uss.meta
rename to com.unity.shadergraph/Editor/Current/Resources/Styles/Controls/EnumConversionControlView.uss.meta
diff --git a/com.unity.shadergraph/Editor/Resources/Styles/Controls/GradientControlView.uss b/com.unity.shadergraph/Editor/Current/Resources/Styles/Controls/GradientControlView.uss
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/Styles/Controls/GradientControlView.uss
rename to com.unity.shadergraph/Editor/Current/Resources/Styles/Controls/GradientControlView.uss
diff --git a/com.unity.shadergraph/Editor/Resources/Styles/Controls/GradientControlView.uss.meta b/com.unity.shadergraph/Editor/Current/Resources/Styles/Controls/GradientControlView.uss.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/Styles/Controls/GradientControlView.uss.meta
rename to com.unity.shadergraph/Editor/Current/Resources/Styles/Controls/GradientControlView.uss.meta
diff --git a/com.unity.shadergraph/Editor/Resources/Styles/Controls/GradientSlotControlView.uss b/com.unity.shadergraph/Editor/Current/Resources/Styles/Controls/GradientSlotControlView.uss
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/Styles/Controls/GradientSlotControlView.uss
rename to com.unity.shadergraph/Editor/Current/Resources/Styles/Controls/GradientSlotControlView.uss
diff --git a/com.unity.shadergraph/Editor/Resources/Styles/Controls/GradientSlotControlView.uss.meta b/com.unity.shadergraph/Editor/Current/Resources/Styles/Controls/GradientSlotControlView.uss.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/Styles/Controls/GradientSlotControlView.uss.meta
rename to com.unity.shadergraph/Editor/Current/Resources/Styles/Controls/GradientSlotControlView.uss.meta
diff --git a/com.unity.shadergraph/Editor/Resources/Styles/Controls/IntegerControlView.uss b/com.unity.shadergraph/Editor/Current/Resources/Styles/Controls/IntegerControlView.uss
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/Styles/Controls/IntegerControlView.uss
rename to com.unity.shadergraph/Editor/Current/Resources/Styles/Controls/IntegerControlView.uss
diff --git a/com.unity.shadergraph/Editor/Resources/Styles/Controls/IntegerControlView.uss.meta b/com.unity.shadergraph/Editor/Current/Resources/Styles/Controls/IntegerControlView.uss.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/Styles/Controls/IntegerControlView.uss.meta
rename to com.unity.shadergraph/Editor/Current/Resources/Styles/Controls/IntegerControlView.uss.meta
diff --git a/com.unity.shadergraph/Editor/Resources/Styles/Controls/MultiFloatControlView.uss b/com.unity.shadergraph/Editor/Current/Resources/Styles/Controls/MultiFloatControlView.uss
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/Styles/Controls/MultiFloatControlView.uss
rename to com.unity.shadergraph/Editor/Current/Resources/Styles/Controls/MultiFloatControlView.uss
diff --git a/com.unity.shadergraph/Editor/Resources/Styles/Controls/MultiFloatControlView.uss.meta b/com.unity.shadergraph/Editor/Current/Resources/Styles/Controls/MultiFloatControlView.uss.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/Styles/Controls/MultiFloatControlView.uss.meta
rename to com.unity.shadergraph/Editor/Current/Resources/Styles/Controls/MultiFloatControlView.uss.meta
diff --git a/com.unity.shadergraph/Editor/Resources/Styles/Controls/MultiFloatSlotControlView.uss b/com.unity.shadergraph/Editor/Current/Resources/Styles/Controls/MultiFloatSlotControlView.uss
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/Styles/Controls/MultiFloatSlotControlView.uss
rename to com.unity.shadergraph/Editor/Current/Resources/Styles/Controls/MultiFloatSlotControlView.uss
diff --git a/com.unity.shadergraph/Editor/Resources/Styles/Controls/MultiFloatSlotControlView.uss.meta b/com.unity.shadergraph/Editor/Current/Resources/Styles/Controls/MultiFloatSlotControlView.uss.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/Styles/Controls/MultiFloatSlotControlView.uss.meta
rename to com.unity.shadergraph/Editor/Current/Resources/Styles/Controls/MultiFloatSlotControlView.uss.meta
diff --git a/com.unity.shadergraph/Editor/Resources/Styles/Controls/MultiIntegerSlotControlView.uss b/com.unity.shadergraph/Editor/Current/Resources/Styles/Controls/MultiIntegerSlotControlView.uss
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/Styles/Controls/MultiIntegerSlotControlView.uss
rename to com.unity.shadergraph/Editor/Current/Resources/Styles/Controls/MultiIntegerSlotControlView.uss
diff --git a/com.unity.shadergraph/Editor/Resources/Styles/Controls/MultiIntegerSlotControlView.uss.meta b/com.unity.shadergraph/Editor/Current/Resources/Styles/Controls/MultiIntegerSlotControlView.uss.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/Styles/Controls/MultiIntegerSlotControlView.uss.meta
rename to com.unity.shadergraph/Editor/Current/Resources/Styles/Controls/MultiIntegerSlotControlView.uss.meta
diff --git a/com.unity.shadergraph/Editor/Resources/Styles/Controls/PopupControlView.uss b/com.unity.shadergraph/Editor/Current/Resources/Styles/Controls/PopupControlView.uss
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/Styles/Controls/PopupControlView.uss
rename to com.unity.shadergraph/Editor/Current/Resources/Styles/Controls/PopupControlView.uss
diff --git a/com.unity.shadergraph/Editor/Resources/Styles/Controls/PopupControlView.uss.meta b/com.unity.shadergraph/Editor/Current/Resources/Styles/Controls/PopupControlView.uss.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/Styles/Controls/PopupControlView.uss.meta
rename to com.unity.shadergraph/Editor/Current/Resources/Styles/Controls/PopupControlView.uss.meta
diff --git a/com.unity.shadergraph/Editor/Resources/Styles/Controls/ScreenPositionSlotControlView.uss b/com.unity.shadergraph/Editor/Current/Resources/Styles/Controls/ScreenPositionSlotControlView.uss
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/Styles/Controls/ScreenPositionSlotControlView.uss
rename to com.unity.shadergraph/Editor/Current/Resources/Styles/Controls/ScreenPositionSlotControlView.uss
diff --git a/com.unity.shadergraph/Editor/Resources/Styles/Controls/ScreenPositionSlotControlView.uss.meta b/com.unity.shadergraph/Editor/Current/Resources/Styles/Controls/ScreenPositionSlotControlView.uss.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/Styles/Controls/ScreenPositionSlotControlView.uss.meta
rename to com.unity.shadergraph/Editor/Current/Resources/Styles/Controls/ScreenPositionSlotControlView.uss.meta
diff --git a/com.unity.shadergraph/Editor/Resources/Styles/Controls/SliderControlView.uss b/com.unity.shadergraph/Editor/Current/Resources/Styles/Controls/SliderControlView.uss
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/Styles/Controls/SliderControlView.uss
rename to com.unity.shadergraph/Editor/Current/Resources/Styles/Controls/SliderControlView.uss
diff --git a/com.unity.shadergraph/Editor/Resources/Styles/Controls/SliderControlView.uss.meta b/com.unity.shadergraph/Editor/Current/Resources/Styles/Controls/SliderControlView.uss.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/Styles/Controls/SliderControlView.uss.meta
rename to com.unity.shadergraph/Editor/Current/Resources/Styles/Controls/SliderControlView.uss.meta
diff --git a/com.unity.shadergraph/Editor/Resources/Styles/Controls/TextControlView.uss b/com.unity.shadergraph/Editor/Current/Resources/Styles/Controls/TextControlView.uss
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/Styles/Controls/TextControlView.uss
rename to com.unity.shadergraph/Editor/Current/Resources/Styles/Controls/TextControlView.uss
diff --git a/com.unity.shadergraph/Editor/Resources/Styles/Controls/TextControlView.uss.meta b/com.unity.shadergraph/Editor/Current/Resources/Styles/Controls/TextControlView.uss.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/Styles/Controls/TextControlView.uss.meta
rename to com.unity.shadergraph/Editor/Current/Resources/Styles/Controls/TextControlView.uss.meta
diff --git a/com.unity.shadergraph/Editor/Resources/Styles/Controls/Texture3DSlotControlView.uss b/com.unity.shadergraph/Editor/Current/Resources/Styles/Controls/Texture3DSlotControlView.uss
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/Styles/Controls/Texture3DSlotControlView.uss
rename to com.unity.shadergraph/Editor/Current/Resources/Styles/Controls/Texture3DSlotControlView.uss
diff --git a/com.unity.shadergraph/Editor/Resources/Styles/Controls/Texture3DSlotControlView.uss.meta b/com.unity.shadergraph/Editor/Current/Resources/Styles/Controls/Texture3DSlotControlView.uss.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/Styles/Controls/Texture3DSlotControlView.uss.meta
rename to com.unity.shadergraph/Editor/Current/Resources/Styles/Controls/Texture3DSlotControlView.uss.meta
diff --git a/com.unity.shadergraph/Editor/Resources/Styles/Controls/TextureArraySlotControlView.uss b/com.unity.shadergraph/Editor/Current/Resources/Styles/Controls/TextureArraySlotControlView.uss
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/Styles/Controls/TextureArraySlotControlView.uss
rename to com.unity.shadergraph/Editor/Current/Resources/Styles/Controls/TextureArraySlotControlView.uss
diff --git a/com.unity.shadergraph/Editor/Resources/Styles/Controls/TextureArraySlotControlView.uss.meta b/com.unity.shadergraph/Editor/Current/Resources/Styles/Controls/TextureArraySlotControlView.uss.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/Styles/Controls/TextureArraySlotControlView.uss.meta
rename to com.unity.shadergraph/Editor/Current/Resources/Styles/Controls/TextureArraySlotControlView.uss.meta
diff --git a/com.unity.shadergraph/Editor/Resources/Styles/Controls/TextureSlotControlView.uss b/com.unity.shadergraph/Editor/Current/Resources/Styles/Controls/TextureSlotControlView.uss
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/Styles/Controls/TextureSlotControlView.uss
rename to com.unity.shadergraph/Editor/Current/Resources/Styles/Controls/TextureSlotControlView.uss
diff --git a/com.unity.shadergraph/Editor/Resources/Styles/Controls/TextureSlotControlView.uss.meta b/com.unity.shadergraph/Editor/Current/Resources/Styles/Controls/TextureSlotControlView.uss.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/Styles/Controls/TextureSlotControlView.uss.meta
rename to com.unity.shadergraph/Editor/Current/Resources/Styles/Controls/TextureSlotControlView.uss.meta
diff --git a/com.unity.shadergraph/Editor/Resources/Styles/Controls/ToggleControlView.uss b/com.unity.shadergraph/Editor/Current/Resources/Styles/Controls/ToggleControlView.uss
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/Styles/Controls/ToggleControlView.uss
rename to com.unity.shadergraph/Editor/Current/Resources/Styles/Controls/ToggleControlView.uss
diff --git a/com.unity.shadergraph/Editor/Resources/Styles/Controls/ToggleControlView.uss.meta b/com.unity.shadergraph/Editor/Current/Resources/Styles/Controls/ToggleControlView.uss.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/Styles/Controls/ToggleControlView.uss.meta
rename to com.unity.shadergraph/Editor/Current/Resources/Styles/Controls/ToggleControlView.uss.meta
diff --git a/com.unity.shadergraph/Editor/Resources/Styles/Controls/UVSlotControlView.uss b/com.unity.shadergraph/Editor/Current/Resources/Styles/Controls/UVSlotControlView.uss
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/Styles/Controls/UVSlotControlView.uss
rename to com.unity.shadergraph/Editor/Current/Resources/Styles/Controls/UVSlotControlView.uss
diff --git a/com.unity.shadergraph/Editor/Resources/Styles/Controls/UVSlotControlView.uss.meta b/com.unity.shadergraph/Editor/Current/Resources/Styles/Controls/UVSlotControlView.uss.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/Styles/Controls/UVSlotControlView.uss.meta
rename to com.unity.shadergraph/Editor/Current/Resources/Styles/Controls/UVSlotControlView.uss.meta
diff --git a/com.unity.shadergraph/Editor/Resources/Styles/CustomSlotLabelField.uss b/com.unity.shadergraph/Editor/Current/Resources/Styles/CustomSlotLabelField.uss
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/Styles/CustomSlotLabelField.uss
rename to com.unity.shadergraph/Editor/Current/Resources/Styles/CustomSlotLabelField.uss
diff --git a/com.unity.shadergraph/Editor/Resources/Styles/CustomSlotLabelField.uss.meta b/com.unity.shadergraph/Editor/Current/Resources/Styles/CustomSlotLabelField.uss.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/Styles/CustomSlotLabelField.uss.meta
rename to com.unity.shadergraph/Editor/Current/Resources/Styles/CustomSlotLabelField.uss.meta
diff --git a/com.unity.shadergraph/Editor/Resources/Styles/GraphEditorView.uss b/com.unity.shadergraph/Editor/Current/Resources/Styles/GraphEditorView.uss
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/Styles/GraphEditorView.uss
rename to com.unity.shadergraph/Editor/Current/Resources/Styles/GraphEditorView.uss
diff --git a/com.unity.shadergraph/Editor/Resources/Styles/GraphEditorView.uss.meta b/com.unity.shadergraph/Editor/Current/Resources/Styles/GraphEditorView.uss.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/Styles/GraphEditorView.uss.meta
rename to com.unity.shadergraph/Editor/Current/Resources/Styles/GraphEditorView.uss.meta
diff --git a/com.unity.shadergraph/Editor/Resources/Styles/GraphSubWindow.uss b/com.unity.shadergraph/Editor/Current/Resources/Styles/GraphSubWindow.uss
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/Styles/GraphSubWindow.uss
rename to com.unity.shadergraph/Editor/Current/Resources/Styles/GraphSubWindow.uss
diff --git a/com.unity.shadergraph/Editor/Resources/Styles/GraphSubWindow.uss.meta b/com.unity.shadergraph/Editor/Current/Resources/Styles/GraphSubWindow.uss.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/Styles/GraphSubWindow.uss.meta
rename to com.unity.shadergraph/Editor/Current/Resources/Styles/GraphSubWindow.uss.meta
diff --git a/com.unity.shadergraph/Editor/Resources/Styles/HelpBoxRow.uss b/com.unity.shadergraph/Editor/Current/Resources/Styles/HelpBoxRow.uss
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/Styles/HelpBoxRow.uss
rename to com.unity.shadergraph/Editor/Current/Resources/Styles/HelpBoxRow.uss
diff --git a/com.unity.shadergraph/Editor/Resources/Styles/HelpBoxRow.uss.meta b/com.unity.shadergraph/Editor/Current/Resources/Styles/HelpBoxRow.uss.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/Styles/HelpBoxRow.uss.meta
rename to com.unity.shadergraph/Editor/Current/Resources/Styles/HelpBoxRow.uss.meta
diff --git a/com.unity.shadergraph/Editor/Resources/Styles/HlslFunctionView.uss b/com.unity.shadergraph/Editor/Current/Resources/Styles/HlslFunctionView.uss
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/Styles/HlslFunctionView.uss
rename to com.unity.shadergraph/Editor/Current/Resources/Styles/HlslFunctionView.uss
diff --git a/com.unity.shadergraph/Editor/Resources/Styles/HlslFunctionView.uss.meta b/com.unity.shadergraph/Editor/Current/Resources/Styles/HlslFunctionView.uss.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/Styles/HlslFunctionView.uss.meta
rename to com.unity.shadergraph/Editor/Current/Resources/Styles/HlslFunctionView.uss.meta
diff --git a/com.unity.shadergraph/Editor/Resources/Styles/InspectorView.uss b/com.unity.shadergraph/Editor/Current/Resources/Styles/InspectorView.uss
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/Styles/InspectorView.uss
rename to com.unity.shadergraph/Editor/Current/Resources/Styles/InspectorView.uss
diff --git a/com.unity.shadergraph/Editor/Resources/Styles/InspectorView.uss.meta b/com.unity.shadergraph/Editor/Current/Resources/Styles/InspectorView.uss.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/Styles/InspectorView.uss.meta
rename to com.unity.shadergraph/Editor/Current/Resources/Styles/InspectorView.uss.meta
diff --git a/com.unity.shadergraph/Editor/Resources/Styles/MasterPreviewView.uss b/com.unity.shadergraph/Editor/Current/Resources/Styles/MasterPreviewView.uss
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/Styles/MasterPreviewView.uss
rename to com.unity.shadergraph/Editor/Current/Resources/Styles/MasterPreviewView.uss
diff --git a/com.unity.shadergraph/Editor/Resources/Styles/MasterPreviewView.uss.meta b/com.unity.shadergraph/Editor/Current/Resources/Styles/MasterPreviewView.uss.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/Styles/MasterPreviewView.uss.meta
rename to com.unity.shadergraph/Editor/Current/Resources/Styles/MasterPreviewView.uss.meta
diff --git a/com.unity.shadergraph/Editor/Resources/Styles/MaterialGraph.uss b/com.unity.shadergraph/Editor/Current/Resources/Styles/MaterialGraph.uss
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/Styles/MaterialGraph.uss
rename to com.unity.shadergraph/Editor/Current/Resources/Styles/MaterialGraph.uss
diff --git a/com.unity.shadergraph/Editor/Resources/Styles/MaterialGraph.uss.meta b/com.unity.shadergraph/Editor/Current/Resources/Styles/MaterialGraph.uss.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/Styles/MaterialGraph.uss.meta
rename to com.unity.shadergraph/Editor/Current/Resources/Styles/MaterialGraph.uss.meta
diff --git a/com.unity.shadergraph/Editor/Resources/Styles/MaterialGraphView.uss b/com.unity.shadergraph/Editor/Current/Resources/Styles/MaterialGraphView.uss
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/Styles/MaterialGraphView.uss
rename to com.unity.shadergraph/Editor/Current/Resources/Styles/MaterialGraphView.uss
diff --git a/com.unity.shadergraph/Editor/Resources/Styles/MaterialGraphView.uss.meta b/com.unity.shadergraph/Editor/Current/Resources/Styles/MaterialGraphView.uss.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/Styles/MaterialGraphView.uss.meta
rename to com.unity.shadergraph/Editor/Current/Resources/Styles/MaterialGraphView.uss.meta
diff --git a/com.unity.shadergraph/Editor/Resources/Styles/MaterialNodeView.uss b/com.unity.shadergraph/Editor/Current/Resources/Styles/MaterialNodeView.uss
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/Styles/MaterialNodeView.uss
rename to com.unity.shadergraph/Editor/Current/Resources/Styles/MaterialNodeView.uss
diff --git a/com.unity.shadergraph/Editor/Resources/Styles/MaterialNodeView.uss.meta b/com.unity.shadergraph/Editor/Current/Resources/Styles/MaterialNodeView.uss.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/Styles/MaterialNodeView.uss.meta
rename to com.unity.shadergraph/Editor/Current/Resources/Styles/MaterialNodeView.uss.meta
diff --git a/com.unity.shadergraph/Editor/Resources/Styles/NodeSettings.uss b/com.unity.shadergraph/Editor/Current/Resources/Styles/NodeSettings.uss
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/Styles/NodeSettings.uss
rename to com.unity.shadergraph/Editor/Current/Resources/Styles/NodeSettings.uss
diff --git a/com.unity.shadergraph/Editor/Resources/Styles/NodeSettings.uss.meta b/com.unity.shadergraph/Editor/Current/Resources/Styles/NodeSettings.uss.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/Styles/NodeSettings.uss.meta
rename to com.unity.shadergraph/Editor/Current/Resources/Styles/NodeSettings.uss.meta
diff --git a/com.unity.shadergraph/Editor/Resources/Styles/PixelCacheProfiler.uss b/com.unity.shadergraph/Editor/Current/Resources/Styles/PixelCacheProfiler.uss
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/Styles/PixelCacheProfiler.uss
rename to com.unity.shadergraph/Editor/Current/Resources/Styles/PixelCacheProfiler.uss
diff --git a/com.unity.shadergraph/Editor/Resources/Styles/PixelCacheProfiler.uss.meta b/com.unity.shadergraph/Editor/Current/Resources/Styles/PixelCacheProfiler.uss.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/Styles/PixelCacheProfiler.uss.meta
rename to com.unity.shadergraph/Editor/Current/Resources/Styles/PixelCacheProfiler.uss.meta
diff --git a/com.unity.shadergraph/Editor/Resources/Styles/PortInputView.uss b/com.unity.shadergraph/Editor/Current/Resources/Styles/PortInputView.uss
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/Styles/PortInputView.uss
rename to com.unity.shadergraph/Editor/Current/Resources/Styles/PortInputView.uss
diff --git a/com.unity.shadergraph/Editor/Resources/Styles/PortInputView.uss.meta b/com.unity.shadergraph/Editor/Current/Resources/Styles/PortInputView.uss.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/Styles/PortInputView.uss.meta
rename to com.unity.shadergraph/Editor/Current/Resources/Styles/PortInputView.uss.meta
diff --git a/com.unity.shadergraph/Editor/Resources/Styles/PropertyNameReferenceField.uss b/com.unity.shadergraph/Editor/Current/Resources/Styles/PropertyNameReferenceField.uss
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/Styles/PropertyNameReferenceField.uss
rename to com.unity.shadergraph/Editor/Current/Resources/Styles/PropertyNameReferenceField.uss
diff --git a/com.unity.shadergraph/Editor/Resources/Styles/PropertyNameReferenceField.uss.meta b/com.unity.shadergraph/Editor/Current/Resources/Styles/PropertyNameReferenceField.uss.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/Styles/PropertyNameReferenceField.uss.meta
rename to com.unity.shadergraph/Editor/Current/Resources/Styles/PropertyNameReferenceField.uss.meta
diff --git a/com.unity.shadergraph/Editor/Resources/Styles/PropertyNodeView.uss b/com.unity.shadergraph/Editor/Current/Resources/Styles/PropertyNodeView.uss
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/Styles/PropertyNodeView.uss
rename to com.unity.shadergraph/Editor/Current/Resources/Styles/PropertyNodeView.uss
diff --git a/com.unity.shadergraph/Editor/Resources/Styles/PropertyNodeView.uss.meta b/com.unity.shadergraph/Editor/Current/Resources/Styles/PropertyNodeView.uss.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/Styles/PropertyNodeView.uss.meta
rename to com.unity.shadergraph/Editor/Current/Resources/Styles/PropertyNodeView.uss.meta
diff --git a/com.unity.shadergraph/Editor/Resources/Styles/PropertyRow.uss b/com.unity.shadergraph/Editor/Current/Resources/Styles/PropertyRow.uss
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/Styles/PropertyRow.uss
rename to com.unity.shadergraph/Editor/Current/Resources/Styles/PropertyRow.uss
diff --git a/com.unity.shadergraph/Editor/Resources/Styles/PropertyRow.uss.meta b/com.unity.shadergraph/Editor/Current/Resources/Styles/PropertyRow.uss.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/Styles/PropertyRow.uss.meta
rename to com.unity.shadergraph/Editor/Current/Resources/Styles/PropertyRow.uss.meta
diff --git a/com.unity.shadergraph/Editor/Resources/Styles/PropertySheet.uss b/com.unity.shadergraph/Editor/Current/Resources/Styles/PropertySheet.uss
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/Styles/PropertySheet.uss
rename to com.unity.shadergraph/Editor/Current/Resources/Styles/PropertySheet.uss
diff --git a/com.unity.shadergraph/Editor/Resources/Styles/PropertySheet.uss.meta b/com.unity.shadergraph/Editor/Current/Resources/Styles/PropertySheet.uss.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/Styles/PropertySheet.uss.meta
rename to com.unity.shadergraph/Editor/Current/Resources/Styles/PropertySheet.uss.meta
diff --git a/com.unity.shadergraph/Editor/Resources/Styles/RedirectNode.uss b/com.unity.shadergraph/Editor/Current/Resources/Styles/RedirectNode.uss
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/Styles/RedirectNode.uss
rename to com.unity.shadergraph/Editor/Current/Resources/Styles/RedirectNode.uss
diff --git a/com.unity.shadergraph/Editor/Resources/Styles/RedirectNode.uss.meta b/com.unity.shadergraph/Editor/Current/Resources/Styles/RedirectNode.uss.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/Styles/RedirectNode.uss.meta
rename to com.unity.shadergraph/Editor/Current/Resources/Styles/RedirectNode.uss.meta
diff --git a/com.unity.shadergraph/Editor/Resources/Styles/ReorderableSlotListView.uss b/com.unity.shadergraph/Editor/Current/Resources/Styles/ReorderableSlotListView.uss
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/Styles/ReorderableSlotListView.uss
rename to com.unity.shadergraph/Editor/Current/Resources/Styles/ReorderableSlotListView.uss
diff --git a/com.unity.shadergraph/Editor/Resources/Styles/ReorderableSlotListView.uss.meta b/com.unity.shadergraph/Editor/Current/Resources/Styles/ReorderableSlotListView.uss.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/Styles/ReorderableSlotListView.uss.meta
rename to com.unity.shadergraph/Editor/Current/Resources/Styles/ReorderableSlotListView.uss.meta
diff --git a/com.unity.shadergraph/Editor/Resources/Styles/SGBlackboard.uss b/com.unity.shadergraph/Editor/Current/Resources/Styles/SGBlackboard.uss
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/Styles/SGBlackboard.uss
rename to com.unity.shadergraph/Editor/Current/Resources/Styles/SGBlackboard.uss
diff --git a/com.unity.shadergraph/Editor/Resources/Styles/SGBlackboard.uss.meta b/com.unity.shadergraph/Editor/Current/Resources/Styles/SGBlackboard.uss.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/Styles/SGBlackboard.uss.meta
rename to com.unity.shadergraph/Editor/Current/Resources/Styles/SGBlackboard.uss.meta
diff --git a/com.unity.shadergraph/Editor/Resources/Styles/ShaderPort.uss b/com.unity.shadergraph/Editor/Current/Resources/Styles/ShaderPort.uss
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/Styles/ShaderPort.uss
rename to com.unity.shadergraph/Editor/Current/Resources/Styles/ShaderPort.uss
diff --git a/com.unity.shadergraph/Editor/Resources/Styles/ShaderPort.uss.meta b/com.unity.shadergraph/Editor/Current/Resources/Styles/ShaderPort.uss.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/Styles/ShaderPort.uss.meta
rename to com.unity.shadergraph/Editor/Current/Resources/Styles/ShaderPort.uss.meta
diff --git a/com.unity.shadergraph/Editor/Resources/Styles/TabButtonStyles.uss b/com.unity.shadergraph/Editor/Current/Resources/Styles/TabButtonStyles.uss
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/Styles/TabButtonStyles.uss
rename to com.unity.shadergraph/Editor/Current/Resources/Styles/TabButtonStyles.uss
diff --git a/com.unity.shadergraph/Editor/Resources/Styles/TabButtonStyles.uss.meta b/com.unity.shadergraph/Editor/Current/Resources/Styles/TabButtonStyles.uss.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/Styles/TabButtonStyles.uss.meta
rename to com.unity.shadergraph/Editor/Current/Resources/Styles/TabButtonStyles.uss.meta
diff --git a/com.unity.shadergraph/Editor/Resources/Styles/TabbedView.uss b/com.unity.shadergraph/Editor/Current/Resources/Styles/TabbedView.uss
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/Styles/TabbedView.uss
rename to com.unity.shadergraph/Editor/Current/Resources/Styles/TabbedView.uss
diff --git a/com.unity.shadergraph/Editor/Resources/Styles/TabbedView.uss.meta b/com.unity.shadergraph/Editor/Current/Resources/Styles/TabbedView.uss.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/Styles/TabbedView.uss.meta
rename to com.unity.shadergraph/Editor/Current/Resources/Styles/TabbedView.uss.meta
diff --git a/com.unity.shadergraph/Editor/Resources/UXML.meta b/com.unity.shadergraph/Editor/Current/Resources/UXML.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/UXML.meta
rename to com.unity.shadergraph/Editor/Current/Resources/UXML.meta
diff --git a/com.unity.shadergraph/Editor/Resources/UXML/Blackboard.meta b/com.unity.shadergraph/Editor/Current/Resources/UXML/Blackboard.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/UXML/Blackboard.meta
rename to com.unity.shadergraph/Editor/Current/Resources/UXML/Blackboard.meta
diff --git a/com.unity.shadergraph/Editor/Resources/UXML/Blackboard/SGBlackboard.uxml b/com.unity.shadergraph/Editor/Current/Resources/UXML/Blackboard/SGBlackboard.uxml
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/UXML/Blackboard/SGBlackboard.uxml
rename to com.unity.shadergraph/Editor/Current/Resources/UXML/Blackboard/SGBlackboard.uxml
diff --git a/com.unity.shadergraph/Editor/Resources/UXML/Blackboard/SGBlackboard.uxml.meta b/com.unity.shadergraph/Editor/Current/Resources/UXML/Blackboard/SGBlackboard.uxml.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/UXML/Blackboard/SGBlackboard.uxml.meta
rename to com.unity.shadergraph/Editor/Current/Resources/UXML/Blackboard/SGBlackboard.uxml.meta
diff --git a/com.unity.shadergraph/Editor/Resources/UXML/Blackboard/SGBlackboardCategory.uxml b/com.unity.shadergraph/Editor/Current/Resources/UXML/Blackboard/SGBlackboardCategory.uxml
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/UXML/Blackboard/SGBlackboardCategory.uxml
rename to com.unity.shadergraph/Editor/Current/Resources/UXML/Blackboard/SGBlackboardCategory.uxml
diff --git a/com.unity.shadergraph/Editor/Resources/UXML/Blackboard/SGBlackboardCategory.uxml.meta b/com.unity.shadergraph/Editor/Current/Resources/UXML/Blackboard/SGBlackboardCategory.uxml.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/UXML/Blackboard/SGBlackboardCategory.uxml.meta
rename to com.unity.shadergraph/Editor/Current/Resources/UXML/Blackboard/SGBlackboardCategory.uxml.meta
diff --git a/com.unity.shadergraph/Editor/Resources/UXML/Blackboard/SGBlackboardField.uxml b/com.unity.shadergraph/Editor/Current/Resources/UXML/Blackboard/SGBlackboardField.uxml
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/UXML/Blackboard/SGBlackboardField.uxml
rename to com.unity.shadergraph/Editor/Current/Resources/UXML/Blackboard/SGBlackboardField.uxml
diff --git a/com.unity.shadergraph/Editor/Resources/UXML/Blackboard/SGBlackboardField.uxml.meta b/com.unity.shadergraph/Editor/Current/Resources/UXML/Blackboard/SGBlackboardField.uxml.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/UXML/Blackboard/SGBlackboardField.uxml.meta
rename to com.unity.shadergraph/Editor/Current/Resources/UXML/Blackboard/SGBlackboardField.uxml.meta
diff --git a/com.unity.shadergraph/Editor/Resources/UXML/Blackboard/SGBlackboardRow.uxml b/com.unity.shadergraph/Editor/Current/Resources/UXML/Blackboard/SGBlackboardRow.uxml
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/UXML/Blackboard/SGBlackboardRow.uxml
rename to com.unity.shadergraph/Editor/Current/Resources/UXML/Blackboard/SGBlackboardRow.uxml
diff --git a/com.unity.shadergraph/Editor/Resources/UXML/Blackboard/SGBlackboardRow.uxml.meta b/com.unity.shadergraph/Editor/Current/Resources/UXML/Blackboard/SGBlackboardRow.uxml.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/UXML/Blackboard/SGBlackboardRow.uxml.meta
rename to com.unity.shadergraph/Editor/Current/Resources/UXML/Blackboard/SGBlackboardRow.uxml.meta
diff --git a/com.unity.shadergraph/Editor/Resources/UXML/GraphInspector.uxml b/com.unity.shadergraph/Editor/Current/Resources/UXML/GraphInspector.uxml
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/UXML/GraphInspector.uxml
rename to com.unity.shadergraph/Editor/Current/Resources/UXML/GraphInspector.uxml
diff --git a/com.unity.shadergraph/Editor/Resources/UXML/GraphInspector.uxml.meta b/com.unity.shadergraph/Editor/Current/Resources/UXML/GraphInspector.uxml.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/UXML/GraphInspector.uxml.meta
rename to com.unity.shadergraph/Editor/Current/Resources/UXML/GraphInspector.uxml.meta
diff --git a/com.unity.shadergraph/Editor/Resources/UXML/GraphSubWindow.uxml b/com.unity.shadergraph/Editor/Current/Resources/UXML/GraphSubWindow.uxml
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/UXML/GraphSubWindow.uxml
rename to com.unity.shadergraph/Editor/Current/Resources/UXML/GraphSubWindow.uxml
diff --git a/com.unity.shadergraph/Editor/Resources/UXML/GraphSubWindow.uxml.meta b/com.unity.shadergraph/Editor/Current/Resources/UXML/GraphSubWindow.uxml.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/UXML/GraphSubWindow.uxml.meta
rename to com.unity.shadergraph/Editor/Current/Resources/UXML/GraphSubWindow.uxml.meta
diff --git a/com.unity.shadergraph/Editor/Resources/UXML/NodeSettings.uxml b/com.unity.shadergraph/Editor/Current/Resources/UXML/NodeSettings.uxml
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/UXML/NodeSettings.uxml
rename to com.unity.shadergraph/Editor/Current/Resources/UXML/NodeSettings.uxml
diff --git a/com.unity.shadergraph/Editor/Resources/UXML/NodeSettings.uxml.meta b/com.unity.shadergraph/Editor/Current/Resources/UXML/NodeSettings.uxml.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/UXML/NodeSettings.uxml.meta
rename to com.unity.shadergraph/Editor/Current/Resources/UXML/NodeSettings.uxml.meta
diff --git a/com.unity.shadergraph/Editor/Resources/UXML/PixelCacheProfiler.uxml b/com.unity.shadergraph/Editor/Current/Resources/UXML/PixelCacheProfiler.uxml
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/UXML/PixelCacheProfiler.uxml
rename to com.unity.shadergraph/Editor/Current/Resources/UXML/PixelCacheProfiler.uxml
diff --git a/com.unity.shadergraph/Editor/Resources/UXML/PixelCacheProfiler.uxml.meta b/com.unity.shadergraph/Editor/Current/Resources/UXML/PixelCacheProfiler.uxml.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/UXML/PixelCacheProfiler.uxml.meta
rename to com.unity.shadergraph/Editor/Current/Resources/UXML/PixelCacheProfiler.uxml.meta
diff --git a/com.unity.shadergraph/Editor/Resources/UXML/Resizable.uxml b/com.unity.shadergraph/Editor/Current/Resources/UXML/Resizable.uxml
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/UXML/Resizable.uxml
rename to com.unity.shadergraph/Editor/Current/Resources/UXML/Resizable.uxml
diff --git a/com.unity.shadergraph/Editor/Resources/UXML/Resizable.uxml.meta b/com.unity.shadergraph/Editor/Current/Resources/UXML/Resizable.uxml.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/UXML/Resizable.uxml.meta
rename to com.unity.shadergraph/Editor/Current/Resources/UXML/Resizable.uxml.meta
diff --git a/com.unity.shadergraph/Editor/Resources/UXML/StickyNote.uxml b/com.unity.shadergraph/Editor/Current/Resources/UXML/StickyNote.uxml
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/UXML/StickyNote.uxml
rename to com.unity.shadergraph/Editor/Current/Resources/UXML/StickyNote.uxml
diff --git a/com.unity.shadergraph/Editor/Resources/UXML/StickyNote.uxml.meta b/com.unity.shadergraph/Editor/Current/Resources/UXML/StickyNote.uxml.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/UXML/StickyNote.uxml.meta
rename to com.unity.shadergraph/Editor/Current/Resources/UXML/StickyNote.uxml.meta
diff --git a/com.unity.shadergraph/Editor/Resources/UXML/TabButton.uxml b/com.unity.shadergraph/Editor/Current/Resources/UXML/TabButton.uxml
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/UXML/TabButton.uxml
rename to com.unity.shadergraph/Editor/Current/Resources/UXML/TabButton.uxml
diff --git a/com.unity.shadergraph/Editor/Resources/UXML/TabButton.uxml.meta b/com.unity.shadergraph/Editor/Current/Resources/UXML/TabButton.uxml.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Resources/UXML/TabButton.uxml.meta
rename to com.unity.shadergraph/Editor/Current/Resources/UXML/TabButton.uxml.meta
diff --git a/com.unity.shadergraph/Editor/Serialization.meta b/com.unity.shadergraph/Editor/Current/Serialization.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Serialization.meta
rename to com.unity.shadergraph/Editor/Current/Serialization.meta
diff --git a/com.unity.shadergraph/Editor/Serialization/FakeJsonObject.cs b/com.unity.shadergraph/Editor/Current/Serialization/FakeJsonObject.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Serialization/FakeJsonObject.cs
rename to com.unity.shadergraph/Editor/Current/Serialization/FakeJsonObject.cs
diff --git a/com.unity.shadergraph/Editor/Serialization/FakeJsonObject.cs.meta b/com.unity.shadergraph/Editor/Current/Serialization/FakeJsonObject.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Serialization/FakeJsonObject.cs.meta
rename to com.unity.shadergraph/Editor/Current/Serialization/FakeJsonObject.cs.meta
diff --git a/com.unity.shadergraph/Editor/Serialization/JsonData.cs b/com.unity.shadergraph/Editor/Current/Serialization/JsonData.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Serialization/JsonData.cs
rename to com.unity.shadergraph/Editor/Current/Serialization/JsonData.cs
diff --git a/com.unity.shadergraph/Editor/Serialization/JsonData.cs.meta b/com.unity.shadergraph/Editor/Current/Serialization/JsonData.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Serialization/JsonData.cs.meta
rename to com.unity.shadergraph/Editor/Current/Serialization/JsonData.cs.meta
diff --git a/com.unity.shadergraph/Editor/Serialization/JsonObject.cs b/com.unity.shadergraph/Editor/Current/Serialization/JsonObject.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Serialization/JsonObject.cs
rename to com.unity.shadergraph/Editor/Current/Serialization/JsonObject.cs
diff --git a/com.unity.shadergraph/Editor/Serialization/JsonObject.cs.meta b/com.unity.shadergraph/Editor/Current/Serialization/JsonObject.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Serialization/JsonObject.cs.meta
rename to com.unity.shadergraph/Editor/Current/Serialization/JsonObject.cs.meta
diff --git a/com.unity.shadergraph/Editor/Serialization/JsonRef.cs b/com.unity.shadergraph/Editor/Current/Serialization/JsonRef.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Serialization/JsonRef.cs
rename to com.unity.shadergraph/Editor/Current/Serialization/JsonRef.cs
diff --git a/com.unity.shadergraph/Editor/Serialization/JsonRef.cs.meta b/com.unity.shadergraph/Editor/Current/Serialization/JsonRef.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Serialization/JsonRef.cs.meta
rename to com.unity.shadergraph/Editor/Current/Serialization/JsonRef.cs.meta
diff --git a/com.unity.shadergraph/Editor/Serialization/MultiJson.cs b/com.unity.shadergraph/Editor/Current/Serialization/MultiJson.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Serialization/MultiJson.cs
rename to com.unity.shadergraph/Editor/Current/Serialization/MultiJson.cs
diff --git a/com.unity.shadergraph/Editor/Serialization/MultiJson.cs.meta b/com.unity.shadergraph/Editor/Current/Serialization/MultiJson.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Serialization/MultiJson.cs.meta
rename to com.unity.shadergraph/Editor/Current/Serialization/MultiJson.cs.meta
diff --git a/com.unity.shadergraph/Editor/Serialization/MultiJsonEntry.cs b/com.unity.shadergraph/Editor/Current/Serialization/MultiJsonEntry.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Serialization/MultiJsonEntry.cs
rename to com.unity.shadergraph/Editor/Current/Serialization/MultiJsonEntry.cs
diff --git a/com.unity.shadergraph/Editor/Serialization/MultiJsonEntry.cs.meta b/com.unity.shadergraph/Editor/Current/Serialization/MultiJsonEntry.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Serialization/MultiJsonEntry.cs.meta
rename to com.unity.shadergraph/Editor/Current/Serialization/MultiJsonEntry.cs.meta
diff --git a/com.unity.shadergraph/Editor/Serialization/MultiJsonInternal.cs b/com.unity.shadergraph/Editor/Current/Serialization/MultiJsonInternal.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Serialization/MultiJsonInternal.cs
rename to com.unity.shadergraph/Editor/Current/Serialization/MultiJsonInternal.cs
diff --git a/com.unity.shadergraph/Editor/Serialization/MultiJsonInternal.cs.meta b/com.unity.shadergraph/Editor/Current/Serialization/MultiJsonInternal.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Serialization/MultiJsonInternal.cs.meta
rename to com.unity.shadergraph/Editor/Current/Serialization/MultiJsonInternal.cs.meta
diff --git a/com.unity.shadergraph/Editor/Serialization/RefDataEnumerable.cs b/com.unity.shadergraph/Editor/Current/Serialization/RefDataEnumerable.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Serialization/RefDataEnumerable.cs
rename to com.unity.shadergraph/Editor/Current/Serialization/RefDataEnumerable.cs
diff --git a/com.unity.shadergraph/Editor/Serialization/RefDataEnumerable.cs.meta b/com.unity.shadergraph/Editor/Current/Serialization/RefDataEnumerable.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Serialization/RefDataEnumerable.cs.meta
rename to com.unity.shadergraph/Editor/Current/Serialization/RefDataEnumerable.cs.meta
diff --git a/com.unity.shadergraph/Editor/Serialization/RefValueEnumerable.cs b/com.unity.shadergraph/Editor/Current/Serialization/RefValueEnumerable.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Serialization/RefValueEnumerable.cs
rename to com.unity.shadergraph/Editor/Current/Serialization/RefValueEnumerable.cs
diff --git a/com.unity.shadergraph/Editor/Serialization/RefValueEnumerable.cs.meta b/com.unity.shadergraph/Editor/Current/Serialization/RefValueEnumerable.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Serialization/RefValueEnumerable.cs.meta
rename to com.unity.shadergraph/Editor/Current/Serialization/RefValueEnumerable.cs.meta
diff --git a/com.unity.shadergraph/Editor/Serialization/SerializationExtensions.cs b/com.unity.shadergraph/Editor/Current/Serialization/SerializationExtensions.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Serialization/SerializationExtensions.cs
rename to com.unity.shadergraph/Editor/Current/Serialization/SerializationExtensions.cs
diff --git a/com.unity.shadergraph/Editor/Serialization/SerializationExtensions.cs.meta b/com.unity.shadergraph/Editor/Current/Serialization/SerializationExtensions.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Serialization/SerializationExtensions.cs.meta
rename to com.unity.shadergraph/Editor/Current/Serialization/SerializationExtensions.cs.meta
diff --git a/com.unity.shadergraph/Editor/ShaderGUI.meta b/com.unity.shadergraph/Editor/Current/ShaderGUI.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/ShaderGUI.meta
rename to com.unity.shadergraph/Editor/Current/ShaderGUI.meta
diff --git a/com.unity.shadergraph/Editor/ShaderGUI/GenericShaderGraphMaterialGUI.cs b/com.unity.shadergraph/Editor/Current/ShaderGUI/GenericShaderGraphMaterialGUI.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/ShaderGUI/GenericShaderGraphMaterialGUI.cs
rename to com.unity.shadergraph/Editor/Current/ShaderGUI/GenericShaderGraphMaterialGUI.cs
diff --git a/com.unity.shadergraph/Editor/ShaderGUI/GenericShaderGraphMaterialGUI.cs.meta b/com.unity.shadergraph/Editor/Current/ShaderGUI/GenericShaderGraphMaterialGUI.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/ShaderGUI/GenericShaderGraphMaterialGUI.cs.meta
rename to com.unity.shadergraph/Editor/Current/ShaderGUI/GenericShaderGraphMaterialGUI.cs.meta
diff --git a/com.unity.shadergraph/Editor/ShaderGraphAnalytics.cs b/com.unity.shadergraph/Editor/Current/ShaderGraphAnalytics.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/ShaderGraphAnalytics.cs
rename to com.unity.shadergraph/Editor/Current/ShaderGraphAnalytics.cs
diff --git a/com.unity.shadergraph/Editor/ShaderGraphAnalytics.cs.meta b/com.unity.shadergraph/Editor/Current/ShaderGraphAnalytics.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/ShaderGraphAnalytics.cs.meta
rename to com.unity.shadergraph/Editor/Current/ShaderGraphAnalytics.cs.meta
diff --git a/com.unity.shadergraph/Editor/ShaderGraphPreferences.cs b/com.unity.shadergraph/Editor/Current/ShaderGraphPreferences.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/ShaderGraphPreferences.cs
rename to com.unity.shadergraph/Editor/Current/ShaderGraphPreferences.cs
diff --git a/com.unity.shadergraph/Editor/ShaderGraphPreferences.cs.meta b/com.unity.shadergraph/Editor/Current/ShaderGraphPreferences.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/ShaderGraphPreferences.cs.meta
rename to com.unity.shadergraph/Editor/Current/ShaderGraphPreferences.cs.meta
diff --git a/com.unity.shadergraph/Editor/ShaderGraphProjectSettings.cs b/com.unity.shadergraph/Editor/Current/ShaderGraphProjectSettings.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/ShaderGraphProjectSettings.cs
rename to com.unity.shadergraph/Editor/Current/ShaderGraphProjectSettings.cs
diff --git a/com.unity.shadergraph/Editor/ShaderGraphProjectSettings.cs.meta b/com.unity.shadergraph/Editor/Current/ShaderGraphProjectSettings.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/ShaderGraphProjectSettings.cs.meta
rename to com.unity.shadergraph/Editor/Current/ShaderGraphProjectSettings.cs.meta
diff --git a/com.unity.shadergraph/Editor/Unity.ShaderGraph.Editor.asmdef b/com.unity.shadergraph/Editor/Current/Unity.ShaderGraph.Editor.asmdef
similarity index 100%
rename from com.unity.shadergraph/Editor/Unity.ShaderGraph.Editor.asmdef
rename to com.unity.shadergraph/Editor/Current/Unity.ShaderGraph.Editor.asmdef
diff --git a/com.unity.shadergraph/Editor/Unity.ShaderGraph.Editor.asmdef.meta b/com.unity.shadergraph/Editor/Current/Unity.ShaderGraph.Editor.asmdef.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Unity.ShaderGraph.Editor.asmdef.meta
rename to com.unity.shadergraph/Editor/Current/Unity.ShaderGraph.Editor.asmdef.meta
diff --git a/com.unity.shadergraph/Editor/Util.meta b/com.unity.shadergraph/Editor/Current/Util.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Util.meta
rename to com.unity.shadergraph/Editor/Current/Util.meta
diff --git a/com.unity.shadergraph/Editor/Util/AssertHelpers.cs b/com.unity.shadergraph/Editor/Current/Util/AssertHelpers.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Util/AssertHelpers.cs
rename to com.unity.shadergraph/Editor/Current/Util/AssertHelpers.cs
diff --git a/com.unity.shadergraph/Editor/Util/AssertHelpers.cs.meta b/com.unity.shadergraph/Editor/Current/Util/AssertHelpers.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Util/AssertHelpers.cs.meta
rename to com.unity.shadergraph/Editor/Current/Util/AssertHelpers.cs.meta
diff --git a/com.unity.shadergraph/Editor/Util/CompatibilityExtensions.cs b/com.unity.shadergraph/Editor/Current/Util/CompatibilityExtensions.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Util/CompatibilityExtensions.cs
rename to com.unity.shadergraph/Editor/Current/Util/CompatibilityExtensions.cs
diff --git a/com.unity.shadergraph/Editor/Util/CompatibilityExtensions.cs.meta b/com.unity.shadergraph/Editor/Current/Util/CompatibilityExtensions.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Util/CompatibilityExtensions.cs.meta
rename to com.unity.shadergraph/Editor/Current/Util/CompatibilityExtensions.cs.meta
diff --git a/com.unity.shadergraph/Editor/Util/CopyPasteGraph.cs b/com.unity.shadergraph/Editor/Current/Util/CopyPasteGraph.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Util/CopyPasteGraph.cs
rename to com.unity.shadergraph/Editor/Current/Util/CopyPasteGraph.cs
diff --git a/com.unity.shadergraph/Editor/Util/CopyPasteGraph.cs.meta b/com.unity.shadergraph/Editor/Current/Util/CopyPasteGraph.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Util/CopyPasteGraph.cs.meta
rename to com.unity.shadergraph/Editor/Current/Util/CopyPasteGraph.cs.meta
diff --git a/com.unity.shadergraph/Editor/Util/CreateSerializableGraph.cs b/com.unity.shadergraph/Editor/Current/Util/CreateSerializableGraph.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Util/CreateSerializableGraph.cs
rename to com.unity.shadergraph/Editor/Current/Util/CreateSerializableGraph.cs
diff --git a/com.unity.shadergraph/Editor/Util/CreateSerializableGraph.cs.meta b/com.unity.shadergraph/Editor/Current/Util/CreateSerializableGraph.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Util/CreateSerializableGraph.cs.meta
rename to com.unity.shadergraph/Editor/Current/Util/CreateSerializableGraph.cs.meta
diff --git a/com.unity.shadergraph/Editor/Util/Documentation.cs b/com.unity.shadergraph/Editor/Current/Util/Documentation.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Util/Documentation.cs
rename to com.unity.shadergraph/Editor/Current/Util/Documentation.cs
diff --git a/com.unity.shadergraph/Editor/Util/Documentation.cs.meta b/com.unity.shadergraph/Editor/Current/Util/Documentation.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Util/Documentation.cs.meta
rename to com.unity.shadergraph/Editor/Current/Util/Documentation.cs.meta
diff --git a/com.unity.shadergraph/Editor/Util/FileUtilities.cs b/com.unity.shadergraph/Editor/Current/Util/FileUtilities.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Util/FileUtilities.cs
rename to com.unity.shadergraph/Editor/Current/Util/FileUtilities.cs
diff --git a/com.unity.shadergraph/Editor/Util/FileUtilities.cs.meta b/com.unity.shadergraph/Editor/Current/Util/FileUtilities.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Util/FileUtilities.cs.meta
rename to com.unity.shadergraph/Editor/Current/Util/FileUtilities.cs.meta
diff --git a/com.unity.shadergraph/Editor/Util/IndexSet.cs b/com.unity.shadergraph/Editor/Current/Util/IndexSet.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Util/IndexSet.cs
rename to com.unity.shadergraph/Editor/Current/Util/IndexSet.cs
diff --git a/com.unity.shadergraph/Editor/Util/IndexSet.cs.meta b/com.unity.shadergraph/Editor/Current/Util/IndexSet.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Util/IndexSet.cs.meta
rename to com.unity.shadergraph/Editor/Current/Util/IndexSet.cs.meta
diff --git a/com.unity.shadergraph/Editor/Util/ListUtilities.cs b/com.unity.shadergraph/Editor/Current/Util/ListUtilities.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Util/ListUtilities.cs
rename to com.unity.shadergraph/Editor/Current/Util/ListUtilities.cs
diff --git a/com.unity.shadergraph/Editor/Util/ListUtilities.cs.meta b/com.unity.shadergraph/Editor/Current/Util/ListUtilities.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Util/ListUtilities.cs.meta
rename to com.unity.shadergraph/Editor/Current/Util/ListUtilities.cs.meta
diff --git a/com.unity.shadergraph/Editor/Util/MessageManager.cs b/com.unity.shadergraph/Editor/Current/Util/MessageManager.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Util/MessageManager.cs
rename to com.unity.shadergraph/Editor/Current/Util/MessageManager.cs
diff --git a/com.unity.shadergraph/Editor/Util/MessageManager.cs.meta b/com.unity.shadergraph/Editor/Current/Util/MessageManager.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Util/MessageManager.cs.meta
rename to com.unity.shadergraph/Editor/Current/Util/MessageManager.cs.meta
diff --git a/com.unity.shadergraph/Editor/Util/TypeMapper.cs b/com.unity.shadergraph/Editor/Current/Util/TypeMapper.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Util/TypeMapper.cs
rename to com.unity.shadergraph/Editor/Current/Util/TypeMapper.cs
diff --git a/com.unity.shadergraph/Editor/Util/TypeMapper.cs.meta b/com.unity.shadergraph/Editor/Current/Util/TypeMapper.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Util/TypeMapper.cs.meta
rename to com.unity.shadergraph/Editor/Current/Util/TypeMapper.cs.meta
diff --git a/com.unity.shadergraph/Editor/Util/TypeMapping.cs b/com.unity.shadergraph/Editor/Current/Util/TypeMapping.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Util/TypeMapping.cs
rename to com.unity.shadergraph/Editor/Current/Util/TypeMapping.cs
diff --git a/com.unity.shadergraph/Editor/Util/TypeMapping.cs.meta b/com.unity.shadergraph/Editor/Current/Util/TypeMapping.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Util/TypeMapping.cs.meta
rename to com.unity.shadergraph/Editor/Current/Util/TypeMapping.cs.meta
diff --git a/com.unity.shadergraph/Editor/Util/UIUtilities.cs b/com.unity.shadergraph/Editor/Current/Util/UIUtilities.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Util/UIUtilities.cs
rename to com.unity.shadergraph/Editor/Current/Util/UIUtilities.cs
diff --git a/com.unity.shadergraph/Editor/Util/UIUtilities.cs.meta b/com.unity.shadergraph/Editor/Current/Util/UIUtilities.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Util/UIUtilities.cs.meta
rename to com.unity.shadergraph/Editor/Current/Util/UIUtilities.cs.meta
diff --git a/com.unity.shadergraph/Editor/Util/ValueUtilities.cs b/com.unity.shadergraph/Editor/Current/Util/ValueUtilities.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Util/ValueUtilities.cs
rename to com.unity.shadergraph/Editor/Current/Util/ValueUtilities.cs
diff --git a/com.unity.shadergraph/Editor/Util/ValueUtilities.cs.meta b/com.unity.shadergraph/Editor/Current/Util/ValueUtilities.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Util/ValueUtilities.cs.meta
rename to com.unity.shadergraph/Editor/Current/Util/ValueUtilities.cs.meta
diff --git a/com.unity.shadergraph/Editor/Utilities.meta b/com.unity.shadergraph/Editor/Current/Utilities.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Utilities.meta
rename to com.unity.shadergraph/Editor/Current/Utilities.meta
diff --git a/com.unity.shadergraph/Editor/Utilities/AssemblyInfo.cs b/com.unity.shadergraph/Editor/Current/Utilities/AssemblyInfo.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Utilities/AssemblyInfo.cs
rename to com.unity.shadergraph/Editor/Current/Utilities/AssemblyInfo.cs
diff --git a/com.unity.shadergraph/Editor/Utilities/AssemblyInfo.cs.meta b/com.unity.shadergraph/Editor/Current/Utilities/AssemblyInfo.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Utilities/AssemblyInfo.cs.meta
rename to com.unity.shadergraph/Editor/Current/Utilities/AssemblyInfo.cs.meta
diff --git a/com.unity.shadergraph/Editor/Utilities/EnumInfo.cs b/com.unity.shadergraph/Editor/Current/Utilities/EnumInfo.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Utilities/EnumInfo.cs
rename to com.unity.shadergraph/Editor/Current/Utilities/EnumInfo.cs
diff --git a/com.unity.shadergraph/Editor/Utilities/EnumInfo.cs.meta b/com.unity.shadergraph/Editor/Current/Utilities/EnumInfo.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Utilities/EnumInfo.cs.meta
rename to com.unity.shadergraph/Editor/Current/Utilities/EnumInfo.cs.meta
diff --git a/com.unity.shadergraph/Editor/Utilities/GenerationAPIAttribute.cs b/com.unity.shadergraph/Editor/Current/Utilities/GenerationAPIAttribute.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Utilities/GenerationAPIAttribute.cs
rename to com.unity.shadergraph/Editor/Current/Utilities/GenerationAPIAttribute.cs
diff --git a/com.unity.shadergraph/Editor/Utilities/GenerationAPIAttribute.cs.meta b/com.unity.shadergraph/Editor/Current/Utilities/GenerationAPIAttribute.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Utilities/GenerationAPIAttribute.cs.meta
rename to com.unity.shadergraph/Editor/Current/Utilities/GenerationAPIAttribute.cs.meta
diff --git a/com.unity.shadergraph/Editor/Utilities/StringBuilderExtensions.cs b/com.unity.shadergraph/Editor/Current/Utilities/StringBuilderExtensions.cs
similarity index 100%
rename from com.unity.shadergraph/Editor/Utilities/StringBuilderExtensions.cs
rename to com.unity.shadergraph/Editor/Current/Utilities/StringBuilderExtensions.cs
diff --git a/com.unity.shadergraph/Editor/Utilities/StringBuilderExtensions.cs.meta b/com.unity.shadergraph/Editor/Current/Utilities/StringBuilderExtensions.cs.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Utilities/StringBuilderExtensions.cs.meta
rename to com.unity.shadergraph/Editor/Current/Utilities/StringBuilderExtensions.cs.meta
diff --git a/com.unity.shadergraph/Editor/Utilities/Unity.ShaderGraph.Utilities.asmdef b/com.unity.shadergraph/Editor/Current/Utilities/Unity.ShaderGraph.Utilities.asmdef
similarity index 100%
rename from com.unity.shadergraph/Editor/Utilities/Unity.ShaderGraph.Utilities.asmdef
rename to com.unity.shadergraph/Editor/Current/Utilities/Unity.ShaderGraph.Utilities.asmdef
diff --git a/com.unity.shadergraph/Editor/Utilities/Unity.ShaderGraph.Utilities.asmdef.meta b/com.unity.shadergraph/Editor/Current/Utilities/Unity.ShaderGraph.Utilities.asmdef.meta
similarity index 100%
rename from com.unity.shadergraph/Editor/Utilities/Unity.ShaderGraph.Utilities.asmdef.meta
rename to com.unity.shadergraph/Editor/Current/Utilities/Unity.ShaderGraph.Utilities.asmdef.meta
diff --git a/com.unity.shadergraph/ValidationConfig.json b/com.unity.shadergraph/ValidationConfig.json
index 12455a4ebd3..8746d6ec625 100644
--- a/com.unity.shadergraph/ValidationConfig.json
+++ b/com.unity.shadergraph/ValidationConfig.json
@@ -3,7 +3,7 @@
 	{
 		"IgnoreFilenames":
 		[
-			"Editor/Generation/Enumerations/Platform.cs"
+			"Editor/Current/Generation/Enumerations/Platform.cs"
 		]
 	}
 }
\ No newline at end of file