diff --git a/AddIns/SharpReport/SharpReportAddin.addin b/AddIns/SharpDevelopReports/ICSharpCode.ReportDesigner.addin
similarity index 57%
rename from AddIns/SharpReport/SharpReportAddin.addin
rename to AddIns/SharpDevelopReports/ICSharpCode.ReportDesigner.addin
index 1d5c23a231..3f43effe07 100644
--- a/AddIns/SharpReport/SharpReportAddin.addin
+++ b/AddIns/SharpDevelopReports/ICSharpCode.ReportDesigner.addin
@@ -11,17 +11,17 @@
 	<Runtime>
 		<!-- need to load from correct directory SharpQuery first -->
 		<Import assembly = "$ICSharpCode.SharpQuery/SharpQuery.dll" />
-		<Import assembly = "SharpReportAddin.dll"/>
+		<Import assembly = "ICSharpCode.Reports.Addin.dll"/>
 	</Runtime>
 	
 	<!-- DisplayBinding -->
-	
+		
 	<Path name ="/SharpDevelop/Workbench/DisplayBindings">
 		<DisplayBinding id="SharpReportBinding"
 		                insertbefore="Text"
 		                fileNamePattern="\.srd$"
 		                languagePattern="^SharpReport$"
-		                class="SharpReportAddin.SharpReportDisplayBinding"/>
+		                class="ICSharpCode.Reports.Addin.SharpReportDisplayBinding"/>
 	</Path>
 	
 	<!-- File Filter -->
@@ -40,44 +40,33 @@
 			     icon="Icons.16x16.SharpQuery.Refresh"
 			     title = "ReportExplorer"
 			     shortcut = "Control|Alt|F"
-			     class="SharpReportAddin.ReportExplorer"/>
+			     class="ICSharpCode.Reports.Addin.ReportExplorer"/>
 	</Path>
 	
 	<!-- DesignerContectMenu Section -->
 	<Path name ="/SharpReport/ContextMenu/Section">
-		<MenuItem id="settings" label="${res:SharpReport.ContextMenu.Settings}" class="SharpReportAddin.Commands.ShowSettings"/>
-		<MenuItem id="preview" label="${res:SharpReport.ContextMenu.Preview}" class="SharpReportAddin.Commands.RunPreview"/>
-<!--
-		<MenuItem id="sep1" label="-"/>
-		<MenuItem id="visible" label="${res:SharpReport.ContextMenu.SectionVisible}" class="SharpReportAddin.Commands.SectionVisible"/>
-		<MenuItem id="function" label="${res:SharpReport.ContextMenu.Functions}" class="SharpReportAddin.Commands.InsertFunction"/>
-		
-   	<MenuItem id="fieldslist" label="${res:SharpReport.ContextMenu.FieldsList}" class="SharpReportAddin.Commands.ShowFieldsList"/>
- 		-->
+		<MenuItem id="settings" label="${res:SharpReport.ContextMenu.Settings}" class="ICSharpCode.Reports.Addin.Commands.ShowSettings"/>
 	</Path>
 
 	 <!-- DesignerContextMenu Items -->
    <Path name ="/SharpReport/ContextMenu/Items">
-      <MenuItem id="cut" label="${res:SharpReport.ContextMenu.Cut}" class="SharpReportAddin.Commands.CutReportItem"/>
-     <!--
-   	  <MenuItem id="paste" label="${res:SharpReport.ContextMenu.Paste}" class="SharpReportAddin.Commands.PasteReportItem"/>
-   		-->
+      <MenuItem id="cut" label="${res:SharpReport.ContextMenu.Cut}" class="ICSharpCode.Reports.Addin.Commands.CutReportItem"/>
    </Path>
 
    <!-- ReportExplorer ContextMenu's -->
 	<Path name ="/SharpReport/ContextMenu/ContextMenu/FieldsExplorer/SectionTreeNode">
 		<MenuItem id="removenodes"
 		          label="${res:SharpReport.FieldsExplorer.ContextMenu.Section.Clear}"
-		          class="SharpReportAddin.Commands.ClearNodes"/>
+		          class="ICSharpCode.Reports.Addin.Commands.ClearNodes"/>
 	</Path>
 	
 	<Path name = "/SharpReport/ContextMenu/ContextMenu/FieldsExplorer/ColumnTreeNode">
 		<MenuItem id="removenode"
 		          label="${res:SharpReport.FieldsExplorer.ContextMenu.Columns.Remove}"
