--- a/core/com.nokia.carbide.cpp/META-INF/MANIFEST.MF	Mon Sep 13 16:08:36 2010 -0500
+++ b/core/com.nokia.carbide.cpp/META-INF/MANIFEST.MF	Mon Sep 13 16:38:53 2010 -0500
@@ -14,7 +14,7 @@
  org.eclipse.core.filesystem,
  org.eclipse.ui.ide,
  org.eclipse.cdt.core,
- com.nokia.carbide.discovery.ui;bundle-version="1.0.0",
+ com.nokia.carbide.discovery.ui;bundle-version="3.0.0",
  org.eclipse.equinox.p2.ui;bundle-version="2.0.0"
 Bundle-ActivationPolicy: lazy
 Export-Package: com.nokia.carbide.cpp,

--- a/core/com.nokia.carbide.cpp/src/com/nokia/carbide/cpp/ProductPlugin.java	Mon Sep 13 16:08:36 2010 -0500
+++ b/core/com.nokia.carbide.cpp/src/com/nokia/carbide/cpp/ProductPlugin.java	Mon Sep 13 16:38:53 2010 -0500
@@ -22,11 +22,12 @@
 import org.eclipse.ui.plugin.AbstractUIPlugin;
 import org.osgi.framework.BundleContext;
 
-import com.nokia.carbide.internal.discovery.ui.wizard.P2Utils;
+import com.nokia.carbide.internal.discovery.ui.p2.P2Utils;
 
 /**
  * The main plugin class to be used in the desktop.
  */
+@SuppressWarnings("restriction")
 public class ProductPlugin extends AbstractUIPlugin {
 
 	//The shared instance.