diff --git a/pom.xml b/pom.xml
index 873a8d6cff6fd1aadcc485c3ebbb1acf1b8b02cb..f353041eff0f3a6821948a39f2a2660aa62a6357 100644
--- a/pom.xml
+++ b/pom.xml
@@ -49,7 +49,7 @@
 
 	<modules>
 		<module>xchart</module>
-		<module>xchart-examples</module>
+		<module>xchart-demo</module>
 	</modules>
 
 	<dependencies>
diff --git a/xchart-examples/pom.xml b/xchart-demo/pom.xml
similarity index 82%
rename from xchart-examples/pom.xml
rename to xchart-demo/pom.xml
index 489d14965f99f4b44dea02900687002b8b7ebbdc..f7e96ba8131e2ef117f646cb036833fc1490d9a8 100644
--- a/xchart-examples/pom.xml
+++ b/xchart-demo/pom.xml
@@ -9,13 +9,12 @@
 		<version>1.3.0-SNAPSHOT</version>
 	</parent>
 
-	<artifactId>xchart-examples</artifactId>
+	<artifactId>xchart-demo</artifactId>
 	<!-- This version is tied to the version of the parent -->
 	<version>1.3.0-SNAPSHOT</version>
 
-	<name>XChart Examples</name>
-	<description>
-    </description>
+	<name>XChart Demo</name>
+	<description>A demonstration of various charts using XChart</description>
 
 	<dependencies>
 		<dependency>
diff --git a/xchart-examples/src/main/java/com/xeiam/xchart/demo/ChartInfo.java b/xchart-demo/src/main/java/com/xeiam/xchart/demo/ChartInfo.java
similarity index 100%
rename from xchart-examples/src/main/java/com/xeiam/xchart/demo/ChartInfo.java
rename to xchart-demo/src/main/java/com/xeiam/xchart/demo/ChartInfo.java
diff --git a/xchart-examples/src/main/java/com/xeiam/xchart/demo/XChartDemo.java b/xchart-demo/src/main/java/com/xeiam/xchart/demo/XChartDemo.java
similarity index 95%
rename from xchart-examples/src/main/java/com/xeiam/xchart/demo/XChartDemo.java
rename to xchart-demo/src/main/java/com/xeiam/xchart/demo/XChartDemo.java
index 61fa3b9d5b0021f4ab9589c6b6d2db257e215d32..eeb98a1843d8c166029975fa317bba7a01fb92af 100644
--- a/xchart-examples/src/main/java/com/xeiam/xchart/demo/XChartDemo.java
+++ b/xchart-demo/src/main/java/com/xeiam/xchart/demo/XChartDemo.java
@@ -29,7 +29,7 @@ import javax.swing.tree.DefaultMutableTreeNode;
 import javax.swing.tree.TreeSelectionModel;
 
 import com.xeiam.xchart.XChartPanel;
-import com.xeiam.xchart.demo.charts.Example10;
+import com.xeiam.xchart.demo.charts.Example1;
 import com.xeiam.xchart.demo.charts.Example2;
 import com.xeiam.xchart.demo.charts.Example3;
 import com.xeiam.xchart.demo.charts.Example4;
@@ -77,7 +77,7 @@ public class XChartDemo extends JPanel implements TreeSelectionListener {
     JScrollPane treeView = new JScrollPane(tree);
 
     // Create Chart Panel
-    chartPanel = new XChartPanel(new Example10().getChart());
+    chartPanel = new XChartPanel(new Example1().getChart());
 
     // Add the scroll panes to a split pane.
     splitPane = new JSplitPane(JSplitPane.VERTICAL_SPLIT);
@@ -111,6 +111,11 @@ public class XChartDemo extends JPanel implements TreeSelectionListener {
     }
   }
 
