diff --git a/Plugins.UserInterface/UniversalEditor.Plugins.RavenSoftware.UserInterface/UniversalEditor.Plugins.RavenSoftware.UserInterface.csproj b/Plugins.UserInterface/UniversalEditor.Plugins.RavenSoftware.UserInterface/UniversalEditor.Plugins.RavenSoftware.UserInterface.csproj
index 8019b100..e2975593 100644
--- a/Plugins.UserInterface/UniversalEditor.Plugins.RavenSoftware.UserInterface/UniversalEditor.Plugins.RavenSoftware.UserInterface.csproj
+++ b/Plugins.UserInterface/UniversalEditor.Plugins.RavenSoftware.UserInterface/UniversalEditor.Plugins.RavenSoftware.UserInterface.csproj
@@ -54,10 +54,6 @@
       <Project>{29E1C1BB-3EA5-4062-B62F-85EEC703FE07}</Project>
       <Name>MBS.Framework.UserInterface</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\Plugins\UniversalEditor.Plugins.Icarus\UniversalEditor.Plugins.Icarus.csproj">
-      <Project>{B2DFA94A-A468-48A1-AB31-04EE432E7B2B}</Project>
-      <Name>UniversalEditor.Plugins.Icarus</Name>
-    </ProjectReference>
     <ProjectReference Include="..\..\Libraries\UniversalEditor.Core\UniversalEditor.Core.csproj">
       <Project>{2D4737E6-6D95-408A-90DB-8DFF38147E85}</Project>
       <Name>UniversalEditor.Core</Name>
@@ -70,6 +66,10 @@
       <Project>{8622EBC4-8E20-476E-B284-33D472081F5C}</Project>
       <Name>UniversalEditor.UserInterface</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\Plugins\UniversalEditor.Plugins.RavenSoftware\UniversalEditor.Plugins.RavenSoftware.csproj">
+      <Project>{B2DFA94A-A468-48A1-AB31-04EE432E7B2B}</Project>
+      <Name>UniversalEditor.Plugins.RavenSoftware</Name>
+    </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
 </Project>
