diff --git a/SharpDevelop.Tests.sln b/SharpDevelop.Tests.sln
index b0f3d303b9..961f092f7c 100644
--- a/SharpDevelop.Tests.sln
+++ b/SharpDevelop.Tests.sln
@@ -147,9 +147,9 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Reports.Addin",
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Reports.Addin.Test", "src\AddIns\Misc\Reports\ICSharpCode.Reports.Addin\Test\ICSharpCode.Reports.Addin.Test.csproj", "{2B232C7E-CFB6-4B73-A1B8-134A8A2ED4F7}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Reporting", "src\AddIns\Misc\Reporting\ICSharpCode.Reporting.csproj", "{40CA84D4-ACFC-4646-9CDD-B87262D34093}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Reporting", "src\AddIns\Misc\Reporting\ICSharpCode.Reporting\ICSharpCode.Reporting.csproj", "{40CA84D4-ACFC-4646-9CDD-B87262D34093}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Reporting.Tests", "src\AddIns\Misc\ICSharpCode.Reporting.Tests\ICSharpCode.Reporting.Tests.csproj", "{D38DE254-A132-4E43-9BF0-21BA45564E9D}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Reporting.Test", "src\AddIns\Misc\Reporting\ICSharpCode.Reporting\Test\ICSharpCode.Reporting.Test\ICSharpCode.Reporting.Test.csproj", "{97CA9CE5-B966-48DF-BB59-F00FFC534B1F}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Display Bindings", "Display Bindings", "{11BF9245-88A3-4A0A-9A8A-EC9D98036B0F}"
 	ProjectSection(SolutionItems) = postProject
@@ -899,14 +899,14 @@ Global
 		{40CA84D4-ACFC-4646-9CDD-B87262D34093}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{40CA84D4-ACFC-4646-9CDD-B87262D34093}.Release|x86.Build.0 = Release|Any CPU
 		{40CA84D4-ACFC-4646-9CDD-B87262D34093}.Release|x86.ActiveCfg = Release|Any CPU
