diff --git a/source/Kurve/Kurve.Test/Kurve.Test.csproj b/source/Kurve/Kurve.Test/Kurve.Test.csproj
deleted file mode 100644
index a7ce0c3..0000000
--- a/source/Kurve/Kurve.Test/Kurve.Test.csproj
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>10.0.0</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{40FAA97C-182F-4E4F-B44B-34DA0E04C93B}</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <RootNamespace>Kurve.Test</RootNamespace>
-    <AssemblyName>Kurve.Test</AssemblyName>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug</OutputPath>
-    <DefineConstants>DEBUG;</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <Externalconsole>true</Externalconsole>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>none</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release</OutputPath>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <Externalconsole>true</Externalconsole>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml" />
-    <Reference Include="System.Xml.Linq" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Program.cs" />
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\libraries\krach\Source\Krach\Krach.csproj">
-      <Project>{132A3E13-29BF-4322-B17F-E5E5D86C22EF}</Project>
-      <Name>Krach</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Kurve.Curves\Kurve.Curves.csproj">
-      <Project>{7AC660D7-ED47-4DDB-A10F-DD480AC99286}</Project>
-      <Name>Kurve.Curves</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\libraries\krach\Source\Wrappers.Casadi\Wrappers.Casadi.csproj">
-      <Project>{7A82DCF3-7D64-4BB7-B500-CD72788AAA14}</Project>
-      <Name>Wrappers.Casadi</Name>
-    </ProjectReference>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/source/Kurve/Kurve.Test/Program.cs b/source/Kurve/Kurve.Test/Program.cs
deleted file mode 100644
index 0d00619..0000000
--- a/source/Kurve/Kurve.Test/Program.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-using System;
-using Krach.Basics;
-using System.Linq;
-using System.Collections.Generic;
-using Krach.Extensions;
-using System.Linq.Expressions;
-using Wrappers.Casadi;
-using Kurve.Curves;
-using System.Xml.Linq;
-using Kurve.Curves.Optimization;
-
-namespace Kurve.Test
-{
-	static class Program
-	{
-		static void Main(string[] parameters)
-        {
-			Optimizer optimizer = new Optimizer();
-
-			double curveLength = 4;
-			int segmentCount = 10;
-			FunctionTermCurveTemplate segmentTemplate = new PolynomialFunctionTermCurveTemplate(10);
-			IEnumerable<CurveSpecification> curveSpecifications = Enumerables.Create<CurveSpecification>
-			(
-				new PointCurveSpecification(0.0, new Vector2Double(-1.0,  0.0)),
-				new PointCurveSpecification(0.5, new Vector2Double( 0.0, -1.0)),
-				new PointCurveSpecification(1.0, new Vector2Double(+1.0,  0.0))
-			);
-			BasicSpecification basicSpecification = new BasicSpecification(curveLength, segmentCount, segmentTemplate, curveSpecifications);
-
-			Specification specification = new Specification(basicSpecification);
-
-			foreach (double x in Scalars.GetIntermediateValues(4, 5, 10))
-			{
-				specification = optimizer.Normalize
-				(
-					new Specification
-					(
-						new BasicSpecification(x, specification.BasicSpecification.SegmentCount, specification.BasicSpecification.SegmentTemplate, specification.BasicSpecification.CurveSpecifications),
-						specification.Position
-					)
-				);
-
-				Console.WriteLine(optimizer.GetCurve(specification));
-			}
-		}
-	}
-}
diff --git a/source/Kurve/Kurve.sln b/source/Kurve/Kurve.sln
index ea1a0d9..0f6ad9c 100644
--- a/source/Kurve/Kurve.sln
+++ b/source/Kurve/Kurve.sln
@@ -1,8 +1,6 @@
 
 Microsoft Visual Studio Solution File, Format Version 11.00
 # Visual Studio 2010
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Kurve.Test", "Kurve.Test\Kurve.Test.csproj", "{40FAA97C-182F-4E4F-B44B-34DA0E04C93B}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Kurve", "Kurve\Kurve.csproj", "{352049A9-B046-4C53-AE87-974F166A8109}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Kurve.Curves", "Kurve.Curves\Kurve.Curves.csproj", "{7AC660D7-ED47-4DDB-A10F-DD480AC99286}"
@@ -27,10 +25,6 @@ Global
 		{352049A9-B046-4C53-AE87-974F166A8109}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{352049A9-B046-4C53-AE87-974F166A8109}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{352049A9-B046-4C53-AE87-974F166A8109}.Release|Any CPU.Build.0 = Release|Any CPU