\ No newline at end of file
diff --git a/Plugins/UniversalEditor.Plugins.Icarus/Associations/IcarusBinaryDataFormatAssociation.uexml b/Plugins/UniversalEditor.Plugins.RavenSoftware/Associations/IcarusBinaryDataFormatAssociation.uexml
similarity index 100%
rename from Plugins/UniversalEditor.Plugins.Icarus/Associations/IcarusBinaryDataFormatAssociation.uexml
rename to Plugins/UniversalEditor.Plugins.RavenSoftware/Associations/IcarusBinaryDataFormatAssociation.uexml
diff --git a/Plugins/UniversalEditor.Plugins.Icarus/Associations/IcarusTextDataFormatAssociation.uexml b/Plugins/UniversalEditor.Plugins.RavenSoftware/Associations/IcarusTextDataFormatAssociation.uexml
similarity index 100%
rename from Plugins/UniversalEditor.Plugins.Icarus/Associations/IcarusTextDataFormatAssociation.uexml
rename to Plugins/UniversalEditor.Plugins.RavenSoftware/Associations/IcarusTextDataFormatAssociation.uexml
diff --git a/Plugins/UniversalEditor.Plugins.Icarus/DataFormats/Icarus/IcarusBinaryDataFormat.cs b/Plugins/UniversalEditor.Plugins.RavenSoftware/DataFormats/Icarus/IcarusBinaryDataFormat.cs
similarity index 100%
rename from Plugins/UniversalEditor.Plugins.Icarus/DataFormats/Icarus/IcarusBinaryDataFormat.cs
rename to Plugins/UniversalEditor.Plugins.RavenSoftware/DataFormats/Icarus/IcarusBinaryDataFormat.cs
diff --git a/Plugins/UniversalEditor.Plugins.Icarus/DataFormats/Icarus/IcarusTextDataFormat.cs b/Plugins/UniversalEditor.Plugins.RavenSoftware/DataFormats/Icarus/IcarusTextDataFormat.cs
similarity index 100%
rename from Plugins/UniversalEditor.Plugins.Icarus/DataFormats/Icarus/IcarusTextDataFormat.cs
rename to Plugins/UniversalEditor.Plugins.RavenSoftware/DataFormats/Icarus/IcarusTextDataFormat.cs
diff --git a/Plugins/UniversalEditor.Plugins.Icarus/ObjectModels/Icarus/Commands/IcarusCommandAffect.cs b/Plugins/UniversalEditor.Plugins.RavenSoftware/ObjectModels/Icarus/Commands/IcarusCommandAffect.cs
similarity index 100%
rename from Plugins/UniversalEditor.Plugins.Icarus/ObjectModels/Icarus/Commands/IcarusCommandAffect.cs
rename to Plugins/UniversalEditor.Plugins.RavenSoftware/ObjectModels/Icarus/Commands/IcarusCommandAffect.cs
diff --git a/Plugins/UniversalEditor.Plugins.Icarus/ObjectModels/Icarus/Commands/IcarusCommandCamera.cs b/Plugins/UniversalEditor.Plugins.RavenSoftware/ObjectModels/Icarus/Commands/IcarusCommandCamera.cs
similarity index 100%
rename from Plugins/UniversalEditor.Plugins.Icarus/ObjectModels/Icarus/Commands/IcarusCommandCamera.cs
rename to Plugins/UniversalEditor.Plugins.RavenSoftware/ObjectModels/Icarus/Commands/IcarusCommandCamera.cs
diff --git a/Plugins/UniversalEditor.Plugins.Icarus/ObjectModels/Icarus/Commands/IcarusCommandContainerCommand.cs b/Plugins/UniversalEditor.Plugins.RavenSoftware/ObjectModels/Icarus/Commands/IcarusCommandContainerCommand.cs
similarity index 100%
rename from Plugins/UniversalEditor.Plugins.Icarus/ObjectModels/Icarus/Commands/IcarusCommandContainerCommand.cs
rename to Plugins/UniversalEditor.Plugins.RavenSoftware/ObjectModels/Icarus/Commands/IcarusCommandContainerCommand.cs
diff --git a/Plugins/UniversalEditor.Plugins.Icarus/ObjectModels/Icarus/Commands/IcarusCommandControlFlowDo.cs b/Plugins/UniversalEditor.Plugins.RavenSoftware/ObjectModels/Icarus/Commands/IcarusCommandControlFlowDo.cs
similarity index 100%
rename from Plugins/UniversalEditor.Plugins.Icarus/ObjectModels/Icarus/Commands/IcarusCommandControlFlowDo.cs
rename to Plugins/UniversalEditor.Plugins.RavenSoftware/ObjectModels/Icarus/Commands/IcarusCommandControlFlowDo.cs
diff --git a/Plugins/UniversalEditor.Plugins.Icarus/ObjectModels/Icarus/Commands/IcarusCommandDeclare.cs b/Plugins/UniversalEditor.Plugins.RavenSoftware/ObjectModels/Icarus/Commands/IcarusCommandDeclare.cs
similarity index 100%
rename from Plugins/UniversalEditor.Plugins.Icarus/ObjectModels/Icarus/Commands/IcarusCommandDeclare.cs
rename to Plugins/UniversalEditor.Plugins.RavenSoftware/ObjectModels/Icarus/Commands/IcarusCommandDeclare.cs
diff --git a/Plugins/UniversalEditor.Plugins.Icarus/ObjectModels/Icarus/Commands/IcarusCommandDo.cs b/Plugins/UniversalEditor.Plugins.RavenSoftware/ObjectModels/Icarus/Commands/IcarusCommandDo.cs
similarity index 100%
rename from Plugins/UniversalEditor.Plugins.Icarus/ObjectModels/Icarus/Commands/IcarusCommandDo.cs
rename to Plugins/UniversalEditor.Plugins.RavenSoftware/ObjectModels/Icarus/Commands/IcarusCommandDo.cs
diff --git a/Plugins/UniversalEditor.Plugins.Icarus/ObjectModels/Icarus/Commands/IcarusCommandEnd.cs b/Plugins/UniversalEditor.Plugins.RavenSoftware/ObjectModels/Icarus/Commands/IcarusCommandEnd.cs
similarity index 100%
rename from Plugins/UniversalEditor.Plugins.Icarus/ObjectModels/Icarus/Commands/IcarusCommandEnd.cs
rename to Plugins/UniversalEditor.Plugins.RavenSoftware/ObjectModels/Icarus/Commands/IcarusCommandEnd.cs
diff --git a/Plugins/UniversalEditor.Plugins.Icarus/ObjectModels/Icarus/Commands/IcarusCommandFlush.cs b/Plugins/UniversalEditor.Plugins.RavenSoftware/ObjectModels/Icarus/Commands/IcarusCommandFlush.cs
similarity index 100%
rename from Plugins/UniversalEditor.Plugins.Icarus/ObjectModels/Icarus/Commands/IcarusCommandFlush.cs
rename to Plugins/UniversalEditor.Plugins.RavenSoftware/ObjectModels/Icarus/Commands/IcarusCommandFlush.cs
diff --git a/Plugins/UniversalEditor.Plugins.Icarus/ObjectModels/Icarus/Commands/IcarusCommandIf.cs b/Plugins/UniversalEditor.Plugins.RavenSoftware/ObjectModels/Icarus/Commands/IcarusCommandIf.cs
similarity index 100%
rename from Plugins/UniversalEditor.Plugins.Icarus/ObjectModels/Icarus/Commands/IcarusCommandIf.cs
rename to Plugins/UniversalEditor.Plugins.RavenSoftware/ObjectModels/Icarus/Commands/IcarusCommandIf.cs
diff --git a/Plugins/UniversalEditor.Plugins.Icarus/ObjectModels/Icarus/Commands/IcarusCommandKill.cs b/Plugins/UniversalEditor.Plugins.RavenSoftware/ObjectModels/Icarus/Commands/IcarusCommandKill.cs
similarity index 100%
rename from Plugins/UniversalEditor.Plugins.Icarus/ObjectModels/Icarus/Commands/IcarusCommandKill.cs
rename to Plugins/UniversalEditor.Plugins.RavenSoftware/ObjectModels/Icarus/Commands/IcarusCommandKill.cs
diff --git a/Plugins/UniversalEditor.Plugins.Icarus/ObjectModels/Icarus/Commands/IcarusCommandLoop.cs b/Plugins/UniversalEditor.Plugins.RavenSoftware/ObjectModels/Icarus/Commands/IcarusCommandLoop.cs
similarity index 100%
rename from Plugins/UniversalEditor.Plugins.Icarus/ObjectModels/Icarus/Commands/IcarusCommandLoop.cs
rename to Plugins/UniversalEditor.Plugins.RavenSoftware/ObjectModels/Icarus/Commands/IcarusCommandLoop.cs
diff --git a/Plugins/UniversalEditor.Plugins.Icarus/ObjectModels/Icarus/Commands/IcarusCommandMacro.cs b/Plugins/UniversalEditor.Plugins.RavenSoftware/ObjectModels/Icarus/Commands/IcarusCommandMacro.cs
similarity index 100%
rename from Plugins/UniversalEditor.Plugins.Icarus/ObjectModels/Icarus/Commands/IcarusCommandMacro.cs
rename to Plugins/UniversalEditor.Plugins.RavenSoftware/ObjectModels/Icarus/Commands/IcarusCommandMacro.cs
diff --git a/Plugins/UniversalEditor.Plugins.Icarus/ObjectModels/Icarus/Commands/IcarusCommandPlay.cs b/Plugins/UniversalEditor.Plugins.RavenSoftware/ObjectModels/Icarus/Commands/IcarusCommandPlay.cs
similarity index 100%
rename from Plugins/UniversalEditor.Plugins.Icarus/ObjectModels/Icarus/Commands/IcarusCommandPlay.cs
rename to Plugins/UniversalEditor.Plugins.RavenSoftware/ObjectModels/Icarus/Commands/IcarusCommandPlay.cs
diff --git a/Plugins/UniversalEditor.Plugins.Icarus/ObjectModels/Icarus/Commands/IcarusCommandPrint.cs b/Plugins/UniversalEditor.Plugins.RavenSoftware/ObjectModels/Icarus/Commands/IcarusCommandPrint.cs
similarity index 100%
rename from Plugins/UniversalEditor.Plugins.Icarus/ObjectModels/Icarus/Commands/IcarusCommandPrint.cs
rename to Plugins/UniversalEditor.Plugins.RavenSoftware/ObjectModels/Icarus/Commands/IcarusCommandPrint.cs
diff --git a/Plugins/UniversalEditor.Plugins.Icarus/ObjectModels/Icarus/Commands/IcarusCommandRem.cs b/Plugins/UniversalEditor.Plugins.RavenSoftware/ObjectModels/Icarus/Commands/IcarusCommandRem.cs
similarity index 100%
rename from Plugins/UniversalEditor.Plugins.Icarus/ObjectModels/Icarus/Commands/IcarusCommandRem.cs
rename to Plugins/UniversalEditor.Plugins.RavenSoftware/ObjectModels/Icarus/Commands/IcarusCommandRem.cs
diff --git a/Plugins/UniversalEditor.Plugins.Icarus/ObjectModels/Icarus/Commands/IcarusCommandRotate.cs b/Plugins/UniversalEditor.Plugins.RavenSoftware/ObjectModels/Icarus/Commands/IcarusCommandRotate.cs
similarity index 100%
rename from Plugins/UniversalEditor.Plugins.Icarus/ObjectModels/Icarus/Commands/IcarusCommandRotate.cs
rename to Plugins/UniversalEditor.Plugins.RavenSoftware/ObjectModels/Icarus/Commands/IcarusCommandRotate.cs
diff --git a/Plugins/UniversalEditor.Plugins.Icarus/ObjectModels/Icarus/Commands/IcarusCommandRun.cs b/Plugins/UniversalEditor.Plugins.RavenSoftware/ObjectModels/Icarus/Commands/IcarusCommandRun.cs
similarity index 100%
rename from Plugins/UniversalEditor.Plugins.Icarus/ObjectModels/Icarus/Commands/IcarusCommandRun.cs
rename to Plugins/UniversalEditor.Plugins.RavenSoftware/ObjectModels/Icarus/Commands/IcarusCommandRun.cs
diff --git a/Plugins/UniversalEditor.Plugins.Icarus/ObjectModels/Icarus/Commands/IcarusCommandSet.cs b/Plugins/UniversalEditor.Plugins.RavenSoftware/ObjectModels/Icarus/Commands/IcarusCommandSet.cs
similarity index 100%
rename from Plugins/UniversalEditor.Plugins.Icarus/ObjectModels/Icarus/Commands/IcarusCommandSet.cs
rename to Plugins/UniversalEditor.Plugins.RavenSoftware/ObjectModels/Icarus/Commands/IcarusCommandSet.cs
diff --git a/Plugins/UniversalEditor.Plugins.Icarus/ObjectModels/Icarus/Commands/IcarusCommandSignal.cs b/Plugins/UniversalEditor.Plugins.RavenSoftware/ObjectModels/Icarus/Commands/IcarusCommandSignal.cs
similarity index 100%
rename from Plugins/UniversalEditor.Plugins.Icarus/ObjectModels/Icarus/Commands/IcarusCommandSignal.cs
rename to Plugins/UniversalEditor.Plugins.RavenSoftware/ObjectModels/Icarus/Commands/IcarusCommandSignal.cs
diff --git a/Plugins/UniversalEditor.Plugins.Icarus/ObjectModels/Icarus/Commands/IcarusCommandSound.cs b/Plugins/UniversalEditor.Plugins.RavenSoftware/ObjectModels/Icarus/Commands/IcarusCommandSound.cs
similarity index 100%
rename from Plugins/UniversalEditor.Plugins.Icarus/ObjectModels/Icarus/Commands/IcarusCommandSound.cs
rename to Plugins/UniversalEditor.Plugins.RavenSoftware/ObjectModels/Icarus/Commands/IcarusCommandSound.cs
diff --git a/Plugins/UniversalEditor.Plugins.Icarus/ObjectModels/Icarus/Commands/IcarusCommandTask.cs b/Plugins/UniversalEditor.Plugins.RavenSoftware/ObjectModels/Icarus/Commands/IcarusCommandTask.cs
similarity index 100%
rename from Plugins/UniversalEditor.Plugins.Icarus/ObjectModels/Icarus/Commands/IcarusCommandTask.cs
rename to Plugins/UniversalEditor.Plugins.RavenSoftware/ObjectModels/Icarus/Commands/IcarusCommandTask.cs
diff --git a/Plugins/UniversalEditor.Plugins.Icarus/ObjectModels/Icarus/Commands/IcarusCommandUse.cs b/Plugins/UniversalEditor.Plugins.RavenSoftware/ObjectModels/Icarus/Commands/IcarusCommandUse.cs
similarity index 100%
rename from Plugins/UniversalEditor.Plugins.Icarus/ObjectModels/Icarus/Commands/IcarusCommandUse.cs
rename to Plugins/UniversalEditor.Plugins.RavenSoftware/ObjectModels/Icarus/Commands/IcarusCommandUse.cs
diff --git a/Plugins/UniversalEditor.Plugins.Icarus/ObjectModels/Icarus/Commands/IcarusCommandWait.cs b/Plugins/UniversalEditor.Plugins.RavenSoftware/ObjectModels/Icarus/Commands/IcarusCommandWait.cs
similarity index 100%
rename from Plugins/UniversalEditor.Plugins.Icarus/ObjectModels/Icarus/Commands/IcarusCommandWait.cs
rename to Plugins/UniversalEditor.Plugins.RavenSoftware/ObjectModels/Icarus/Commands/IcarusCommandWait.cs
diff --git a/Plugins/UniversalEditor.Plugins.Icarus/ObjectModels/Icarus/Commands/IcarusCommandWaitSignal.cs b/Plugins/UniversalEditor.Plugins.RavenSoftware/ObjectModels/Icarus/Commands/IcarusCommandWaitSignal.cs
similarity index 100%
rename from Plugins/UniversalEditor.Plugins.Icarus/ObjectModels/Icarus/Commands/IcarusCommandWaitSignal.cs
rename to Plugins/UniversalEditor.Plugins.RavenSoftware/ObjectModels/Icarus/Commands/IcarusCommandWaitSignal.cs
diff --git a/Plugins/UniversalEditor.Plugins.Icarus/ObjectModels/Icarus/Expressions/IcarusConstantExpression.cs b/Plugins/UniversalEditor.Plugins.RavenSoftware/ObjectModels/Icarus/Expressions/IcarusConstantExpression.cs
similarity index 100%
rename from Plugins/UniversalEditor.Plugins.Icarus/ObjectModels/Icarus/Expressions/IcarusConstantExpression.cs
rename to Plugins/UniversalEditor.Plugins.RavenSoftware/ObjectModels/Icarus/Expressions/IcarusConstantExpression.cs
diff --git a/Plugins/UniversalEditor.Plugins.Icarus/ObjectModels/Icarus/Expressions/IcarusFunctionExpression.cs b/Plugins/UniversalEditor.Plugins.RavenSoftware/ObjectModels/Icarus/Expressions/IcarusFunctionExpression.cs
similarity index 100%
rename from Plugins/UniversalEditor.Plugins.Icarus/ObjectModels/Icarus/Expressions/IcarusFunctionExpression.cs
rename to Plugins/UniversalEditor.Plugins.RavenSoftware/ObjectModels/Icarus/Expressions/IcarusFunctionExpression.cs
diff --git a/Plugins/UniversalEditor.Plugins.Icarus/ObjectModels/Icarus/Expressions/IcarusGetExpression.cs b/Plugins/UniversalEditor.Plugins.RavenSoftware/ObjectModels/Icarus/Expressions/IcarusGetExpression.cs
similarity index 100%
rename from Plugins/UniversalEditor.Plugins.Icarus/ObjectModels/Icarus/Expressions/IcarusGetExpression.cs
rename to Plugins/UniversalEditor.Plugins.RavenSoftware/ObjectModels/Icarus/Expressions/IcarusGetExpression.cs
diff --git a/Plugins/UniversalEditor.Plugins.Icarus/ObjectModels/Icarus/Expressions/IcarusRandomExpression.cs b/Plugins/UniversalEditor.Plugins.RavenSoftware/ObjectModels/Icarus/Expressions/IcarusRandomExpression.cs
similarity index 100%
rename from Plugins/UniversalEditor.Plugins.Icarus/ObjectModels/Icarus/Expressions/IcarusRandomExpression.cs
rename to Plugins/UniversalEditor.Plugins.RavenSoftware/ObjectModels/Icarus/Expressions/IcarusRandomExpression.cs
diff --git a/Plugins/UniversalEditor.Plugins.Icarus/ObjectModels/Icarus/Expressions/IcarusTagExpression.cs b/Plugins/UniversalEditor.Plugins.RavenSoftware/ObjectModels/Icarus/Expressions/IcarusTagExpression.cs
similarity index 100%
rename from Plugins/UniversalEditor.Plugins.Icarus/ObjectModels/Icarus/Expressions/IcarusTagExpression.cs
rename to Plugins/UniversalEditor.Plugins.RavenSoftware/ObjectModels/Icarus/Expressions/IcarusTagExpression.cs
diff --git a/Plugins/UniversalEditor.Plugins.Icarus/ObjectModels/Icarus/IIcarusContainerCommand.cs b/Plugins/UniversalEditor.Plugins.RavenSoftware/ObjectModels/Icarus/IIcarusContainerCommand.cs
similarity index 100%
rename from Plugins/UniversalEditor.Plugins.Icarus/ObjectModels/Icarus/IIcarusContainerCommand.cs
rename to Plugins/UniversalEditor.Plugins.RavenSoftware/ObjectModels/Icarus/IIcarusContainerCommand.cs
diff --git a/Plugins/UniversalEditor.Plugins.Icarus/ObjectModels/Icarus/IcarusAffectType.cs b/Plugins/UniversalEditor.Plugins.RavenSoftware/ObjectModels/Icarus/IcarusAffectType.cs
similarity index 100%
rename from Plugins/UniversalEditor.Plugins.Icarus/ObjectModels/Icarus/IcarusAffectType.cs
rename to Plugins/UniversalEditor.Plugins.RavenSoftware/ObjectModels/Icarus/IcarusAffectType.cs
diff --git a/Plugins/UniversalEditor.Plugins.Icarus/ObjectModels/Icarus/IcarusCameraOperation.cs b/Plugins/UniversalEditor.Plugins.RavenSoftware/ObjectModels/Icarus/IcarusCameraOperation.cs
similarity index 100%
rename from Plugins/UniversalEditor.Plugins.Icarus/ObjectModels/Icarus/IcarusCameraOperation.cs
rename to Plugins/UniversalEditor.Plugins.RavenSoftware/ObjectModels/Icarus/IcarusCameraOperation.cs
diff --git a/Plugins/UniversalEditor.Plugins.Icarus/ObjectModels/Icarus/IcarusCommand.cs b/Plugins/UniversalEditor.Plugins.RavenSoftware/ObjectModels/Icarus/IcarusCommand.cs
similarity index 100%
rename from Plugins/UniversalEditor.Plugins.Icarus/ObjectModels/Icarus/IcarusCommand.cs
rename to Plugins/UniversalEditor.Plugins.RavenSoftware/ObjectModels/Icarus/IcarusCommand.cs
diff --git a/Plugins/UniversalEditor.Plugins.Icarus/ObjectModels/Icarus/IcarusCommandType.cs b/Plugins/UniversalEditor.Plugins.RavenSoftware/ObjectModels/Icarus/IcarusCommandType.cs
similarity index 100%
rename from Plugins/UniversalEditor.Plugins.Icarus/ObjectModels/Icarus/IcarusCommandType.cs
rename to Plugins/UniversalEditor.Plugins.RavenSoftware/ObjectModels/Icarus/IcarusCommandType.cs
diff --git a/Plugins/UniversalEditor.Plugins.Icarus/ObjectModels/Icarus/IcarusCustomCommand.cs b/Plugins/UniversalEditor.Plugins.RavenSoftware/ObjectModels/Icarus/IcarusCustomCommand.cs
similarity index 100%
rename from Plugins/UniversalEditor.Plugins.Icarus/ObjectModels/Icarus/IcarusCustomCommand.cs
rename to Plugins/UniversalEditor.Plugins.RavenSoftware/ObjectModels/Icarus/IcarusCustomCommand.cs
diff --git a/Plugins/UniversalEditor.Plugins.Icarus/ObjectModels/Icarus/IcarusCustomContainerCommand.cs b/Plugins/UniversalEditor.Plugins.RavenSoftware/ObjectModels/Icarus/IcarusCustomContainerCommand.cs
similarity index 100%
rename from Plugins/UniversalEditor.Plugins.Icarus/ObjectModels/Icarus/IcarusCustomContainerCommand.cs
rename to Plugins/UniversalEditor.Plugins.RavenSoftware/ObjectModels/Icarus/IcarusCustomContainerCommand.cs
diff --git a/Plugins/UniversalEditor.Plugins.Icarus/ObjectModels/Icarus/IcarusExpression.cs b/Plugins/UniversalEditor.Plugins.RavenSoftware/ObjectModels/Icarus/IcarusExpression.cs
similarity index 100%
rename from Plugins/UniversalEditor.Plugins.Icarus/ObjectModels/Icarus/IcarusExpression.cs
rename to Plugins/UniversalEditor.Plugins.RavenSoftware/ObjectModels/Icarus/IcarusExpression.cs
diff --git a/Plugins/UniversalEditor.Plugins.Icarus/ObjectModels/Icarus/IcarusExpressionType.cs b/Plugins/UniversalEditor.Plugins.RavenSoftware/ObjectModels/Icarus/IcarusExpressionType.cs
similarity index 100%
rename from Plugins/UniversalEditor.Plugins.Icarus/ObjectModels/Icarus/IcarusExpressionType.cs
rename to Plugins/UniversalEditor.Plugins.RavenSoftware/ObjectModels/Icarus/IcarusExpressionType.cs
diff --git a/Plugins/UniversalEditor.Plugins.Icarus/ObjectModels/Icarus/IcarusParameter.cs b/Plugins/UniversalEditor.Plugins.RavenSoftware/ObjectModels/Icarus/IcarusParameter.cs
similarity index 100%
rename from Plugins/UniversalEditor.Plugins.Icarus/ObjectModels/Icarus/IcarusParameter.cs
rename to Plugins/UniversalEditor.Plugins.RavenSoftware/ObjectModels/Icarus/IcarusParameter.cs
diff --git a/Plugins/UniversalEditor.Plugins.Icarus/ObjectModels/Icarus/IcarusPredefinedCommand.cs b/Plugins/UniversalEditor.Plugins.RavenSoftware/ObjectModels/Icarus/IcarusPredefinedCommand.cs
similarity index 100%
rename from Plugins/UniversalEditor.Plugins.Icarus/ObjectModels/Icarus/IcarusPredefinedCommand.cs
rename to Plugins/UniversalEditor.Plugins.RavenSoftware/ObjectModels/Icarus/IcarusPredefinedCommand.cs
diff --git a/Plugins/UniversalEditor.Plugins.Icarus/ObjectModels/Icarus/IcarusPredefinedContainerCommand.cs b/Plugins/UniversalEditor.Plugins.RavenSoftware/ObjectModels/Icarus/IcarusPredefinedContainerCommand.cs
similarity index 100%
rename from Plugins/UniversalEditor.Plugins.Icarus/ObjectModels/Icarus/IcarusPredefinedContainerCommand.cs
rename to Plugins/UniversalEditor.Plugins.RavenSoftware/ObjectModels/Icarus/IcarusPredefinedContainerCommand.cs
diff --git a/Plugins/UniversalEditor.Plugins.Icarus/ObjectModels/Icarus/IcarusScriptObjectModel.cs b/Plugins/UniversalEditor.Plugins.RavenSoftware/ObjectModels/Icarus/IcarusScriptObjectModel.cs
similarity index 100%
rename from Plugins/UniversalEditor.Plugins.Icarus/ObjectModels/Icarus/IcarusScriptObjectModel.cs
rename to Plugins/UniversalEditor.Plugins.RavenSoftware/ObjectModels/Icarus/IcarusScriptObjectModel.cs
diff --git a/Plugins/UniversalEditor.Plugins.Icarus/ObjectModels/Icarus/IcarusTagType.cs b/Plugins/UniversalEditor.Plugins.RavenSoftware/ObjectModels/Icarus/IcarusTagType.cs
similarity index 100%
rename from Plugins/UniversalEditor.Plugins.Icarus/ObjectModels/Icarus/IcarusTagType.cs
rename to Plugins/UniversalEditor.Plugins.RavenSoftware/ObjectModels/Icarus/IcarusTagType.cs
diff --git a/Plugins/UniversalEditor.Plugins.Icarus/ObjectModels/Icarus/IcarusVariableDataType.cs b/Plugins/UniversalEditor.Plugins.RavenSoftware/ObjectModels/Icarus/IcarusVariableDataType.cs
similarity index 100%
rename from Plugins/UniversalEditor.Plugins.Icarus/ObjectModels/Icarus/IcarusVariableDataType.cs
rename to Plugins/UniversalEditor.Plugins.RavenSoftware/ObjectModels/Icarus/IcarusVariableDataType.cs
diff --git a/Plugins/UniversalEditor.Plugins.Icarus/ObjectModels/Icarus/Parameters/IcarusChoiceParameter.cs b/Plugins/UniversalEditor.Plugins.RavenSoftware/ObjectModels/Icarus/Parameters/IcarusChoiceParameter.cs
similarity index 100%
rename from Plugins/UniversalEditor.Plugins.Icarus/ObjectModels/Icarus/Parameters/IcarusChoiceParameter.cs
rename to Plugins/UniversalEditor.Plugins.RavenSoftware/ObjectModels/Icarus/Parameters/IcarusChoiceParameter.cs
diff --git a/Plugins/UniversalEditor.Plugins.Icarus/ObjectModels/Icarus/Parameters/IcarusFloatParameter.cs b/Plugins/UniversalEditor.Plugins.RavenSoftware/ObjectModels/Icarus/Parameters/IcarusFloatParameter.cs
similarity index 100%
rename from Plugins/UniversalEditor.Plugins.Icarus/ObjectModels/Icarus/Parameters/IcarusFloatParameter.cs
rename to Plugins/UniversalEditor.Plugins.RavenSoftware/ObjectModels/Icarus/Parameters/IcarusFloatParameter.cs
diff --git a/Plugins/UniversalEditor.Plugins.Icarus/ObjectModels/Icarus/Parameters/IcarusGenericParameter.cs b/Plugins/UniversalEditor.Plugins.RavenSoftware/ObjectModels/Icarus/Parameters/IcarusGenericParameter.cs
similarity index 100%
rename from Plugins/UniversalEditor.Plugins.Icarus/ObjectModels/Icarus/Parameters/IcarusGenericParameter.cs
rename to Plugins/UniversalEditor.Plugins.RavenSoftware/ObjectModels/Icarus/Parameters/IcarusGenericParameter.cs
diff --git a/Plugins/UniversalEditor.Plugins.Icarus/Properties/AssemblyInfo.cs b/Plugins/UniversalEditor.Plugins.RavenSoftware/Properties/AssemblyInfo.cs
similarity index 100%
rename from Plugins/UniversalEditor.Plugins.Icarus/Properties/AssemblyInfo.cs
rename to Plugins/UniversalEditor.Plugins.RavenSoftware/Properties/AssemblyInfo.cs
diff --git a/Plugins/UniversalEditor.Plugins.Icarus/UniversalEditor.Plugins.Icarus.csproj b/Plugins/UniversalEditor.Plugins.RavenSoftware/UniversalEditor.Plugins.RavenSoftware.csproj
similarity index 98%
rename from Plugins/UniversalEditor.Plugins.Icarus/UniversalEditor.Plugins.Icarus.csproj
rename to Plugins/UniversalEditor.Plugins.RavenSoftware/UniversalEditor.Plugins.RavenSoftware.csproj
index 725fbf5d..079584d3 100644
--- a/Plugins/UniversalEditor.Plugins.Icarus/UniversalEditor.Plugins.Icarus.csproj
+++ b/Plugins/UniversalEditor.Plugins.RavenSoftware/UniversalEditor.Plugins.RavenSoftware.csproj
@@ -7,7 +7,7 @@
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>UniversalEditor</RootNamespace>
-    <AssemblyName>UniversalEditor.Plugins.Icarus</AssemblyName>
+    <AssemblyName>UniversalEditor.Plugins.RavenSoftware</AssemblyName>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
diff --git a/UniversalEditor.sln b/UniversalEditor.sln
index 457a5bc3..92347858 100644
--- a/UniversalEditor.sln
+++ b/UniversalEditor.sln
@@ -59,7 +59,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UniversalEditor.Plugins.Fil
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UniversalEditor.Plugins.Gainax", "Plugins\UniversalEditor.Plugins.Gainax\UniversalEditor.Plugins.Gainax.csproj", "{7BB04C9F-DC3F-448A-8FD3-9A6BB52BC886}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UniversalEditor.Plugins.Icarus", "Plugins\UniversalEditor.Plugins.Icarus\UniversalEditor.Plugins.Icarus.csproj", "{B2DFA94A-A468-48A1-AB31-04EE432E7B2B}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UniversalEditor.Plugins.RavenSoftware", "Plugins\UniversalEditor.Plugins.RavenSoftware\UniversalEditor.Plugins.RavenSoftware.csproj", "{B2DFA94A-A468-48A1-AB31-04EE432E7B2B}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UniversalEditor.Plugins.Illusion", "Plugins\UniversalEditor.Plugins.Illusion\UniversalEditor.Plugins.Illusion.csproj", "{A968C097-44CE-42BA-B66C-CB3A871EE117}"
 EndProject