diff --git a/demos/chartviewer/charts/horizontalbarchart.cpp b/demos/chartviewer/charts/barseries/horizontalbarchart.cpp
similarity index 100%
rename from demos/chartviewer/charts/horizontalbarchart.cpp
rename to demos/chartviewer/charts/barseries/horizontalbarchart.cpp
diff --git a/demos/chartviewer/charts/horizontalpercentbarchart.cpp b/demos/chartviewer/charts/barseries/horizontalpercentbarchart.cpp
similarity index 100%
rename from demos/chartviewer/charts/horizontalpercentbarchart.cpp
rename to demos/chartviewer/charts/barseries/horizontalpercentbarchart.cpp
diff --git a/demos/chartviewer/charts/horizontalstackedbarchart.cpp b/demos/chartviewer/charts/barseries/horizontalstackedbarchart.cpp
similarity index 100%
rename from demos/chartviewer/charts/horizontalstackedbarchart.cpp
rename to demos/chartviewer/charts/barseries/horizontalstackedbarchart.cpp
diff --git a/demos/chartviewer/charts/verticalbarchart.cpp b/demos/chartviewer/charts/barseries/verticalbarchart.cpp
similarity index 100%
rename from demos/chartviewer/charts/verticalbarchart.cpp
rename to demos/chartviewer/charts/barseries/verticalbarchart.cpp
diff --git a/demos/chartviewer/charts/verticalpercentbarchart.cpp b/demos/chartviewer/charts/barseries/verticalpercentbarchart.cpp
similarity index 100%
rename from demos/chartviewer/charts/verticalpercentbarchart.cpp
rename to demos/chartviewer/charts/barseries/verticalpercentbarchart.cpp
diff --git a/demos/chartviewer/charts/verticalstackedbarchart.cpp b/demos/chartviewer/charts/barseries/verticalstackedbarchart.cpp
similarity index 100%
rename from demos/chartviewer/charts/verticalstackedbarchart.cpp
rename to demos/chartviewer/charts/barseries/verticalstackedbarchart.cpp
diff --git a/demos/chartviewer/charts/charts.pri b/demos/chartviewer/charts/charts.pri
index d73bc74..6a3fa7b 100644
--- a/demos/chartviewer/charts/charts.pri
+++ b/demos/chartviewer/charts/charts.pri
@@ -1,14 +1,15 @@
 INCLUDEPATH += $$PWD
 DEPENDPATH += $$PWD
-SOURCES += linechart.cpp \
-    scatterchart.cpp \
-    splinechart.cpp \
-    verticalstackedbarchart.cpp \
-    horizontalstackedbarchart.cpp \
-    verticalbarchart.cpp \
-    horizontalbarchart.cpp \
-    horizontalpercentbarchart.cpp \
-    verticalpercentbarchart.cpp \
-    areachart.cpp \
-    piechart.cpp \
-    donutchart.cpp
+SOURCES += \ 
+    xyseries/linechart.cpp \
+    xyseries/scatterchart.cpp \
+    xyseries/splinechart.cpp \
+    xyseries/areachart.cpp \
+    barseries/verticalstackedbarchart.cpp \
+    barseries/horizontalstackedbarchart.cpp \
+    barseries/verticalbarchart.cpp \
+    barseries/horizontalbarchart.cpp \
+    barseries/horizontalpercentbarchart.cpp \
+    barseries/verticalpercentbarchart.cpp \
+    pieseries/piechart.cpp \
+    pieseries/donutchart.cpp
diff --git a/demos/chartviewer/charts/donutchart.cpp b/demos/chartviewer/charts/pieseries/donutchart.cpp
similarity index 100%
rename from demos/chartviewer/charts/donutchart.cpp
rename to demos/chartviewer/charts/pieseries/donutchart.cpp
diff --git a/demos/chartviewer/charts/piechart.cpp b/demos/chartviewer/charts/pieseries/piechart.cpp
similarity index 100%
rename from demos/chartviewer/charts/piechart.cpp
rename to demos/chartviewer/charts/pieseries/piechart.cpp
diff --git a/demos/chartviewer/charts/areachart.cpp b/demos/chartviewer/charts/xyseries/areachart.cpp
similarity index 100%
rename from demos/chartviewer/charts/areachart.cpp
rename to demos/chartviewer/charts/xyseries/areachart.cpp
diff --git a/demos/chartviewer/charts/linechart.cpp b/demos/chartviewer/charts/xyseries/linechart.cpp
similarity index 100%
rename from demos/chartviewer/charts/linechart.cpp
rename to demos/chartviewer/charts/xyseries/linechart.cpp
diff --git a/demos/chartviewer/charts/scatterchart.cpp b/demos/chartviewer/charts/xyseries/scatterchart.cpp
similarity index 100%
rename from demos/chartviewer/charts/scatterchart.cpp
rename to demos/chartviewer/charts/xyseries/scatterchart.cpp
diff --git a/demos/chartviewer/charts/splinechart.cpp b/demos/chartviewer/charts/xyseries/splinechart.cpp
similarity index 100%
rename from demos/chartviewer/charts/splinechart.cpp
rename to demos/chartviewer/charts/xyseries/splinechart.cpp