-		          class="SharpReportAddin.Commands.RemoveNode"/>
+		          class="ICSharpCode.Reports.Addin.Commands.RemoveNode"/>
 		<MenuItem id="toggle"
 		          label="${res:SharpReport.FieldsExplorer.ContextMenu.Columns.ToggleSort}"
-		          class="SharpReportAddin.Commands.ToogleOrder"/>
+		          class="ICSharpCode.Reports.Addin.Commands.ToogleOrder"/>
 	</Path>
 	
 	<!-- Start SharpReport from MainMenu -->
@@ -87,8 +76,23 @@
 		          label = "${res:SharpReport.ReportGenerator}"
 		          
 		          shortcut = "Control|Alt|T"
-		          class    = "SharpReportAddin.Commands.RunSharpReport"/>
+		          class    = "ICSharpCode.Reports.Addin.Commands.RunSharpReport"/>
 	</Path>
 
+	<!-- Report wizard -->
+
+	<Path  name = "/ReportGenerator/ReportGeneratorWizard">
+		<DialogPanel id="Base" label = "${res:SharpReport.Wizard.BaseSettings}" class="ICSharpCode.Reports.Addin.ReportWizard.BaseSettingsPanel"/>
+		<DialogPanel id="PushModel" label="${res:SharpReport.Wizard.PushModel}" class="ICSharpCode.Reports.Addin.ReportWizard.PushModelPanel"/>
+		<DialogPanel id="PullModel" label="${res:SharpReport.Wizard.PullModel}" class="ICSharpCode.Reports.Addin.ReportWizard.PullModelPanel"/>
+		<DialogPanel id="QueryResult" label="${res:SharpReport.Wizard.ShowQueryResult}" class ="ICSharpCode.Reports.Addin.ReportWizard.ResultPanel"/>
+	</Path>
+	
+	<!-- ContextMenu Sections -->
+	<!-- Save Data from Resultpanel as *xsd File -->
+	<Path name ="/ReportGenerator/ResultPanel/ContextMenu">
+		<MenuItem id="xsdcomplete" label="${res:SharpReport.Wizard.ResultPanel.SaveXsdComplete}" class="ICSharpCode.Reports.Addin.ReportWizard.WriteXsdComplete"/>
+		<MenuItem id="xsdschema" label="${res:SharpReport.Wizard.ResultPanel.SaveXsdSchemaOnly}" class="ICSharpCode.Reports.Addin.ReportWizard.WriteXsdSchema"/>
+	</Path>
 	
 </AddIn>
diff --git a/AddIns/SharpReport/de/PdfSharp.resources.dll b/AddIns/SharpDevelopReports/de/PdfSharp.resources.dll
similarity index 89%
rename from AddIns/SharpReport/de/PdfSharp.resources.dll
rename to AddIns/SharpDevelopReports/de/PdfSharp.resources.dll
index 5e18021312..9925a18d30 100644
Binary files a/AddIns/SharpReport/de/PdfSharp.resources.dll and b/AddIns/SharpDevelopReports/de/PdfSharp.resources.dll differ
diff --git a/AddIns/SharpReport/ReportGenerator.addin b/AddIns/SharpReport/ReportGenerator.addin
deleted file mode 100644
index 3609c11770..0000000000
--- a/AddIns/SharpReport/ReportGenerator.addin
+++ /dev/null
@@ -1,26 +0,0 @@
-<AddIn name="Wizard for SharpReport"
-       author      = "Forstmeier Peter"
-       copyright   = "GNU General Public License"
-       url         = ""
-       description = "ReportWizard for SharpDevelop">
-	
-	<Runtime>
-		<Import assembly= "ReportGenerator.dll"/>
-	</Runtime>
-	
-	<!-- Dialog Panels -->
-	<Path  name = "/ReportGenerator/ReportGeneratorWizard">
-		<DialogPanel id="Base" label = "${res:SharpReport.Wizard.BaseSettings}" class="ReportGenerator.BaseSettingsPanel"/>
-		<DialogPanel id="PushModel" label="${res:SharpReport.Wizard.PushModel}" class="ReportGenerator.PushModelPanel"/>
-		<DialogPanel id="PullModel" label="${res:SharpReport.Wizard.PullModel}" class="ReportGenerator.PullModelPanel"/>
-		<DialogPanel id="QueryResult" label="${res:SharpReport.Wizard.ShowQueryResult}" class ="ReportGenerator.ResultPanel"/>
-	</Path>
-	
-	<!-- ContextMenu Sections -->
-	<!-- Save Data from Resultpanel as *xsd File -->
-	<Path name ="/ReportGenerator/ResultPanel/ContextMenu">
-		<MenuItem id="xsdcomplete" label="${res:SharpReport.Wizard.ResultPanel.SaveXsdComplete}" class="ReportGenerator.WriteXsdComplete"/>
-		<MenuItem id="xsdschema" label="${res:SharpReport.Wizard.ResultPanel.SaveXsdSchemaOnly}" class="ReportGenerator.WriteXsdSchema"/>
-	</Path>
-
-</AddIn>
diff --git a/src/Setup/Files.wxs b/src/Setup/Files.wxs
index 89fa6aa090..cfb1c61658 100644
--- a/src/Setup/Files.wxs
+++ b/src/Setup/Files.wxs
@@ -1084,27 +1084,20 @@
 											<File Source="..\..\AddIns\AddIns\Misc\SharpQuery\Interop.MSDASC.dll" Name="INTERO_1.DLL" Id="Interop.MSDASC.dll" LongName="Interop.MSDASC.dll" Assembly=".net" AssemblyApplication="Interop.MSDASC.dll" AssemblyManifest="Interop.MSDASC.dll" KeyPath="yes" />
 										</Component>
 									</Directory>
