diff --git a/CSharp/Engines/WindowsForms/Engines/UniversalEditor.UserInterface.WindowsForms.DesktopApplication/Dialogs/SelectEnvironmentDialog.cs b/CSharp/Engines/WindowsForms/Engines/UniversalEditor.UserInterface.WindowsForms.DesktopApplication/Dialogs/SelectEnvironmentDialog.cs
index d22695b7..06514acc 100644
--- a/CSharp/Engines/WindowsForms/Engines/UniversalEditor.UserInterface.WindowsForms.DesktopApplication/Dialogs/SelectEnvironmentDialog.cs
+++ b/CSharp/Engines/WindowsForms/Engines/UniversalEditor.UserInterface.WindowsForms.DesktopApplication/Dialogs/SelectEnvironmentDialog.cs
@@ -13,7 +13,7 @@ namespace UniversalEditor.UserInterface.WindowsForms.Dialogs
 		{
 			InitializeComponent();
 
-			foreach (Perspective perspective in PerspectiveManager.Perspectives)
+			foreach (Perspective perspective in Engine.CurrentEngine.Perspectives)
 			{
 				ListViewItem lvi = new ListViewItem();
 				lvi.Text = perspective.Title;
diff --git a/CSharp/Engines/WindowsForms/Engines/UniversalEditor.UserInterface.WindowsForms.DesktopApplication/PerspectiveManager.cs b/CSharp/Engines/WindowsForms/Engines/UniversalEditor.UserInterface.WindowsForms.DesktopApplication/PerspectiveManager.cs
deleted file mode 100644
index 3b03c50d..00000000
--- a/CSharp/Engines/WindowsForms/Engines/UniversalEditor.UserInterface.WindowsForms.DesktopApplication/PerspectiveManager.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace UniversalEditor.UserInterface.WindowsForms
-{
-	public static class PerspectiveManager
-	{
-		private static Perspective.PerspectiveCollection mvarPerspectives = new Perspective.PerspectiveCollection();
-		public static Perspective.PerspectiveCollection Perspectives { get { return mvarPerspectives; } }
-	}
-}
diff --git a/CSharp/Engines/WindowsForms/Engines/UniversalEditor.UserInterface.WindowsForms.DesktopApplication/UniversalEditor.UserInterface.WindowsForms.DesktopApplication.csproj b/CSharp/Engines/WindowsForms/Engines/UniversalEditor.UserInterface.WindowsForms.DesktopApplication/UniversalEditor.UserInterface.WindowsForms.DesktopApplication.csproj
index 1f0dfcd2..9fc7adfe 100644
--- a/CSharp/Engines/WindowsForms/Engines/UniversalEditor.UserInterface.WindowsForms.DesktopApplication/UniversalEditor.UserInterface.WindowsForms.DesktopApplication.csproj
+++ b/CSharp/Engines/WindowsForms/Engines/UniversalEditor.UserInterface.WindowsForms.DesktopApplication/UniversalEditor.UserInterface.WindowsForms.DesktopApplication.csproj
@@ -133,8 +133,6 @@
       <DependentUpon>UnsavedDocumentsDialog.cs</DependentUpon>
     </Compile>
     <Compile Include="IconMethods.cs" />
-    <Compile Include="Perspective.cs" />
-    <Compile Include="PerspectiveManager.cs" />
     <Compile Include="MainWindow.cs">
       <SubType>Form</SubType>
     </Compile>
diff --git a/CSharp/Libraries/UniversalEditor.UserInterface/Engine.cs b/CSharp/Libraries/UniversalEditor.UserInterface/Engine.cs
index ab3cd320..84d7fc3f 100644
--- a/CSharp/Libraries/UniversalEditor.UserInterface/Engine.cs
+++ b/CSharp/Libraries/UniversalEditor.UserInterface/Engine.cs
@@ -770,6 +770,9 @@ namespace UniversalEditor.UserInterface
 		private static Engine mvarCurrentEngine = null;
 		public static Engine CurrentEngine { get { return mvarCurrentEngine; } }
 
+		private Perspective.PerspectiveCollection mvarPerspectives = new Perspective.PerspectiveCollection();
+		public Perspective.PerspectiveCollection Perspectives { get { return mvarPerspectives; } }
+
 		protected virtual void ShowSplashScreen()
 		{
 		}
diff --git a/CSharp/Engines/WindowsForms/Engines/UniversalEditor.UserInterface.WindowsForms.DesktopApplication/Perspective.cs b/CSharp/Libraries/UniversalEditor.UserInterface/Perspective.cs
similarity index 94%
rename from CSharp/Engines/WindowsForms/Engines/UniversalEditor.UserInterface.WindowsForms.DesktopApplication/Perspective.cs
rename to CSharp/Libraries/UniversalEditor.UserInterface/Perspective.cs
index f7cbf2d5..9bea3e09 100644
--- a/CSharp/Engines/WindowsForms/Engines/UniversalEditor.UserInterface.WindowsForms.DesktopApplication/Perspective.cs
+++ b/CSharp/Libraries/UniversalEditor.UserInterface/Perspective.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 
-namespace UniversalEditor
+namespace UniversalEditor.UserInterface
 {
 	public class Perspective
 	{
diff --git a/CSharp/Libraries/UniversalEditor.UserInterface/UniversalEditor.UserInterface.csproj b/CSharp/Libraries/UniversalEditor.UserInterface/UniversalEditor.UserInterface.csproj
index 0f76159e..95f885d6 100644
--- a/CSharp/Libraries/UniversalEditor.UserInterface/UniversalEditor.UserInterface.csproj
+++ b/CSharp/Libraries/UniversalEditor.UserInterface/UniversalEditor.UserInterface.csproj
@@ -69,6 +69,7 @@
     <Compile Include="Language.cs" />
     <Compile Include="MenuBar.cs" />
     <Compile Include="ObjectModelChangingEvent.cs" />
+    <Compile Include="Perspective.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="PropertyMapping.cs" />
     <Compile Include="RecentFileManager.cs" />