diff --git a/src/chartpresenter.cpp b/src/chartpresenter.cpp
index 45735dd..ffa95ff 100644
--- a/src/chartpresenter.cpp
+++ b/src/chartpresenter.cpp
@@ -18,7 +18,7 @@
 #include "percentbargroup.h"
 #include "linechartanimationitem_p.h"
 #include "piepresenter.h"
-#include "scatterpresenter.h"
+#include "scatterpresenter_p.h"
 
 QTCOMMERCIALCHART_BEGIN_NAMESPACE
 
diff --git a/src/charttheme.cpp b/src/charttheme.cpp
index cfe5bd3..08d3e2a 100644
--- a/src/charttheme.cpp
+++ b/src/charttheme.cpp
@@ -17,7 +17,7 @@
 #include "stackedbargroup.h"
 #include "linechartitem_p.h"
 #include "percentbargroup.h"
-#include "scatterpresenter.h"
+#include "scatterpresenter_p.h"
 #include "piepresenter.h"
 
 //themes
diff --git a/src/qchart.cpp b/src/qchart.cpp
index 87dc813..2168467 100644
--- a/src/qchart.cpp
+++ b/src/qchart.cpp
@@ -1,7 +1,4 @@
 #include "qchart.h"
-#include "qscatterseries.h"
-#include "qscatterseries_p.h"
-#include "qpieseries.h"
 #include "qchartaxis.h"
 #include "chartpresenter_p.h"
 #include "chartdataset_p.h"
@@ -11,6 +8,9 @@
 #include "stackedbarchartseries.h"
 #include "percentbarchartseries.h"
 #include "qlinechartseries.h"
+#include "qscatterseries.h"
+//#include "scatterseries_p.h"
+#include "qpieseries.h"
 
 #include <QGraphicsScene>
 #include <QGraphicsSceneResizeEvent>
diff --git a/src/qscatterseries.cpp b/src/scatterseries/qscatterseries.cpp
similarity index 97%
rename from src/qscatterseries.cpp
rename to src/scatterseries/qscatterseries.cpp
index 592782b..987364a 100644
--- a/src/qscatterseries.cpp
+++ b/src/scatterseries/qscatterseries.cpp
@@ -1,5 +1,5 @@
 #include "qscatterseries.h"
-#include "qscatterseries_p.h"
+#include "scatterseries_p.h"
 #include "qchart.h"
 
 QTCOMMERCIALCHART_BEGIN_NAMESPACE
diff --git a/src/qscatterseries.h b/src/scatterseries/qscatterseries.h
similarity index 100%
rename from src/qscatterseries.h
rename to src/scatterseries/qscatterseries.h
diff --git a/src/scatterseries/scatter.pri b/src/scatterseries/scatter.pri
new file mode 100644
index 0000000..5f3dfb3
--- /dev/null
+++ b/src/scatterseries/scatter.pri
@@ -0,0 +1,13 @@
+INCLUDEPATH += $$PWD
+DEPENDPATH += $$PWD
+
+SOURCES += \
+    $$PWD/qscatterseries.cpp \
+    $$PWD/scatterpresenter.cpp
+
+PRIVATE_HEADERS += \
+    $$PWD/scatterpresenter_p.h \
+    $$PWD/scatterseries_p.h
+
+PUBLIC_HEADERS += \
+    $$PWD/qscatterseries.h
diff --git a/src/scatterpresenter.cpp b/src/scatterseries/scatterpresenter.cpp
similarity index 97%
rename from src/scatterpresenter.cpp
rename to src/scatterseries/scatterpresenter.cpp
index 06ebafc..b10da79 100644
--- a/src/scatterpresenter.cpp
+++ b/src/scatterseries/scatterpresenter.cpp
@@ -1,4 +1,4 @@
-#include "scatterpresenter.h"
+#include "scatterpresenter_p.h"
 #include "qscatterseries.h"
 #include <QPen>
 #include <QPainter>
@@ -89,6 +89,6 @@ void ScatterPresenter::changeGeometry()
     }
 }
 
-#include "moc_scatterpresenter.cpp"
+#include "moc_scatterpresenter_p.cpp"
 
 QTCOMMERCIALCHART_END_NAMESPACE
diff --git a/src/scatterpresenter.h b/src/scatterseries/scatterpresenter_p.h
similarity index 100%
rename from src/scatterpresenter.h
rename to src/scatterseries/scatterpresenter_p.h
diff --git a/src/qscatterseries_p.h b/src/scatterseries/scatterseries_p.h
similarity index 100%
rename from src/qscatterseries_p.h
rename to src/scatterseries/scatterseries_p.h
diff --git a/src/src.pro b/src/src.pro
index 28d8a48..ffac271 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -22,8 +22,6 @@ SOURCES += barchart/barchartseries.cpp \
     linechart/linechartanimationitem.cpp \
     linechart/linechartitem.cpp \
     linechart/qlinechartseries.cpp \
-    qscatterseries.cpp \
-    #scatterpresentation.cpp \
     qchart.cpp \
     axisitem.cpp \
     qchartview.cpp \
@@ -32,16 +30,13 @@ SOURCES += barchart/barchartseries.cpp \
     charttheme.cpp \
     chartdataset.cpp \
     chartpresenter.cpp \
-    domain.cpp \
-    scatterpresenter.cpp
+    domain.cpp
 PRIVATE_HEADERS += linechart/linechartitem_p.h \
     linechart/linechartanimationitem_p.h \
     barchart/barlabel_p.h \
     barchart/bar_p.h \
     barchart/separator_p.h \
     barchart/barchartmodel_p.h \
-    qscatterseries_p.h \
-    #scatterpresentation.h \
     axisitem_p.h \
     chartitem_p.h \
     charttheme_p.h \
@@ -59,20 +54,19 @@ PUBLIC_HEADERS += linechart/qlinechartseries.h \
     barchart/qbarset.h \
     barchart/qbarcategory.h \
     qchartseries.h \
-    qscatterseries.h \
     qchart.h \
     qchartglobal.h \
     qchartview.h \
     qchartaxis.h
     
 include(piechart/piechart.pri)
-    
+include(scatterseries/scatter.pri)
+
 THEMES += themes/chartthemeicy_p.h \
     themes/chartthemegrayscale_p.h \
     themes/chartthemescientific_p.h \
     themes/chartthemevanilla_p.h
-HEADERS += $$PUBLIC_HEADERS \
-    scatterpresenter.h
+HEADERS += $$PUBLIC_HEADERS
 HEADERS += $$PRIVATE_HEADERS
 HEADERS += $$THEMES
 INCLUDEPATH += linechart \
@@ -122,3 +116,4 @@ unix:QMAKE_DISTCLEAN += -r \
 win32:QMAKE_DISTCLEAN += /Q \
     $$CHART_BUILD_HEADER_DIR \
     $$CHART_BUILD_LIB_DIR
+