-									<Directory Id="SharpReportFolder" LongName="SharpReport" Name="Report">
-										<Component Guid="FCC330AE-1BA6-49AB-8D75-6B056EEBD00D" Id="SharpReportCoreDll" DiskId="1">
-											<File Source="..\..\AddIns\SharpReport\SharpReportCore.dll" Name="SHARPR_1.DLL" Id="SharpReportCore.dll" LongName="SharpReportCore.dll" Assembly=".net" AssemblyApplication="SharpReportCore.dll" AssemblyManifest="SharpReportCore.dll" KeyPath="yes" />
+									<Directory Id="SharpDevelopReportsFolder" LongName="SharpDevelopReports" Name="Report">
+										<Component Guid="FCC330AE-1BA6-49AB-8D75-6B056EEBD00D" Id="SharpDevelopReportsCoreDll" DiskId="1">
+											<File Source="..\..\AddIns\SharpDevelopReports\ICSharpCode.Reports.Core.dll" Name="SHARPR_1.DLL" Id="ICSharpCode.Reports.Core.dll" LongName="ICSharpCode.Reports.Core.dll" Assembly=".net" AssemblyApplication="ICSharpCode.Reports.Core.dll" AssemblyManifest="ICSharpCode.Reports.Core.dll" KeyPath="yes" />
 										</Component>
-										<Component Id="ReportGeneratorDll" Guid="4A37F852-2BBC-40C5-AF32-6DAB8DB5075A" DiskId="1">
-											<File Source="..\..\AddIns\SharpReport\ReportGenerator.dll" Name="REPORT_1.DLL" Id="ReportGenerator.dll" LongName="ReportGenerator.dll" Assembly=".net" AssemblyApplication="ReportGenerator.dll" AssemblyManifest="ReportGenerator.dll" KeyPath="yes" />
-											<File Source="..\..\AddIns\SharpReport\ReportGenerator.addin" Name="REPORT_1.ADD" Id="ReportGenerator.addin" LongName="ReportGenerator.addin" />
-										</Component>
-										<Component Id="SharpReportDll" Guid="00331644-0A6F-4469-AEE5-2FCEED4F1651" DiskId="1">
-											<File Source="..\..\AddIns\SharpReport\SharpReport.dll" Name="SHARPR_2.DLL" Id="SharpReport.dll" LongName="SharpReport.dll" Assembly=".net" AssemblyApplication="SharpReport.dll" AssemblyManifest="SharpReport.dll" KeyPath="yes" />
-										</Component>
-										<Component Id="SharpReportAddInDll" Guid="9EC747D8-EA22-4C6B-8694-D7FA8029AE46" DiskId="1">
-											<File Source="..\..\AddIns\SharpReport\SharpReportAddin.addin" Name="SHARPR_1.ADD" Id="SharpReportAddin.addin" LongName="SharpReportAddin.addin" />
-											<File Source="..\..\AddIns\SharpReport\SharpReportAddin.dll" Name="SHARPR_3.DLL" Id="SharpReportAddin.dll" LongName="SharpReportAddin.dll" Assembly=".net" AssemblyApplication="SharpReportAddin.dll" AssemblyManifest="SharpReportAddin.dll" KeyPath="yes" />
+										<Component Id="SharpDevelopReportsAddInDll" Guid="4A37F852-2BBC-40C5-AF32-6DAB8DB5075A" DiskId="1">
+											<File Source="..\..\AddIns\SharpDevelopReports\ICSharpCode.Reports.Addin.dll" Name="REPORT_1.DLL" Id="ICSharpCode.Reports.Addin.dll" LongName="ICSharpCode.Reports.Addin.dll" Assembly=".net" AssemblyApplication="ICSharpCode.Reports.Addin.dll" AssemblyManifest="ICSharpCode.Reports.Addin.dll" KeyPath="yes" />
+											<File Source="..\..\AddIns\SharpDevelopReports\ICSharpCode.ReportDesigner.addin" Name="REPORT_1.ADD" Id="ICSharpCode.ReportDesigner.addin" LongName="ICSharpCode.ReportDesigner.addin" />
 										</Component>
 										<Component Guid="2ADD2FE1-C2FA-428E-896A-E1F119408A3D" Id="PdfSharpDll" DiskId="1">
