diff --git a/org.eclipse.mylyn.monitor.reports/META-INF/MANIFEST.MF b/org.eclipse.mylyn.monitor.reports/META-INF/MANIFEST.MF
index c461ac2..ab1d577 100644
--- a/org.eclipse.mylyn.monitor.reports/META-INF/MANIFEST.MF
+++ b/org.eclipse.mylyn.monitor.reports/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Mylar Monitor Reports Plug-in
 Bundle-SymbolicName: org.eclipse.mylar.monitor.reports; singleton:=true
-Bundle-Version: 0.4.0
+Bundle-Version: 0.4.1
 Bundle-Activator: org.eclipse.mylar.monitor.reports.MylarReportsPlugin
 Bundle-Vendor: Eclipse.org
 Bundle-Localization: plugin
diff --git a/org.eclipse.mylyn.monitor.reports/plugin.xml b/org.eclipse.mylyn.monitor.reports/plugin.xml
index 15bdde0..832f010 100644
--- a/org.eclipse.mylyn.monitor.reports/plugin.xml
+++ b/org.eclipse.mylyn.monitor.reports/plugin.xml
@@ -2,86 +2,7 @@
 <?eclipse version="3.0"?>
 <?eclipse version="3.0"?>
 <plugin>
-   <extension point = "org.eclipse.ui.popupMenus">
-     <viewerContribution
-        id="org.eclipse.mylar.monitor.commands"
-        targetID="org.eclipse.jdt.ui.PackageExplorer">
-	    <action  
-  		  	label="Mylar Reports: Usage Summary" 
-	  		tooltip="Mylar Reports: Usage Summary"
-	  		menubarPath="mylar.monitor" 
-	  		id="org.eclipse.mylar.monitor.reports.ui.actions.ComputeSummaryAction" 
-	  		class="org.eclipse.mylar.monitor.reports.ui.actions.UsageSummaryAction"
-	  		icon="icons/eview16/monitor.gif"
-	  		enablesFor="*"/>   
-	  	<action  
-  		  	label="Mylar Reports: User Analysis" 
-	  		tooltip="Mylar Reports: User Analysis"
-	  		menubarPath="mylar.monitor" 
-	  		id="org.eclipse.mylar.monitor.reports.ui.actions.ComputeSummaryAction" 
-	  		class="org.eclipse.mylar.monitor.reports.ui.actions.UserAnalysisAction"
-	  		icon="icons/eview16/monitor.gif"
-	  		enablesFor="*"/>   
-	 </viewerContribution> 
-	 <viewerContribution
-        id="org.eclipse.mylar.monitor.commands"
-        targetID="org.eclipse.ui.views.ResourceNavigator">
-	    <action  
-  		  	label="Mylar Reports: Usage Summary" 
-	  		tooltip="Mylar Reports: Usage Summary"
-	  		menubarPath="mylar.monitor" 
-	  		id="org.eclipse.mylar.monitor.reports.ui.actions.ComputeSummaryAction" 
-	  		class="org.eclipse.mylar.monitor.reports.ui.actions.UsageSummaryAction"
-	  		icon="icons/eview16/monitor.gif"
-	  		enablesFor="*"/>   
-	  		    <action  
-  		  	label="Mylar Reports: User Analysis" 
-	  		tooltip="Mylar Reports: User Analysis"
-	  		menubarPath="mylar.monitor" 
-	  		id="org.eclipse.mylar.monitor.reports.ui.actions.ComputeSummaryAction" 
-	  		class="org.eclipse.mylar.monitor.reports.ui.actions.UserAnalysisAction"
-	  		icon="icons/eview16/monitor.gif"
-	  		enablesFor="*"/>   
-	 </viewerContribution> 
-   </extension>
-	  		
-	<extension
-        point="org.eclipse.ui.editors">
-     <editor
-           icon="icons/eview16/monitor.gif"
-           class="org.eclipse.mylar.monitor.reports.ui.views.UsageStatsEditorPart"
-           name="Usage Summary"
-           id="org.eclipse.mylar.monitor.reports.ui.actions.monitorSummaryReport"/>
-     <editor
-           icon="icons/eview16/monitor.gif"
-           class="org.eclipse.mylar.monitor.reports.ui.views.UsageStatsEditorPart"
-           name="User Analysis"
-           id="org.eclipse.mylar.monitor.reports.ui.actions.monitorUsersReport"/>
-  </extension>
-  
-   <extension point="org.eclipse.ui.viewActions"> 
-   <viewContribution
-         id="org.eclipse.mylar.monitor.reports.ui.switchTaskFolder"
-         targetID="org.eclipse.mylar.tasks.ui.views.TaskListView">
-      <action
-            class="org.eclipse.mylar.monitor.reports.ui.actions.SwitchTaskDataFolderAction"
-            icon="icons/eview16/folder.gif"
-            id="org.eclipse.mylar.monitor.reports.ui.actions.switchTask"
-            label="Switch Task Data Folder..."
-            menubarPath="context"
-            style="push">
-      </action>
-   </viewContribution>
-   </extension>
-  
-   <extension point="org.eclipse.ui.preferencePages">
-      <page 
-         name="Reports"
-         class="org.eclipse.mylar.monitor.reports.preferences.MylarReportsPreferencePage"
-         id="org.eclipse.mylar.monitor.reports"
-         category="org.eclipse.mylar.ui.preferences">
-      </page>  
-   </extension>
+   
 </plugin>
 
         <!--
