diff --git a/examples/org.eclipse.rap.addons.chart.demo/src/org/eclipse/rap/addons/chart/nv/demo/BarChartSnippet.java b/examples/org.eclipse.rap.addons.chart.demo/src/org/eclipse/rap/addons/chart/demo/BarChartSnippet.java
similarity index 95%
rename from examples/org.eclipse.rap.addons.chart.demo/src/org/eclipse/rap/addons/chart/nv/demo/BarChartSnippet.java
rename to examples/org.eclipse.rap.addons.chart.demo/src/org/eclipse/rap/addons/chart/demo/BarChartSnippet.java
index ae9875c..4f983bf 100644
--- a/examples/org.eclipse.rap.addons.chart.demo/src/org/eclipse/rap/addons/chart/nv/demo/BarChartSnippet.java
+++ b/examples/org.eclipse.rap.addons.chart.demo/src/org/eclipse/rap/addons/chart/demo/BarChartSnippet.java
@@ -8,9 +8,9 @@
  * Contributors:
  *    Ralf Sternberg - initial API and implementation
  ******************************************************************************/
-package org.eclipse.rap.addons.chart.nv.demo;
+package org.eclipse.rap.addons.chart.demo;
 
-import static org.eclipse.rap.addons.chart.nv.demo.Colors.CAT10_COLORS;
+import static org.eclipse.rap.addons.chart.demo.Colors.CAT10_COLORS;
 
 import org.eclipse.rap.addons.chart.basic.BarChart;
 import org.eclipse.rap.addons.chart.basic.BarItem;
diff --git a/examples/org.eclipse.rap.addons.chart.demo/src/org/eclipse/rap/addons/chart/nv/demo/ChartSnippetPage.java b/examples/org.eclipse.rap.addons.chart.demo/src/org/eclipse/rap/addons/chart/demo/ChartSnippetPage.java
similarity index 97%
rename from examples/org.eclipse.rap.addons.chart.demo/src/org/eclipse/rap/addons/chart/nv/demo/ChartSnippetPage.java
rename to examples/org.eclipse.rap.addons.chart.demo/src/org/eclipse/rap/addons/chart/demo/ChartSnippetPage.java
index 76ebc92..50c1c43 100644
--- a/examples/org.eclipse.rap.addons.chart.demo/src/org/eclipse/rap/addons/chart/nv/demo/ChartSnippetPage.java
+++ b/examples/org.eclipse.rap.addons.chart.demo/src/org/eclipse/rap/addons/chart/demo/ChartSnippetPage.java
@@ -8,7 +8,7 @@
  * Contributors:
  *    Ralf Sternberg - initial API and implementation
  ******************************************************************************/
-package org.eclipse.rap.addons.chart.nv.demo;
+package org.eclipse.rap.addons.chart.demo;
 
 import org.eclipse.rap.rwt.application.AbstractEntryPoint;
 import org.eclipse.swt.SWT;
diff --git a/examples/org.eclipse.rap.addons.chart.demo/src/org/eclipse/rap/addons/chart/nv/demo/Colors.java b/examples/org.eclipse.rap.addons.chart.demo/src/org/eclipse/rap/addons/chart/demo/Colors.java
similarity index 95%
rename from examples/org.eclipse.rap.addons.chart.demo/src/org/eclipse/rap/addons/chart/nv/demo/Colors.java
rename to examples/org.eclipse.rap.addons.chart.demo/src/org/eclipse/rap/addons/chart/demo/Colors.java
index 4ba69d8..ec9648b 100644
--- a/examples/org.eclipse.rap.addons.chart.demo/src/org/eclipse/rap/addons/chart/nv/demo/Colors.java
+++ b/examples/org.eclipse.rap.addons.chart.demo/src/org/eclipse/rap/addons/chart/demo/Colors.java
@@ -8,7 +8,7 @@
  * Contributors:
  *    Ralf Sternberg - initial API and implementation
  ******************************************************************************/
-package org.eclipse.rap.addons.chart.nv.demo;
+package org.eclipse.rap.addons.chart.demo;
 
 import org.eclipse.swt.graphics.RGB;
 