-											<File Source="..\..\AddIns\SharpReport\PdfSharp.dll" Name="PdfSharp.dll" Id="PdfSharp.dll" Assembly=".net" AssemblyApplication="PdfSharp.dll" AssemblyManifest="PdfSharp.dll" KeyPath="yes" LongName="PdfSharp.dll" />
+											<File Source="..\..\AddIns\SharpDevelopReports\PdfSharp.dll" Name="PdfSharp.dll" Id="PdfSharp.dll" Assembly=".net" AssemblyApplication="PdfSharp.dll" AssemblyManifest="PdfSharp.dll" KeyPath="yes" LongName="PdfSharp.dll" />
 										</Component>
 										<Directory Id="PdfSharpResources" Name="de">
 											<Component Guid="DA561136-80BF-464C-8C30-CCFFEFF926B5" Id="PdfSharpDeResources" DiskId="1">
-												<File Source="..\..\AddIns\SharpReport\de\PdfSharp.resources.dll" Name="PDFSHA_1.DLL" Id="PdfSharp.resources.dll" LongName="PdfSharp.resources.dll" AssemblyApplication="PdfSharp.resources.dll" AssemblyManifest="PdfSharp.resources.dll" Assembly=".net" KeyPath="yes" />
+												<File Source="..\..\AddIns\SharpDevelopReports\de\PdfSharp.resources.dll" Name="PDFSHA_1.DLL" Id="PdfSharp.resources.dll" LongName="PdfSharp.resources.dll" AssemblyApplication="PdfSharp.resources.dll" AssemblyManifest="PdfSharp.resources.dll" Assembly=".net" KeyPath="yes" />
 											</Component>
 										</Directory>
 									</Directory>
diff --git a/src/Setup/Setup.wxs b/src/Setup/Setup.wxs
index 829fbe4d25..2f56002b8b 100644
--- a/src/Setup/Setup.wxs
+++ b/src/Setup/Setup.wxs
@@ -317,12 +317,10 @@
 				<ComponentRef Id="ResourceToolkitFiles"/>
 				<ComponentRef Id="SharpQueryDll"/>
 				<ComponentRef Id="SharpQueryInteropMSDASCDll"/>
-				<ComponentRef Id="SharpReportCoreDll"/>
-				<ComponentRef Id="SharpReportDll"/>
-				<ComponentRef Id="ReportGeneratorDll"/>
+				<ComponentRef Id="SharpDevelopReportsCoreDll"/>
+				<ComponentRef Id="SharpDevelopReportsAddInDll"/>
 				<ComponentRef Id="PdfSharpDll"/>
 				<ComponentRef Id="PdfSharpDeResources"/>
-				<ComponentRef Id="SharpReportAddInDll"/>
 				<ComponentRef Id="OracleDbToolsProviderDll"/>
 				<ComponentRef Id="ServerBrowserToolDll"/>
 				<ComponentRef Id="SharpDbToolsDll"/>