diff --git a/org.eclipse.mylyn.sandbox.ui/META-INF/MANIFEST.MF b/org.eclipse.mylyn.sandbox.ui/META-INF/MANIFEST.MF
index 0f06023..a406bc5 100644
--- a/org.eclipse.mylyn.sandbox.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.mylyn.sandbox.ui/META-INF/MANIFEST.MF
@@ -16,7 +16,8 @@
  org.eclipse.mylar.zest.layouts,
  org.eclipse.mylar.tasklist,
  org.eclipse.core.resources,
- org.eclipse.ui.browser
+ org.eclipse.ui.browser,
+ org.eclipse.mylar.monitor.reports
 Eclipse-AutoStart: true
 Bundle-Vendor: Eclipse.org
 Bundle-ClassPath: mylar-sandbox.jar
diff --git a/org.eclipse.mylyn.monitor.reports/icons/eview16/folder.gif b/org.eclipse.mylyn.sandbox.ui/icons/eview16/folder.gif
similarity index 100%
rename from org.eclipse.mylyn.monitor.reports/icons/eview16/folder.gif
rename to org.eclipse.mylyn.sandbox.ui/icons/eview16/folder.gif
Binary files differ
diff --git a/org.eclipse.mylyn.monitor.reports/icons/eview16/monitor.gif b/org.eclipse.mylyn.sandbox.ui/icons/eview16/monitor.gif
similarity index 100%
rename from org.eclipse.mylyn.monitor.reports/icons/eview16/monitor.gif
rename to org.eclipse.mylyn.sandbox.ui/icons/eview16/monitor.gif
Binary files differ
diff --git a/org.eclipse.mylyn.monitor.reports/icons/eview16/task-list.gif b/org.eclipse.mylyn.sandbox.ui/icons/eview16/task-list.gif
similarity index 100%
rename from org.eclipse.mylyn.monitor.reports/icons/eview16/task-list.gif
rename to org.eclipse.mylyn.sandbox.ui/icons/eview16/task-list.gif
Binary files differ
diff --git a/org.eclipse.mylyn.sandbox.ui/plugin.xml b/org.eclipse.mylyn.sandbox.ui/plugin.xml
index 645a6aa..83f002a 100644
--- a/org.eclipse.mylyn.sandbox.ui/plugin.xml
+++ b/org.eclipse.mylyn.sandbox.ui/plugin.xml
@@ -50,6 +50,88 @@
       </view>
   </extension> 
   