diff --git a/examples/org.eclipse.rap.addons.chart.demo/src/org/eclipse/rap/addons/chart/nv/demo/LineChartSnippet.java b/examples/org.eclipse.rap.addons.chart.demo/src/org/eclipse/rap/addons/chart/demo/LineChartSnippet.java
similarity index 95%
rename from examples/org.eclipse.rap.addons.chart.demo/src/org/eclipse/rap/addons/chart/nv/demo/LineChartSnippet.java
rename to examples/org.eclipse.rap.addons.chart.demo/src/org/eclipse/rap/addons/chart/demo/LineChartSnippet.java
index 0e391b3..895d96c 100644
--- a/examples/org.eclipse.rap.addons.chart.demo/src/org/eclipse/rap/addons/chart/nv/demo/LineChartSnippet.java
+++ b/examples/org.eclipse.rap.addons.chart.demo/src/org/eclipse/rap/addons/chart/demo/LineChartSnippet.java
@@ -8,9 +8,9 @@
  * Contributors:
  *    Ralf Sternberg - initial API and implementation
  ******************************************************************************/
-package org.eclipse.rap.addons.chart.nv.demo;
+package org.eclipse.rap.addons.chart.demo;
 
-import static org.eclipse.rap.addons.chart.nv.demo.Colors.CAT10_COLORS;
+import static org.eclipse.rap.addons.chart.demo.Colors.CAT10_COLORS;
 
 import org.eclipse.rap.addons.chart.basic.DataPoint;
 import org.eclipse.rap.addons.chart.basic.LineChart;
diff --git a/examples/org.eclipse.rap.addons.chart.demo/src/org/eclipse/rap/addons/chart/nv/demo/PieChartSnippet.java b/examples/org.eclipse.rap.addons.chart.demo/src/org/eclipse/rap/addons/chart/demo/PieChartSnippet.java
similarity index 95%
rename from examples/org.eclipse.rap.addons.chart.demo/src/org/eclipse/rap/addons/chart/nv/demo/PieChartSnippet.java
rename to examples/org.eclipse.rap.addons.chart.demo/src/org/eclipse/rap/addons/chart/demo/PieChartSnippet.java
index 0463f9d..dc93701 100644
--- a/examples/org.eclipse.rap.addons.chart.demo/src/org/eclipse/rap/addons/chart/nv/demo/PieChartSnippet.java
+++ b/examples/org.eclipse.rap.addons.chart.demo/src/org/eclipse/rap/addons/chart/demo/PieChartSnippet.java
@@ -8,12 +8,13 @@
  * Contributors:
  *    Ralf Sternberg - initial API and implementation
  ******************************************************************************/
-package org.eclipse.rap.addons.chart.nv.demo;
+package org.eclipse.rap.addons.chart.demo;
 
 
-import static org.eclipse.rap.addons.chart.nv.demo.Colors.CAT10_COLORS;
-
 import org.eclipse.rap.addons.chart.basic.PieItem;
+
+import static org.eclipse.rap.addons.chart.demo.Colors.CAT10_COLORS;
+
 import org.eclipse.rap.addons.chart.basic.PieChart;
 import org.eclipse.rap.rwt.application.AbstractEntryPoint;
 import org.eclipse.swt.SWT;
diff --git a/examples/org.eclipse.rap.addons.chart.demo/src/org/eclipse/rap/addons/chart/demo/internal/ChartExamplePage.java b/examples/org.eclipse.rap.addons.chart.demo/src/org/eclipse/rap/addons/chart/demo/internal/ChartExamplePage.java
index 0ee080e..e8c44c5 100644
--- a/examples/org.eclipse.rap.addons.chart.demo/src/org/eclipse/rap/addons/chart/demo/internal/ChartExamplePage.java
+++ b/examples/org.eclipse.rap.addons.chart.demo/src/org/eclipse/rap/addons/chart/demo/internal/ChartExamplePage.java
@@ -10,7 +10,7 @@
  ******************************************************************************/
 package org.eclipse.rap.addons.chart.demo.internal;
 
-import org.eclipse.rap.addons.chart.nv.demo.ChartSnippetPage;
+import org.eclipse.rap.addons.chart.demo.ChartSnippetPage;
 import org.eclipse.rap.examples.IExamplePage;
 import org.eclipse.swt.widgets.Composite;