diff --git a/Concordion.Kickstart.vs2012.sln b/Concordion.Kickstart.sln
similarity index 100%
rename from Concordion.Kickstart.vs2012.sln
rename to Concordion.Kickstart.sln
diff --git a/Concordion.Kickstart.vs2010.sln b/Concordion.Kickstart.vs2010.sln
deleted file mode 100644
index da75d16..0000000
--- a/Concordion.Kickstart.vs2010.sln
+++ /dev/null
@@ -1,42 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Kickstart", "Kickstart\Kickstart.csproj", "{6C4F96CB-9762-4F3D-A7BF-F74422B186CA}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Kickstart.Spec", "Kickstart.Spec\Kickstart.Spec.csproj", "{F170F9C9-3398-47E2-96E4-D24AF979DE10}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Kickstart.Test", "Kickstart.Test\Kickstart.Test.csproj", "{57B2B687-19C0-42F4-9AAF-610869474BBA}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{4782AB75-C55C-45D4-8E8C-EBA58B5B83F9}"
-	ProjectSection(SolutionItems) = preProject
-		Concordion.Kickstart.vs2010.vsmdi = Concordion.Kickstart.vs2010.vsmdi
-		Local.testsettings = Local.testsettings
-		TraceAndTestImpact.testsettings = TraceAndTestImpact.testsettings
-	EndProjectSection
-EndProject
-Global
-	GlobalSection(TestCaseManagementSettings) = postSolution
-		CategoryFile = Concordion.Kickstart.vs2010.vsmdi
-	EndGlobalSection
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{6C4F96CB-9762-4F3D-A7BF-F74422B186CA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6C4F96CB-9762-4F3D-A7BF-F74422B186CA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6C4F96CB-9762-4F3D-A7BF-F74422B186CA}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6C4F96CB-9762-4F3D-A7BF-F74422B186CA}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F170F9C9-3398-47E2-96E4-D24AF979DE10}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F170F9C9-3398-47E2-96E4-D24AF979DE10}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F170F9C9-3398-47E2-96E4-D24AF979DE10}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F170F9C9-3398-47E2-96E4-D24AF979DE10}.Release|Any CPU.Build.0 = Release|Any CPU
-		{57B2B687-19C0-42F4-9AAF-610869474BBA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{57B2B687-19C0-42F4-9AAF-610869474BBA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{57B2B687-19C0-42F4-9AAF-610869474BBA}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{57B2B687-19C0-42F4-9AAF-610869474BBA}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/Kickstart.Spec/HelloWorld/HelloWorldTest.cs b/Kickstart.Spec/HelloWorld/HelloWorldTest.cs
index 75d31f0..bd8c72f 100644
--- a/Kickstart.Spec/HelloWorld/HelloWorldTest.cs
+++ b/Kickstart.Spec/HelloWorld/HelloWorldTest.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
-using Concordion.Integration;
+using Concordion.NET.Integration;
 using Kickstart.Example;
 
 namespace Kickstart.Spec.HelloWorld
diff --git a/Kickstart.Spec/Kickstart.Spec.csproj b/Kickstart.Spec/Kickstart.Spec.csproj
index 7d86098..0c831ae 100644
--- a/Kickstart.Spec/Kickstart.Spec.csproj
+++ b/Kickstart.Spec/Kickstart.Spec.csproj
@@ -31,19 +31,51 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Concordion, Version=0.5.44.78, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="Concordion, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\lib\Concordion\Concordion.dll</HintPath>
     </Reference>
+    <Reference Include="Concordion.NET, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\lib\Concordion\Concordion.NET.dll</HintPath>
+    </Reference>
+    <Reference Include="Concordion.NUnit">
+      <HintPath>..\lib\Concordion\Concordion.NUnit.dll</HintPath>
+    </Reference>
+    <Reference Include="IKVM.OpenJDK.Core, Version=8.1.5717.0, Culture=neutral, PublicKeyToken=13235d27fcbfff58, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\lib\Concordion\IKVM.OpenJDK.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="IKVM.OpenJDK.Localedata, Version=8.1.5717.0, Culture=neutral, PublicKeyToken=13235d27fcbfff58, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\lib\Concordion\IKVM.OpenJDK.Localedata.dll</HintPath>
+    </Reference>
+    <Reference Include="IKVM.OpenJDK.Text, Version=8.1.5717.0, Culture=neutral, PublicKeyToken=13235d27fcbfff58, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\lib\Concordion\IKVM.OpenJDK.Text.dll</HintPath>
+    </Reference>
+    <Reference Include="IKVM.OpenJDK.Util, Version=8.1.5717.0, Culture=neutral, PublicKeyToken=13235d27fcbfff58, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\lib\Concordion\IKVM.OpenJDK.Util.dll</HintPath>
+    </Reference>
+    <Reference Include="IKVM.Runtime, Version=8.1.5717.0, Culture=neutral, PublicKeyToken=13235d27fcbfff58, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\lib\Concordion\IKVM.Runtime.dll</HintPath>
+    </Reference>
     <Reference Include="nunit.framework, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\lib\NUnit-2.6.4\nunit.framework.dll</HintPath>
     </Reference>
-    <Reference Include="OGNL">
+    <Reference Include="OGNL, Version=1.0.3982.16799, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
       <HintPath>..\lib\Concordion\OGNL.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
+    <Reference Include="xom, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\lib\Concordion\xom.dll</HintPath>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="HelloWorld\HelloWorldTest.cs" />
diff --git a/Kickstart.Spec/Properties/AssemblyInfo.cs b/Kickstart.Spec/Properties/AssemblyInfo.cs
index a928dbe..40adea8 100644
--- a/Kickstart.Spec/Properties/AssemblyInfo.cs
+++ b/Kickstart.Spec/Properties/AssemblyInfo.cs
@@ -1,7 +1,7 @@
 using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
-using Concordion.Integration;
+using Concordion.NET.Integration;
 using NUnit.Framework;
 
 // General Information about an assembly is controlled through the following 
@@ -10,9 +10,9 @@
 [assembly: AssemblyTitle("Kickstart.Spec")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("HP")]
+[assembly: AssemblyCompany("concordion.org")]
 [assembly: AssemblyProduct("Kickstart.Spec")]
-[assembly: AssemblyCopyright("Copyright © HP 2013")]
+[assembly: AssemblyCopyright("Copyright © concordion.org 2016")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -37,5 +37,4 @@
 [assembly: AssemblyVersion("1.0.0.0")]
 [assembly: AssemblyFileVersion("1.0.0.0")]
 
-[assembly: ConcordionAssembly]
 [assembly: RequiredAddin("ConcordionNUnitAddin")]
diff --git a/Kickstart.Test/Properties/AssemblyInfo.cs b/Kickstart.Test/Properties/AssemblyInfo.cs
index 856ac95..97bd4d8 100644
--- a/Kickstart.Test/Properties/AssemblyInfo.cs
+++ b/Kickstart.Test/Properties/AssemblyInfo.cs
@@ -8,9 +8,9 @@
 [assembly: AssemblyTitle("Kickstart.Test")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("HP")]
+[assembly: AssemblyCompany("concordion.org")]
 [assembly: AssemblyProduct("Kickstart.Test")]
-[assembly: AssemblyCopyright("Copyright © HP 2014")]
+[assembly: AssemblyCopyright("Copyright © concordion.org 2016")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
diff --git a/Kickstart/Kickstart.csproj b/Kickstart/Kickstart.csproj
index 1a760da..b153fe3 100644
--- a/Kickstart/Kickstart.csproj
+++ b/Kickstart/Kickstart.csproj
@@ -1,49 +1,49 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{6C4F96CB-9762-4F3D-A7BF-F74422B186CA}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Kickstart</RootNamespace>
-    <AssemblyName>Kickstart</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Example\Greeter.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>8.0.30703</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{6C4F96CB-9762-4F3D-A7BF-F74422B186CA}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Kickstart</RootNamespace>
+    <AssemblyName>Kickstart</AssemblyName>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Example\Greeter.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
   </Target>
   <Target Name="AfterBuild">
   </Target>
-  -->
+  -->
 </Project>
\ No newline at end of file
diff --git a/Kickstart/Properties/AssemblyInfo.cs b/Kickstart/Properties/AssemblyInfo.cs
index abaceb1..cbbdb58 100644
--- a/Kickstart/Properties/AssemblyInfo.cs
+++ b/Kickstart/Properties/AssemblyInfo.cs
@@ -8,9 +8,9 @@
 [assembly: AssemblyTitle("Kickstart")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("HP")]
+[assembly: AssemblyCompany("concordion.org")]
 [assembly: AssemblyProduct("Kickstart")]
-[assembly: AssemblyCopyright("Copyright © HP 2013")]
+[assembly: AssemblyCopyright("Copyright © concordion.org 2016")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
diff --git a/lib/Concordion/Concordion.NET.dll b/lib/Concordion/Concordion.NET.dll
new file mode 100644
index 0000000..b279216
Binary files /dev/null and b/lib/Concordion/Concordion.NET.dll differ
diff --git a/lib/Concordion/Concordion.NUnit.dll b/lib/Concordion/Concordion.NUnit.dll
index 9b87a2a..abf030c 100644
Binary files a/lib/Concordion/Concordion.NUnit.dll and b/lib/Concordion/Concordion.NUnit.dll differ
diff --git a/lib/Concordion/Concordion.config b/lib/Concordion/Concordion.config
deleted file mode 100644
index 5f1035d..0000000
--- a/lib/Concordion/Concordion.config
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<Concordion>
-  <Runners>
-    <Runner alias="runtestrunner" type="Concordion.Spec.Concordion.Command.Run.RunTestRunner, Concordion.Spec, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" />
-  </Runners>
-</Concordion>
diff --git a/lib/Concordion/Concordion.dll b/lib/Concordion/Concordion.dll
index 23564a6..30d777a 100644
Binary files a/lib/Concordion/Concordion.dll and b/lib/Concordion/Concordion.dll differ
diff --git a/lib/Concordion/IKVM.OpenJDK.Core.dll b/lib/Concordion/IKVM.OpenJDK.Core.dll
new file mode 100644
index 0000000..59d8d2a
Binary files /dev/null and b/lib/Concordion/IKVM.OpenJDK.Core.dll differ
diff --git a/lib/Concordion/IKVM.OpenJDK.Localedata.dll b/lib/Concordion/IKVM.OpenJDK.Localedata.dll
new file mode 100644
index 0000000..8043a0d
Binary files /dev/null and b/lib/Concordion/IKVM.OpenJDK.Localedata.dll differ
diff --git a/lib/Concordion/IKVM.OpenJDK.Text.dll b/lib/Concordion/IKVM.OpenJDK.Text.dll
new file mode 100644
index 0000000..98fa8d0
Binary files /dev/null and b/lib/Concordion/IKVM.OpenJDK.Text.dll differ
diff --git a/lib/Concordion/IKVM.OpenJDK.Util.dll b/lib/Concordion/IKVM.OpenJDK.Util.dll
new file mode 100644
index 0000000..d9fd1b3
Binary files /dev/null and b/lib/Concordion/IKVM.OpenJDK.Util.dll differ
diff --git a/lib/Concordion/IKVM.Runtime.dll b/lib/Concordion/IKVM.Runtime.dll
new file mode 100644
index 0000000..5b0824e
Binary files /dev/null and b/lib/Concordion/IKVM.Runtime.dll differ
diff --git a/lib/Concordion/xom.dll b/lib/Concordion/xom.dll
new file mode 100644
index 0000000..14a71f7
Binary files /dev/null and b/lib/Concordion/xom.dll differ