+  /**
+   * Create the tree
+   * 
+   * @param top
+   */
   private void createNodes(DefaultMutableTreeNode top) {
 
     // categories
@@ -122,7 +127,7 @@ public class XChartDemo extends JPanel implements TreeSelectionListener {
     category = new DefaultMutableTreeNode("Line Charts");
     top.add(category);
 
-    chart = new DefaultMutableTreeNode(new ChartInfo("Example10 - Manual Data", new Example10().getChart()));
+    chart = new DefaultMutableTreeNode(new ChartInfo("Example1 - Manual Data", new Example1().getChart()));
     category.add(chart);
 
     chart = new DefaultMutableTreeNode(new ChartInfo("Example2 - Customized series style", new Example2().getChart()));
diff --git a/xchart-examples/src/main/java/com/xeiam/xchart/demo/charts/Example10.java b/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/Example1.java
similarity index 97%
rename from xchart-examples/src/main/java/com/xeiam/xchart/demo/charts/Example10.java
rename to xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/Example1.java
index b048a2dc15d9c4100ae70496197b57ebe57b39dc..4a35d8d96f2ffbe22ea4e498874372e39210f4cf 100644
--- a/xchart-examples/src/main/java/com/xeiam/xchart/demo/charts/Example10.java
+++ b/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/Example1.java
@@ -24,15 +24,15 @@ import com.xeiam.xchart.SeriesMarker;
 import com.xeiam.xchart.SwingWrapper;
 
 /**
- * Embed a Chart in a simple Swing application
+ * Manual Data
  * 
  * @author timmolter
  */
-public class Example10 implements ExampleChart {
+public class Example1 implements ExampleChart {
 
   public static void main(String[] args) {
 
-    ExampleChart exampleChart = new Example10();
+    ExampleChart exampleChart = new Example1();
     Chart chart = exampleChart.getChart();
     new SwingWrapper(chart).displayChart();
   }
@@ -74,7 +74,7 @@ public class Example10 implements ExampleChart {
     Chart chart = new Chart(800, 600);
 
     // Customize Chart
-    chart.setTitle("Example10");
+    chart.setTitle("Example1");
     chart.setTitleVisible(false);
     chart.setLegendVisible(false);
 
diff --git a/xchart-examples/src/main/java/com/xeiam/xchart/demo/charts/Example2.java b/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/Example2.java
similarity index 100%
rename from xchart-examples/src/main/java/com/xeiam/xchart/demo/charts/Example2.java
rename to xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/Example2.java
diff --git a/xchart-examples/src/main/java/com/xeiam/xchart/demo/charts/Example3.java b/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/Example3.java
similarity index 100%
rename from xchart-examples/src/main/java/com/xeiam/xchart/demo/charts/Example3.java
rename to xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/Example3.java
diff --git a/xchart-examples/src/main/java/com/xeiam/xchart/demo/charts/Example4.java b/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/Example4.java
similarity index 100%
rename from xchart-examples/src/main/java/com/xeiam/xchart/demo/charts/Example4.java
rename to xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/Example4.java
diff --git a/xchart-examples/src/main/java/com/xeiam/xchart/demo/charts/Example5.java b/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/Example5.java
similarity index 100%
rename from xchart-examples/src/main/java/com/xeiam/xchart/demo/charts/Example5.java
rename to xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/Example5.java
diff --git a/xchart-examples/src/main/java/com/xeiam/xchart/demo/charts/Example6.java b/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/Example6.java
similarity index 100%
rename from xchart-examples/src/main/java/com/xeiam/xchart/demo/charts/Example6.java
rename to xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/Example6.java
diff --git a/xchart-examples/src/main/java/com/xeiam/xchart/demo/charts/Example7.java b/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/Example7.java
similarity index 100%
rename from xchart-examples/src/main/java/com/xeiam/xchart/demo/charts/Example7.java
rename to xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/Example7.java
diff --git a/xchart-examples/src/main/java/com/xeiam/xchart/demo/charts/Example8.java b/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/Example8.java
similarity index 100%
rename from xchart-examples/src/main/java/com/xeiam/xchart/demo/charts/Example8.java
rename to xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/Example8.java
diff --git a/xchart-examples/src/main/java/com/xeiam/xchart/demo/charts/Example9.java b/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/Example9.java
similarity index 100%
rename from xchart-examples/src/main/java/com/xeiam/xchart/demo/charts/Example9.java
rename to xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/Example9.java
diff --git a/xchart-examples/src/main/java/com/xeiam/xchart/demo/charts/ExampleChart.java b/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/ExampleChart.java
similarity index 100%
rename from xchart-examples/src/main/java/com/xeiam/xchart/demo/charts/ExampleChart.java
rename to xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/ExampleChart.java
diff --git a/xchart-examples/src/main/java/com/xeiam/xchart/example/Example0.java b/xchart-demo/src/main/java/com/xeiam/xchart/example/Example0.java
similarity index 100%
rename from xchart-examples/src/main/java/com/xeiam/xchart/example/Example0.java
rename to xchart-demo/src/main/java/com/xeiam/xchart/example/Example0.java
diff --git a/xchart-examples/src/main/java/com/xeiam/xchart/example/Example1.java b/xchart-demo/src/main/java/com/xeiam/xchart/example/Example1.java
similarity index 100%
rename from xchart-examples/src/main/java/com/xeiam/xchart/example/Example1.java
rename to xchart-demo/src/main/java/com/xeiam/xchart/example/Example1.java
diff --git a/xchart-examples/src/main/java/com/xeiam/xchart/example/Example2.java b/xchart-demo/src/main/java/com/xeiam/xchart/example/Example2.java
similarity index 100%
rename from xchart-examples/src/main/java/com/xeiam/xchart/example/Example2.java
rename to xchart-demo/src/main/java/com/xeiam/xchart/example/Example2.java
diff --git a/xchart/pom.xml b/xchart/pom.xml
index bd6339f1655123a395a371bc5112a34ab4ffd9fb..47aa4387bb0121cdfcfeea37c154cb2d709c2836 100644
--- a/xchart/pom.xml
+++ b/xchart/pom.xml
@@ -14,7 +14,6 @@
 	<version>1.3.0-SNAPSHOT</version>
 
 	<name>XChart</name>
-	<description>
-    </description>
+	<description>The core XChart library</description>
 
 </project>