+  
+  <extension point = "org.eclipse.ui.popupMenus">
+     <viewerContribution
+        id="org.eclipse.mylar.monitor.commands"
+        targetID="org.eclipse.jdt.ui.PackageExplorer">
+	    <action  
+  		  	label="Mylar Reports: Usage Summary" 
+	  		tooltip="Mylar Reports: Usage Summary"
+	  		menubarPath="mylar.monitor" 
+	  		id="org.eclipse.mylar.monitor.reports.ui.actions.ComputeSummaryAction" 
+	  		class="org.eclipse.mylar.monitor.reports.ui.actions.UsageSummaryAction"
+	  		icon="icons/eview16/monitor.gif"
+	  		enablesFor="*"/>   
+	  	<action  
+  		  	label="Mylar Reports: User Analysis" 
+	  		tooltip="Mylar Reports: User Analysis"
+	  		menubarPath="mylar.monitor" 
+	  		id="org.eclipse.mylar.monitor.reports.ui.actions.ComputeSummaryAction" 
+	  		class="org.eclipse.mylar.monitor.reports.ui.actions.UserAnalysisAction"
+	  		icon="icons/eview16/monitor.gif"
+	  		enablesFor="*"/>   
+	 </viewerContribution> 
+	 <viewerContribution
+        id="org.eclipse.mylar.monitor.commands"
+        targetID="org.eclipse.ui.views.ResourceNavigator">
+	    <action  
+  		  	label="Mylar Reports: Usage Summary" 
+	  		tooltip="Mylar Reports: Usage Summary"
+	  		menubarPath="mylar.monitor" 
+	  		id="org.eclipse.mylar.monitor.reports.ui.actions.ComputeSummaryAction" 
+	  		class="org.eclipse.mylar.monitor.reports.ui.actions.UsageSummaryAction"
+	  		icon="icons/eview16/monitor.gif"
+	  		enablesFor="*"/>   
+	  		    <action  
+  		  	label="Mylar Reports: User Analysis" 
+	  		tooltip="Mylar Reports: User Analysis"
+	  		menubarPath="mylar.monitor" 
+	  		id="org.eclipse.mylar.monitor.reports.ui.actions.ComputeSummaryAction" 
+	  		class="org.eclipse.mylar.monitor.reports.ui.actions.UserAnalysisAction"
+	  		icon="icons/eview16/monitor.gif"
+	  		enablesFor="*"/>   
+	 </viewerContribution> 
+   </extension>
+	  		
+	<extension
+        point="org.eclipse.ui.editors">
+     <editor
+           icon="icons/eview16/monitor.gif"
+           class="org.eclipse.mylar.monitor.reports.ui.views.UsageStatsEditorPart"
+           name="Usage Summary"
+           id="org.eclipse.mylar.monitor.reports.ui.actions.monitorSummaryReport"/>
+     <editor
+           icon="icons/eview16/monitor.gif"
+           class="org.eclipse.mylar.monitor.reports.ui.views.UsageStatsEditorPart"
+           name="User Analysis"
+           id="org.eclipse.mylar.monitor.reports.ui.actions.monitorUsersReport"/>
+  </extension>
+  
+   <extension point="org.eclipse.ui.viewActions"> 
+   <viewContribution
+         id="org.eclipse.mylar.monitor.reports.ui.switchTaskFolder"
+         targetID="org.eclipse.mylar.tasks.ui.views.TaskListView">
+      <action
+            class="org.eclipse.mylar.monitor.reports.ui.actions.SwitchTaskDataFolderAction"
+            icon="icons/eview16/folder.gif"
+            id="org.eclipse.mylar.monitor.reports.ui.actions.switchTask"
+            label="Switch Task Data Folder..."
+            menubarPath="context"
+            style="push">
+      </action>
+   </viewContribution>
+   </extension>
+  
+   <extension point="org.eclipse.ui.preferencePages">
+      <page 
+         name="Reports"
+         class="org.eclipse.mylar.monitor.reports.preferences.MylarReportsPreferencePage"
+         id="org.eclipse.mylar.monitor.reports"
+         category="org.eclipse.mylar.ui.preferences">
+      </page>  
+   </extension>
+  
       <!--
         <provider 
          	markupProviderClass="org.eclipse.mylar.sandbox.viz.MylarJavaMarkupProvider"