diff --git a/pom.xml b/pom.xml
index 1931ddfc7e6140a440eee5e5e0e51f448dfbe280..a11216d55327006484a32b7de3dab3feb8eb57a8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -48,7 +48,7 @@
 	</ciManagement>
 
 	<modules>
-		<module>xchart-core</module>
+		<module>xchart</module>
 		<module>xchart-examples</module>
 	</modules>
 
diff --git a/xchart-core/pom.xml b/xchart/pom.xml
similarity index 93%
rename from xchart-core/pom.xml
rename to xchart/pom.xml
index d22f55b932993e52231955b951bb7e940e96df7f..173fd3e4681503af2d5c72ee71dbd9bb7142acd4 100644
--- a/xchart-core/pom.xml
+++ b/xchart/pom.xml
@@ -9,7 +9,7 @@
 		<version>1.3.0-SNAPSHOT</version>
 	</parent>
 
-	<artifactId>xchart-core</artifactId>
+	<artifactId>xchart</artifactId>
 	<!-- This version is tied to the version of the parent -->
 	<version>1.3.0-SNAPSHOT</version>
 
diff --git a/xchart-core/src/main/java/com/xeiam/xchart/BitmapEncoder.java b/xchart/src/main/java/com/xeiam/xchart/BitmapEncoder.java
similarity index 100%
rename from xchart-core/src/main/java/com/xeiam/xchart/BitmapEncoder.java
rename to xchart/src/main/java/com/xeiam/xchart/BitmapEncoder.java
diff --git a/xchart-core/src/main/java/com/xeiam/xchart/Chart.java b/xchart/src/main/java/com/xeiam/xchart/Chart.java
similarity index 100%
rename from xchart-core/src/main/java/com/xeiam/xchart/Chart.java
rename to xchart/src/main/java/com/xeiam/xchart/Chart.java
diff --git a/xchart-core/src/main/java/com/xeiam/xchart/ChartColor.java b/xchart/src/main/java/com/xeiam/xchart/ChartColor.java
similarity index 100%
rename from xchart-core/src/main/java/com/xeiam/xchart/ChartColor.java
rename to xchart/src/main/java/com/xeiam/xchart/ChartColor.java
diff --git a/xchart-core/src/main/java/com/xeiam/xchart/QuickChart.java b/xchart/src/main/java/com/xeiam/xchart/QuickChart.java
similarity index 100%
rename from xchart-core/src/main/java/com/xeiam/xchart/QuickChart.java
rename to xchart/src/main/java/com/xeiam/xchart/QuickChart.java
diff --git a/xchart-core/src/main/java/com/xeiam/xchart/Series.java b/xchart/src/main/java/com/xeiam/xchart/Series.java
similarity index 100%
rename from xchart-core/src/main/java/com/xeiam/xchart/Series.java
rename to xchart/src/main/java/com/xeiam/xchart/Series.java
diff --git a/xchart-core/src/main/java/com/xeiam/xchart/SeriesColor.java b/xchart/src/main/java/com/xeiam/xchart/SeriesColor.java
similarity index 100%
rename from xchart-core/src/main/java/com/xeiam/xchart/SeriesColor.java
rename to xchart/src/main/java/com/xeiam/xchart/SeriesColor.java
diff --git a/xchart-core/src/main/java/com/xeiam/xchart/SeriesLineStyle.java b/xchart/src/main/java/com/xeiam/xchart/SeriesLineStyle.java
similarity index 100%
rename from xchart-core/src/main/java/com/xeiam/xchart/SeriesLineStyle.java
rename to xchart/src/main/java/com/xeiam/xchart/SeriesLineStyle.java
diff --git a/xchart-core/src/main/java/com/xeiam/xchart/SeriesMarker.java b/xchart/src/main/java/com/xeiam/xchart/SeriesMarker.java
similarity index 100%
rename from xchart-core/src/main/java/com/xeiam/xchart/SeriesMarker.java
rename to xchart/src/main/java/com/xeiam/xchart/SeriesMarker.java
diff --git a/xchart-core/src/main/java/com/xeiam/xchart/SwingWrapper.java b/xchart/src/main/java/com/xeiam/xchart/SwingWrapper.java
similarity index 100%
rename from xchart-core/src/main/java/com/xeiam/xchart/SwingWrapper.java
rename to xchart/src/main/java/com/xeiam/xchart/SwingWrapper.java
diff --git a/xchart-core/src/main/java/com/xeiam/xchart/XChartPanel.java b/xchart/src/main/java/com/xeiam/xchart/XChartPanel.java
similarity index 100%
rename from xchart-core/src/main/java/com/xeiam/xchart/XChartPanel.java
rename to xchart/src/main/java/com/xeiam/xchart/XChartPanel.java
diff --git a/xchart-core/src/main/java/com/xeiam/xchart/internal/chartpart/Axis.java b/xchart/src/main/java/com/xeiam/xchart/internal/chartpart/Axis.java
similarity index 100%
rename from xchart-core/src/main/java/com/xeiam/xchart/internal/chartpart/Axis.java
rename to xchart/src/main/java/com/xeiam/xchart/internal/chartpart/Axis.java
diff --git a/xchart-core/src/main/java/com/xeiam/xchart/internal/chartpart/AxisPair.java b/xchart/src/main/java/com/xeiam/xchart/internal/chartpart/AxisPair.java
similarity index 100%
rename from xchart-core/src/main/java/com/xeiam/xchart/internal/chartpart/AxisPair.java
rename to xchart/src/main/java/com/xeiam/xchart/internal/chartpart/AxisPair.java
diff --git a/xchart-core/src/main/java/com/xeiam/xchart/internal/chartpart/AxisTick.java b/xchart/src/main/java/com/xeiam/xchart/internal/chartpart/AxisTick.java
similarity index 100%
rename from xchart-core/src/main/java/com/xeiam/xchart/internal/chartpart/AxisTick.java
rename to xchart/src/main/java/com/xeiam/xchart/internal/chartpart/AxisTick.java
diff --git a/xchart-core/src/main/java/com/xeiam/xchart/internal/chartpart/AxisTickLabels.java b/xchart/src/main/java/com/xeiam/xchart/internal/chartpart/AxisTickLabels.java
similarity index 100%
rename from xchart-core/src/main/java/com/xeiam/xchart/internal/chartpart/AxisTickLabels.java
rename to xchart/src/main/java/com/xeiam/xchart/internal/chartpart/AxisTickLabels.java
diff --git a/xchart-core/src/main/java/com/xeiam/xchart/internal/chartpart/AxisTickMarks.java b/xchart/src/main/java/com/xeiam/xchart/internal/chartpart/AxisTickMarks.java
similarity index 100%
rename from xchart-core/src/main/java/com/xeiam/xchart/internal/chartpart/AxisTickMarks.java
rename to xchart/src/main/java/com/xeiam/xchart/internal/chartpart/AxisTickMarks.java
diff --git a/xchart-core/src/main/java/com/xeiam/xchart/internal/chartpart/AxisTitle.java b/xchart/src/main/java/com/xeiam/xchart/internal/chartpart/AxisTitle.java
similarity index 100%
rename from xchart-core/src/main/java/com/xeiam/xchart/internal/chartpart/AxisTitle.java
rename to xchart/src/main/java/com/xeiam/xchart/internal/chartpart/AxisTitle.java
diff --git a/xchart-core/src/main/java/com/xeiam/xchart/internal/chartpart/ChartTitle.java b/xchart/src/main/java/com/xeiam/xchart/internal/chartpart/ChartTitle.java
similarity index 100%
rename from xchart-core/src/main/java/com/xeiam/xchart/internal/chartpart/ChartTitle.java
rename to xchart/src/main/java/com/xeiam/xchart/internal/chartpart/ChartTitle.java
diff --git a/xchart-core/src/main/java/com/xeiam/xchart/internal/chartpart/Legend.java b/xchart/src/main/java/com/xeiam/xchart/internal/chartpart/Legend.java
similarity index 100%
rename from xchart-core/src/main/java/com/xeiam/xchart/internal/chartpart/Legend.java
rename to xchart/src/main/java/com/xeiam/xchart/internal/chartpart/Legend.java
diff --git a/xchart-core/src/main/java/com/xeiam/xchart/internal/chartpart/Plot.java b/xchart/src/main/java/com/xeiam/xchart/internal/chartpart/Plot.java
similarity index 100%
rename from xchart-core/src/main/java/com/xeiam/xchart/internal/chartpart/Plot.java
rename to xchart/src/main/java/com/xeiam/xchart/internal/chartpart/Plot.java
diff --git a/xchart-core/src/main/java/com/xeiam/xchart/internal/chartpart/PlotContent.java b/xchart/src/main/java/com/xeiam/xchart/internal/chartpart/PlotContent.java
similarity index 100%
rename from xchart-core/src/main/java/com/xeiam/xchart/internal/chartpart/PlotContent.java
rename to xchart/src/main/java/com/xeiam/xchart/internal/chartpart/PlotContent.java
diff --git a/xchart-core/src/main/java/com/xeiam/xchart/internal/chartpart/PlotSurface.java b/xchart/src/main/java/com/xeiam/xchart/internal/chartpart/PlotSurface.java
similarity index 100%
rename from xchart-core/src/main/java/com/xeiam/xchart/internal/chartpart/PlotSurface.java
rename to xchart/src/main/java/com/xeiam/xchart/internal/chartpart/PlotSurface.java
diff --git a/xchart-core/src/main/java/com/xeiam/xchart/internal/interfaces/IChartPart.java b/xchart/src/main/java/com/xeiam/xchart/internal/interfaces/IChartPart.java
similarity index 100%
rename from xchart-core/src/main/java/com/xeiam/xchart/internal/interfaces/IChartPart.java
rename to xchart/src/main/java/com/xeiam/xchart/internal/interfaces/IChartPart.java
diff --git a/xchart-core/src/main/java/com/xeiam/xchart/internal/interfaces/IHideable.java b/xchart/src/main/java/com/xeiam/xchart/internal/interfaces/IHideable.java
similarity index 100%
rename from xchart-core/src/main/java/com/xeiam/xchart/internal/interfaces/IHideable.java
rename to xchart/src/main/java/com/xeiam/xchart/internal/interfaces/IHideable.java
diff --git a/xchart-core/src/main/java/com/xeiam/xchart/internal/markers/Circle.java b/xchart/src/main/java/com/xeiam/xchart/internal/markers/Circle.java
similarity index 100%
rename from xchart-core/src/main/java/com/xeiam/xchart/internal/markers/Circle.java
rename to xchart/src/main/java/com/xeiam/xchart/internal/markers/Circle.java
diff --git a/xchart-core/src/main/java/com/xeiam/xchart/internal/markers/Diamond.java b/xchart/src/main/java/com/xeiam/xchart/internal/markers/Diamond.java
similarity index 100%
rename from xchart-core/src/main/java/com/xeiam/xchart/internal/markers/Diamond.java
rename to xchart/src/main/java/com/xeiam/xchart/internal/markers/Diamond.java
diff --git a/xchart-core/src/main/java/com/xeiam/xchart/internal/markers/Marker.java b/xchart/src/main/java/com/xeiam/xchart/internal/markers/Marker.java
similarity index 100%
rename from xchart-core/src/main/java/com/xeiam/xchart/internal/markers/Marker.java
rename to xchart/src/main/java/com/xeiam/xchart/internal/markers/Marker.java
diff --git a/xchart-core/src/main/java/com/xeiam/xchart/internal/markers/Square.java b/xchart/src/main/java/com/xeiam/xchart/internal/markers/Square.java
similarity index 100%
rename from xchart-core/src/main/java/com/xeiam/xchart/internal/markers/Square.java
rename to xchart/src/main/java/com/xeiam/xchart/internal/markers/Square.java
diff --git a/xchart-core/src/main/java/com/xeiam/xchart/internal/markers/TriangleDown.java b/xchart/src/main/java/com/xeiam/xchart/internal/markers/TriangleDown.java
similarity index 100%
rename from xchart-core/src/main/java/com/xeiam/xchart/internal/markers/TriangleDown.java
rename to xchart/src/main/java/com/xeiam/xchart/internal/markers/TriangleDown.java
diff --git a/xchart-core/src/main/java/com/xeiam/xchart/internal/markers/TriangleUp.java b/xchart/src/main/java/com/xeiam/xchart/internal/markers/TriangleUp.java
similarity index 100%
rename from xchart-core/src/main/java/com/xeiam/xchart/internal/markers/TriangleUp.java
rename to xchart/src/main/java/com/xeiam/xchart/internal/markers/TriangleUp.java
diff --git a/xchart-core/src/main/java/com/xeiam/xchart/internal/misc/SeriesColorMarkerLineStyle.java b/xchart/src/main/java/com/xeiam/xchart/internal/misc/SeriesColorMarkerLineStyle.java
similarity index 100%
rename from xchart-core/src/main/java/com/xeiam/xchart/internal/misc/SeriesColorMarkerLineStyle.java
rename to xchart/src/main/java/com/xeiam/xchart/internal/misc/SeriesColorMarkerLineStyle.java
diff --git a/xchart-core/src/main/java/com/xeiam/xchart/internal/misc/SeriesColorMarkerLineStyleCycler.java b/xchart/src/main/java/com/xeiam/xchart/internal/misc/SeriesColorMarkerLineStyleCycler.java
similarity index 100%
rename from xchart-core/src/main/java/com/xeiam/xchart/internal/misc/SeriesColorMarkerLineStyleCycler.java
rename to xchart/src/main/java/com/xeiam/xchart/internal/misc/SeriesColorMarkerLineStyleCycler.java