-		{40FAA97C-182F-4E4F-B44B-34DA0E04C93B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{40FAA97C-182F-4E4F-B44B-34DA0E04C93B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{40FAA97C-182F-4E4F-B44B-34DA0E04C93B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{40FAA97C-182F-4E4F-B44B-34DA0E04C93B}.Release|Any CPU.Build.0 = Release|Any CPU
 		{7A82DCF3-7D64-4BB7-B500-CD72788AAA14}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{7A82DCF3-7D64-4BB7-B500-CD72788AAA14}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{7A82DCF3-7D64-4BB7-B500-CD72788AAA14}.Release|Any CPU.ActiveCfg = Release|Any CPU
diff --git a/source/Kurve/Kurve/Components/Abstract/Component.cs b/source/Kurve/Kurve/Components/Abstract/Component.cs
index e2c046b..2621d4c 100644
--- a/source/Kurve/Kurve/Components/Abstract/Component.cs
+++ b/source/Kurve/Kurve/Components/Abstract/Component.cs
@@ -3,7 +3,6 @@
 using System.Collections.Generic;
 using Krach.Basics;
 using Krach.Extensions;
-using Wrappers.Casadi;
 using Cairo;
 using Kurve.Interface;
 
diff --git a/source/Kurve/Kurve/Components/Controls/PointSpecificationComponent.cs b/source/Kurve/Kurve/Components/Controls/PointSpecificationComponent.cs
index 0cda539..557496c 100644
--- a/source/Kurve/Kurve/Components/Controls/PointSpecificationComponent.cs
+++ b/source/Kurve/Kurve/Components/Controls/PointSpecificationComponent.cs
@@ -3,7 +3,6 @@
 using System.Collections.Generic;
 using Krach.Basics;
 using Krach.Extensions;
-using Wrappers.Casadi;
 using Cairo;
 using Krach.Graphics;
 using Kurve.Interface;
diff --git a/source/Kurve/Kurve/Components/CurveComponent.cs b/source/Kurve/Kurve/Components/CurveComponent.cs
index 0b646ab..9d0475b 100644
--- a/source/Kurve/Kurve/Components/CurveComponent.cs
+++ b/source/Kurve/Kurve/Components/CurveComponent.cs
@@ -3,7 +3,6 @@
 using System.Collections.Generic;
 using Krach.Basics;
 using Krach.Extensions;
-using Wrappers.Casadi;
 using Krach.Graphics;
 using Kurve.Curves;
 using Kurve.Curves.Optimization;
diff --git a/source/Kurve/Kurve/Components/RootComponent.cs b/source/Kurve/Kurve/Components/RootComponent.cs
index db60ad8..0cc007c 100644
--- a/source/Kurve/Kurve/Components/RootComponent.cs
+++ b/source/Kurve/Kurve/Components/RootComponent.cs
@@ -3,7 +3,6 @@
 using System.Collections.Generic;
 using Krach.Basics;
 using Krach.Extensions;
-using Wrappers.Casadi;
 using Cairo;
 using Krach.Graphics;
 using Kurve.Curves;
diff --git a/source/Kurve/Kurve/CurveOptimizer.cs b/source/Kurve/Kurve/CurveOptimizer.cs
index d3c6c23..2b8ac77 100644
--- a/source/Kurve/Kurve/CurveOptimizer.cs
+++ b/source/Kurve/Kurve/CurveOptimizer.cs
@@ -3,7 +3,6 @@
 using System.Collections.Generic;
 using Krach.Basics;
 using Krach.Extensions;
-using Wrappers.Casadi;
 using Krach.Graphics;
 using Kurve.Curves;
 using Kurve.Curves.Optimization;
diff --git a/source/Kurve/Kurve/DiscreteCurve.cs b/source/Kurve/Kurve/DiscreteCurve.cs
index bd5f661..9047acc 100644
--- a/source/Kurve/Kurve/DiscreteCurve.cs
+++ b/source/Kurve/Kurve/DiscreteCurve.cs
@@ -3,7 +3,6 @@
 using System.Collections.Generic;
 using Krach.Basics;
 using Krach.Extensions;
-using Wrappers.Casadi;
 using Cairo;
 using Krach.Graphics;
 using Kurve.Curves;
diff --git a/source/Kurve/Kurve/DiscreteCurveItem.cs b/source/Kurve/Kurve/DiscreteCurveItem.cs
index 4f8c9dd..48a794b 100644
--- a/source/Kurve/Kurve/DiscreteCurveItem.cs
+++ b/source/Kurve/Kurve/DiscreteCurveItem.cs
@@ -3,7 +3,6 @@
 using System.Collections.Generic;
 using Krach.Basics;
 using Krach.Extensions;
-using Wrappers.Casadi;
 using Cairo;
 using Krach.Graphics;
 using Kurve.Curves;
diff --git a/source/Kurve/Kurve/Interface/Key.cs b/source/Kurve/Kurve/Interface/Key.cs
index e327d78..6e431ea 100644
--- a/source/Kurve/Kurve/Interface/Key.cs
+++ b/source/Kurve/Kurve/Interface/Key.cs
@@ -3,7 +3,6 @@
 using System.Collections.Generic;
 using Krach.Basics;
 using Krach.Extensions;
-using Wrappers.Casadi;
 using Cairo;
 
 namespace Kurve.Interface
diff --git a/source/Kurve/Kurve/Interface/MouseButton.cs b/source/Kurve/Kurve/Interface/MouseButton.cs
index e950267..95334d2 100644
--- a/source/Kurve/Kurve/Interface/MouseButton.cs
+++ b/source/Kurve/Kurve/Interface/MouseButton.cs
@@ -3,7 +3,6 @@
 using System.Collections.Generic;
 using Krach.Basics;
 using Krach.Extensions;
-using Wrappers.Casadi;
 using Cairo;
 
 namespace Kurve.Interface
diff --git a/source/Kurve/Kurve/Interface/ScrollDirection.cs b/source/Kurve/Kurve/Interface/ScrollDirection.cs
index 95e0d22..48ac728 100644
--- a/source/Kurve/Kurve/Interface/ScrollDirection.cs
+++ b/source/Kurve/Kurve/Interface/ScrollDirection.cs
@@ -3,7 +3,6 @@
 using System.Collections.Generic;
 using Krach.Basics;
 using Krach.Extensions;
-using Wrappers.Casadi;
 using Cairo;
 
 namespace Kurve.Interface
diff --git a/source/Kurve/Kurve/InterfaceUtility.cs b/source/Kurve/Kurve/InterfaceUtility.cs
index 1a46589..7734016 100644
--- a/source/Kurve/Kurve/InterfaceUtility.cs
+++ b/source/Kurve/Kurve/InterfaceUtility.cs
@@ -3,7 +3,6 @@
 using System.Collections.Generic;
 using Krach.Basics;
 using Krach.Extensions;
-using Wrappers.Casadi;
 using Cairo;
 
 namespace Kurve
diff --git a/source/Kurve/Kurve/Kurve.csproj b/source/Kurve/Kurve/Kurve.csproj
index 4d4b0d8..e97657c 100644
--- a/source/Kurve/Kurve/Kurve.csproj
+++ b/source/Kurve/Kurve/Kurve.csproj
@@ -94,14 +94,14 @@
       <Project>{132A3E13-29BF-4322-B17F-E5E5D86C22EF}</Project>
       <Name>Krach</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Kurve.Curves\Kurve.Curves.csproj">
-      <Project>{7AC660D7-ED47-4DDB-A10F-DD480AC99286}</Project>
-      <Name>Kurve.Curves</Name>
-    </ProjectReference>
     <ProjectReference Include="..\..\..\libraries\krach\Source\Wrappers.Casadi\Wrappers.Casadi.csproj">
       <Project>{7A82DCF3-7D64-4BB7-B500-CD72788AAA14}</Project>
       <Name>Wrappers.Casadi</Name>
     </ProjectReference>
+    <ProjectReference Include="..\Kurve.Curves\Kurve.Curves.csproj">
+      <Project>{7AC660D7-ED47-4DDB-A10F-DD480AC99286}</Project>
+      <Name>Kurve.Curves</Name>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Interface\" />
diff --git a/source/Kurve/Kurve/MainWindow.cs b/source/Kurve/Kurve/MainWindow.cs
index d1dc53e..f162128 100644
--- a/source/Kurve/Kurve/MainWindow.cs
+++ b/source/Kurve/Kurve/MainWindow.cs
@@ -7,7 +7,6 @@
 using System.Linq;
 using Krach.Extensions;
 using System.Collections.Generic;
-using Wrappers.Casadi;
 using System.Xml.Linq;
 using Kurve.Interface;
 using Kurve.Curves.Optimization;
diff --git a/source/Kurve/Kurve/OptimizationWorker.cs b/source/Kurve/Kurve/OptimizationWorker.cs
index 4853881..ad022ad 100644
--- a/source/Kurve/Kurve/OptimizationWorker.cs
+++ b/source/Kurve/Kurve/OptimizationWorker.cs
@@ -3,7 +3,6 @@
 using System.Collections.Generic;
 using Krach.Basics;
 using Krach.Extensions;
-using Wrappers.Casadi;
 using Cairo;
 using Kurve.Curves.Optimization;
 using Kurve.Curves;
diff --git a/source/Kurve/Kurve/gtk-gui/gui.stetic b/source/Kurve/Kurve/gtk-gui/gui.stetic
index 0a82bb0..cf47a17 100644
--- a/source/Kurve/Kurve/gtk-gui/gui.stetic
+++ b/source/Kurve/Kurve/gtk-gui/gui.stetic
@@ -6,7 +6,7 @@
   </configuration>
   <import>
     <widget-library name="glade-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-    <widget-library name="../bin/Release/Kurve.exe" internal="true" />
+    <widget-library name="../bin/Debug/Kurve.exe" internal="true" />
   </import>
   <widget class="Gtk.Window" id="MainWindow" design-size="496 341">
     <property name="MemberName" />