-		{D38DE254-A132-4E43-9BF0-21BA45564E9D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D38DE254-A132-4E43-9BF0-21BA45564E9D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D38DE254-A132-4E43-9BF0-21BA45564E9D}.Debug|x86.Build.0 = Debug|Any CPU
-		{D38DE254-A132-4E43-9BF0-21BA45564E9D}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{D38DE254-A132-4E43-9BF0-21BA45564E9D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D38DE254-A132-4E43-9BF0-21BA45564E9D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D38DE254-A132-4E43-9BF0-21BA45564E9D}.Release|x86.Build.0 = Release|Any CPU
-		{D38DE254-A132-4E43-9BF0-21BA45564E9D}.Release|x86.ActiveCfg = Release|Any CPU
+		{97CA9CE5-B966-48DF-BB59-F00FFC534B1F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{97CA9CE5-B966-48DF-BB59-F00FFC534B1F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{97CA9CE5-B966-48DF-BB59-F00FFC534B1F}.Debug|x86.Build.0 = Debug|Any CPU
+		{97CA9CE5-B966-48DF-BB59-F00FFC534B1F}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{97CA9CE5-B966-48DF-BB59-F00FFC534B1F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{97CA9CE5-B966-48DF-BB59-F00FFC534B1F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{97CA9CE5-B966-48DF-BB59-F00FFC534B1F}.Release|x86.Build.0 = Release|Any CPU
+		{97CA9CE5-B966-48DF-BB59-F00FFC534B1F}.Release|x86.ActiveCfg = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -971,7 +971,7 @@ Global
 		{35D002D7-C78B-44FB-92AA-104BEB431678} = {F3662720-9EA2-4591-BBC6-97361DCE50A9}
 		{2B232C7E-CFB6-4B73-A1B8-134A8A2ED4F7} = {F3662720-9EA2-4591-BBC6-97361DCE50A9}
 		{40CA84D4-ACFC-4646-9CDD-B87262D34093} = {F3662720-9EA2-4591-BBC6-97361DCE50A9}
-		{D38DE254-A132-4E43-9BF0-21BA45564E9D} = {F3662720-9EA2-4591-BBC6-97361DCE50A9}
+		{97CA9CE5-B966-48DF-BB59-F00FFC534B1F} = {F3662720-9EA2-4591-BBC6-97361DCE50A9}
 		{6B1CFE35-DA17-4DEB-9C6E-227E5E251DA0} = {DEFC8584-BEC3-4921-BD0F-40482E450B7B}
 		{0008FCE9-9EB4-4E2E-979B-553278E5BBA6} = {DEFC8584-BEC3-4921-BD0F-40482E450B7B}
 		{AE4AB0FA-6087-4480-AF37-0FA1452B3DA1} = {485A4CCF-55CF-49F4-BD6D-A22B788C67DA}
diff --git a/src/AddIns/Misc/Reporting/ICSharpCode.Reporting.csproj b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/ICSharpCode.Reporting.csproj
similarity index 76%
rename from src/AddIns/Misc/Reporting/ICSharpCode.Reporting.csproj
rename to src/AddIns/Misc/Reporting/ICSharpCode.Reporting/ICSharpCode.Reporting.csproj
index 4377114374..c19b44e072 100644
--- a/src/AddIns/Misc/Reporting/ICSharpCode.Reporting.csproj
+++ b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/ICSharpCode.Reporting.csproj
@@ -11,17 +11,29 @@
     <TargetFrameworkProfile>
     </TargetFrameworkProfile>
     <AppDesignerFolder>Properties</AppDesignerFolder>
+    <NoWin32Manifest>False</NoWin32Manifest>
+    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
+    <NoStdLib>False</NoStdLib>
+    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
+    <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
+    <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Platform)' == 'AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
+    <BaseAddress>4194304</BaseAddress>
+    <Prefer32Bit>False</Prefer32Bit>
+    <RegisterForComInterop>False</RegisterForComInterop>
+    <GenerateSerializationAssemblies>Auto</GenerateSerializationAssemblies>
+    <FileAlignment>4096</FileAlignment>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
-    <OutputPath>bin\Debug\</OutputPath>
+    <OutputPath>..\..\..\..\..\AddIns\Misc\SharpDevelopReporting\</OutputPath>
     <DebugSymbols>True</DebugSymbols>
     <DebugType>Full</DebugType>
     <Optimize>False</Optimize>
-    <CheckForOverflowUnderflow>True</CheckForOverflowUnderflow>
+    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <BaseIntermediateOutputPath>obj\</BaseIntermediateOutputPath>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
     <OutputPath>bin\Release\</OutputPath>
@@ -32,9 +44,6 @@
     <DefineConstants>TRACE</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="NUnit.Framework">
-      <HintPath>$(SharpDevelopBinPath)\Tools\NUnit\NUnit.Framework.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core">
       <RequiredTargetFramework>3.5</RequiredTargetFramework>
@@ -46,7 +55,7 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Configuration\AssemblyInfo.cs" />
+    <Compile Include="Src\Configuration\AssemblyInfo.cs" />
     <Compile Include="Src\Interfaces\IReportCreator.cs" />
     <Compile Include="Src\Items\BaseSection.cs" />
     <Compile Include="Src\Globals\GlobalEnums.cs" />
@@ -59,7 +68,6 @@
     <Compile Include="Src\Xml\MycroParser.cs" />
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="Src\Model" />
     <Folder Include="Src\Interfaces" />
     <Folder Include="Src\Globals" />
     <Folder Include="Src" />
diff --git a/src/AddIns/Misc/Reporting/Configuration/AssemblyInfo.cs b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Configuration/AssemblyInfo.cs
similarity index 91%
rename from src/AddIns/Misc/Reporting/Configuration/AssemblyInfo.cs
rename to src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Configuration/AssemblyInfo.cs
index 92c27daa12..46153fcac3 100644
--- a/src/AddIns/Misc/Reporting/Configuration/AssemblyInfo.cs
+++ b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Configuration/AssemblyInfo.cs
@@ -10,4 +10,4 @@ using System.Security;
 
 [assembly: SecurityRules(SecurityRuleSet.Level1)]
 
-[assembly: System.Runtime.CompilerServices.InternalsVisibleTo("ICSharpCode.Reporting.Tests")]
\ No newline at end of file
+[assembly: System.Runtime.CompilerServices.InternalsVisibleTo("ICSharpCode.Reporting.Test")]
\ No newline at end of file
diff --git a/src/AddIns/Misc/Reporting/Src/Globals/GlobalEnums.cs b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Globals/GlobalEnums.cs
similarity index 100%
rename from src/AddIns/Misc/Reporting/Src/Globals/GlobalEnums.cs
rename to src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Globals/GlobalEnums.cs
diff --git a/src/AddIns/Misc/Reporting/Src/Globals/GlobalValues.cs b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Globals/GlobalValues.cs
similarity index 100%
rename from src/AddIns/Misc/Reporting/Src/Globals/GlobalValues.cs
rename to src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Globals/GlobalValues.cs
diff --git a/src/AddIns/Misc/Reporting/Src/Interfaces/IReportCreator.cs b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Interfaces/IReportCreator.cs
similarity index 100%
rename from src/AddIns/Misc/Reporting/Src/Interfaces/IReportCreator.cs
rename to src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Interfaces/IReportCreator.cs
diff --git a/src/AddIns/Misc/Reporting/Src/Interfaces/IReportModel.cs b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Interfaces/IReportModel.cs
similarity index 100%
rename from src/AddIns/Misc/Reporting/Src/Interfaces/IReportModel.cs
rename to src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Interfaces/IReportModel.cs
diff --git a/src/AddIns/Misc/Reporting/Src/Items/BaseSection.cs b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Items/BaseSection.cs
similarity index 100%
rename from src/AddIns/Misc/Reporting/Src/Items/BaseSection.cs
rename to src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Items/BaseSection.cs
diff --git a/src/AddIns/Misc/Reporting/Src/Items/ReportModel.cs b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Items/ReportModel.cs
similarity index 100%
rename from src/AddIns/Misc/Reporting/Src/Items/ReportModel.cs
rename to src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Items/ReportModel.cs
diff --git a/src/AddIns/Misc/Reporting/Src/Items/ReportSettings.cs b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Items/ReportSettings.cs
similarity index 100%
rename from src/AddIns/Misc/Reporting/Src/Items/ReportSettings.cs
rename to src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Items/ReportSettings.cs
diff --git a/src/AddIns/Misc/Reporting/Src/ReportingFactory.cs b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/ReportingFactory.cs
similarity index 94%
rename from src/AddIns/Misc/Reporting/Src/ReportingFactory.cs
rename to src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/ReportingFactory.cs
index deddcff896..2d2824995b 100644
--- a/src/AddIns/Misc/Reporting/Src/ReportingFactory.cs
+++ b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/ReportingFactory.cs
@@ -49,7 +49,6 @@ namespace ICSharpCode.Reporting
 		
 		internal ReportModel LoadReportModel (Stream stream)
 		{
-			Console.WriteLine("ReportEngine:LoadReportModel_2");
 			var doc = new XmlDocument();
 			doc.Load(stream);
 			var rm = LoadModel(doc);
@@ -58,7 +57,6 @@ namespace ICSharpCode.Reporting
 		
 		static ReportModel LoadModel(XmlDocument doc)
 		{
-			Console.WriteLine("ReportEngine:LoadModel");
 			var loader = new ModelLoader();
 			object root = loader.Load(doc.DocumentElement);
 
diff --git a/src/AddIns/Misc/Reporting/Src/Xml/ModelLoader.cs b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Xml/ModelLoader.cs
similarity index 94%
rename from src/AddIns/Misc/Reporting/Src/Xml/ModelLoader.cs
rename to src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Xml/ModelLoader.cs
index be14882f74..e737d2be97 100644
--- a/src/AddIns/Misc/Reporting/Src/Xml/ModelLoader.cs
+++ b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Xml/ModelLoader.cs
@@ -14,7 +14,7 @@ namespace ICSharpCode.Reporting.Xml
 	/// <summary>
 	/// Description of ModelLoader.
 	/// </summary>
-	public class ModelLoader: MycroParser
+	internal class ModelLoader: MycroParser
 	{
 		
 		protected override Type GetTypeByName(string ns, string name)
diff --git a/src/AddIns/Misc/Reporting/Src/Xml/MycroParser.cs b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Xml/MycroParser.cs
similarity index 99%
rename from src/AddIns/Misc/Reporting/Src/Xml/MycroParser.cs
rename to src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Xml/MycroParser.cs
index 078f64a880..aa469d6db7 100644
--- a/src/AddIns/Misc/Reporting/Src/Xml/MycroParser.cs
+++ b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Xml/MycroParser.cs
@@ -31,7 +31,7 @@ namespace ICSharpCode.Reporting.Xml
 	/// <summary>
 	/// See http://www.codeproject.com/dotnet/MycroXaml.asp
 	/// </summary>
-	public abstract class MycroParser
+	internal abstract class MycroParser
 	{
 		public object Load(XmlElement element)
 		{
diff --git a/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Test/ICSharpCode.Reporting.Test/ICSharpCode.Reporting.Test.csproj b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Test/ICSharpCode.Reporting.Test/ICSharpCode.Reporting.Test.csproj
new file mode 100644
index 0000000000..5975816bf3
--- /dev/null
+++ b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Test/ICSharpCode.Reporting.Test/ICSharpCode.Reporting.Test.csproj
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
+  <PropertyGroup>
+    <ProjectGuid>{97CA9CE5-B966-48DF-BB59-F00FFC534B1F}</ProjectGuid>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <OutputType>Library</OutputType>
+    <RootNamespace>ICSharpCode.Reporting.Test</RootNamespace>
+    <AssemblyName>ICSharpCode.Reporting.Test</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkProfile>
+    </TargetFrameworkProfile>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <NoWin32Manifest>False</NoWin32Manifest>
+    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
+    <NoStdLib>False</NoStdLib>
+    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
+    <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Platform)' == 'AnyCPU' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <BaseAddress>4194304</BaseAddress>
+    <Prefer32Bit>False</Prefer32Bit>
+    <RegisterForComInterop>False</RegisterForComInterop>
+    <GenerateSerializationAssemblies>Auto</GenerateSerializationAssemblies>
+    <FileAlignment>4096</FileAlignment>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
+    <OutputPath>..\..\..\..\..\..\..\bin\UnitTests\</OutputPath>
+    <DebugSymbols>True</DebugSymbols>
+    <DebugType>Full</DebugType>
+    <Optimize>False</Optimize>
+    <CheckForOverflowUnderflow>True</CheckForOverflowUnderflow>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <BaseIntermediateOutputPath>obj\</BaseIntermediateOutputPath>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
+    <OutputPath>bin\Release\</OutputPath>
+    <DebugSymbols>False</DebugSymbols>
+    <DebugType>None</DebugType>
+    <Optimize>True</Optimize>
+    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
+    <DefineConstants>TRACE</DefineConstants>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="nunit.framework">
+      <HintPath>..\..\..\..\..\..\Tools\NUnit\nunit.framework.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Core">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.Xml" />
+    <Reference Include="System.Xml.Linq">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="src\Model\LoadPlainModelFixture.cs" />
+    <Compile Include="src\Model\ReportModelFixture.cs" />
+    <Compile Include="src\Model\ReportSettingsFixture.cs" />
+    <Compile Include="src\Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="src" />
+    <Folder Include="src\Model" />
+    <Folder Include="src\TestReports" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\ICSharpCode.Reporting.csproj">
+      <Project>{40CA84D4-ACFC-4646-9CDD-B87262D34093}</Project>
+      <Name>ICSharpCode.Reporting</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="src\TestReports\PlainModel.srd" />
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
\ No newline at end of file
diff --git a/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Test/ICSharpCode.Reporting.Test/src/Properties/AssemblyInfo.cs b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Test/ICSharpCode.Reporting.Test/src/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000000..faf3de5584
--- /dev/null
+++ b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Test/ICSharpCode.Reporting.Test/src/Properties/AssemblyInfo.cs
@@ -0,0 +1,31 @@
+#region Using directives
+
+using System;
+using System.Reflection;
+using System.Runtime.InteropServices;
+
+#endregion
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("ICSharpCode.Reporting.Test")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("ICSharpCode.Reporting.Test")]
+[assembly: AssemblyCopyright("Copyright 2013")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// This sets the default COM visibility of types in the assembly to invisible.
+// If you need to expose a type to COM, use [ComVisible(true)] on that type.
+[assembly: ComVisible(false)]
+
+// The assembly version has following format :
+//
+// Major.Minor.Build.Revision
+//
+// You can specify all the values or you can use the default the Revision and 
+// Build Numbers by using the '*' as shown below:
+[assembly: AssemblyVersion("1.0.*")]