diff --git a/AdvancedDockingSystem/AdvancedDockingSystem.pro b/AdvancedDockingSystem/AdvancedDockingSystem.pro
index cd03e55..214377c 100644
--- a/AdvancedDockingSystem/AdvancedDockingSystem.pro
+++ b/AdvancedDockingSystem/AdvancedDockingSystem.pro
@@ -8,28 +8,29 @@ TEMPLATE = lib
 CONFIG += staticlib
 
 INCLUDEPATH += $$PWD/src
+INCLUDEPATH += $$PWD/include
 
 QMAKE_CXXFLAGS += -std=c++11
 
 SOURCES += \
-	src/ads/section_content.cpp \
-	src/ads/ads.cpp \
-	src/ads/section_widget.cpp \
-	src/ads/section_title_widget.cpp \
-	src/ads/container_widget.cpp \
-	src/ads/drop_overlay.cpp \
-	src/ads/floating_widget.cpp \
-	src/ads/section_content_widget.cpp
+	src/API.cpp \
+  src/ContainerWidget.cpp \
+  src/SectionWidget.cpp \
+  src/SectionContent.cpp \
+	src/SectionTitleWidget.cpp \
+	src/SectionContentWidget.cpp \
+	src/DropOverlay.cpp \
+	src/FloatingWidget.cpp
 
 HEADERS += \
-	src/ads/ads.h \
-	src/ads/container_widget.h \
-	src/ads/section_widget.h \
-	src/ads/section_content.h \
-	src/ads/section_title_widget.h \
-	src/ads/section_content_widget.h \
-	src/ads/drop_overlay.h \
-	src/ads/floating_widget.h
+	include/ads/API.h \
+	include/ads/ContainerWidget.h \
+	include/ads/SectionWidget.h \
+	include/ads/SectionContent.h \
+	include/ads/SectionTitleWidget.h \
+	include/ads/SectionContentWidget.h \
+	include/ads/DropOverlay.h \
+	include/ads/FloatingWidget.h
 
 RESOURCES += \
 	res/ads.qrc
diff --git a/AdvancedDockingSystem/src/ads/ads.h b/AdvancedDockingSystem/include/ads/API.h
similarity index 100%
rename from AdvancedDockingSystem/src/ads/ads.h
rename to AdvancedDockingSystem/include/ads/API.h
diff --git a/AdvancedDockingSystem/src/ads/container_widget.h b/AdvancedDockingSystem/include/ads/ContainerWidget.h
similarity index 90%
rename from AdvancedDockingSystem/src/ads/container_widget.h
rename to AdvancedDockingSystem/include/ads/ContainerWidget.h
index aad84e6..462a22b 100644
--- a/AdvancedDockingSystem/src/ads/container_widget.h
+++ b/AdvancedDockingSystem/include/ads/ContainerWidget.h
@@ -8,10 +8,10 @@
 class QSplitter;
 class QMenu;
 
-#include "ads.h"
-#include "section_content.h"
-#include "section_widget.h"
-#include "floating_widget.h"
+#include "ads/API.h"
+#include "ads/SectionContent.h"
+#include "ads/SectionWidget.h"
+#include "ads/FloatingWidget.h"
 
 ADS_NAMESPACE_BEGIN
 
diff --git a/AdvancedDockingSystem/src/ads/drop_overlay.h b/AdvancedDockingSystem/include/ads/DropOverlay.h
similarity index 93%
rename from AdvancedDockingSystem/src/ads/drop_overlay.h
rename to AdvancedDockingSystem/include/ads/DropOverlay.h
index d97468a..8e11687 100644
--- a/AdvancedDockingSystem/src/ads/drop_overlay.h
+++ b/AdvancedDockingSystem/include/ads/DropOverlay.h
@@ -4,7 +4,7 @@
 #include <QFrame>
 #include <QRect>
 
-#include "ads.h"
+#include "ads/API.h"
 
 ADS_NAMESPACE_BEGIN
 
diff --git a/AdvancedDockingSystem/src/ads/floating_widget.h b/AdvancedDockingSystem/include/ads/FloatingWidget.h
similarity index 90%
rename from AdvancedDockingSystem/src/ads/floating_widget.h
rename to AdvancedDockingSystem/include/ads/FloatingWidget.h
index 46a91d6..68b6149 100644
--- a/AdvancedDockingSystem/src/ads/floating_widget.h
+++ b/AdvancedDockingSystem/include/ads/FloatingWidget.h
@@ -4,8 +4,8 @@
 #include <QWidget>
 #include <QFrame>
 
-#include "ads.h"
-#include "section_content.h"
+#include "ads/API.h"
+#include "ads/SectionContent.h"
 
 class QBoxLayout;
 
diff --git a/AdvancedDockingSystem/src/ads/section_content.h b/AdvancedDockingSystem/include/ads/SectionContent.h
similarity index 93%
rename from AdvancedDockingSystem/src/ads/section_content.h
rename to AdvancedDockingSystem/include/ads/SectionContent.h
index a8ffbd6..5e28f2c 100644
--- a/AdvancedDockingSystem/src/ads/section_content.h
+++ b/AdvancedDockingSystem/include/ads/SectionContent.h
@@ -6,7 +6,7 @@
 #include <QHash>
 #include <QSharedPointer>
 
-#include "ads.h"
+#include "ads/API.h"
 
 ADS_NAMESPACE_BEGIN
 
diff --git a/AdvancedDockingSystem/src/ads/section_content_widget.h b/AdvancedDockingSystem/include/ads/SectionContentWidget.h
similarity index 81%
rename from AdvancedDockingSystem/src/ads/section_content_widget.h
rename to AdvancedDockingSystem/include/ads/SectionContentWidget.h
index 7e03b2e..5e4c44a 100644
--- a/AdvancedDockingSystem/src/ads/section_content_widget.h
+++ b/AdvancedDockingSystem/include/ads/SectionContentWidget.h
@@ -3,8 +3,8 @@
 
 #include <QFrame>
 
-#include "ads.h"
-#include "section_content.h"
+#include "ads/API.h"
+#include "ads/SectionContent.h"
 
 ADS_NAMESPACE_BEGIN
 
diff --git a/AdvancedDockingSystem/src/ads/section_title_widget.h b/AdvancedDockingSystem/include/ads/SectionTitleWidget.h
similarity index 89%
rename from AdvancedDockingSystem/src/ads/section_title_widget.h
rename to AdvancedDockingSystem/include/ads/SectionTitleWidget.h
index 1ae282a..c0e5a35 100644
--- a/AdvancedDockingSystem/src/ads/section_title_widget.h
+++ b/AdvancedDockingSystem/include/ads/SectionTitleWidget.h
@@ -3,8 +3,9 @@
 
 #include <QFrame>
 #include <QPoint>
-#include "ads.h"
-#include "section_content.h"
+
+#include "ads/API.h"
+#include "ads/SectionContent.h"
 
 ADS_NAMESPACE_BEGIN
 
diff --git a/AdvancedDockingSystem/src/ads/section_widget.h b/AdvancedDockingSystem/include/ads/SectionWidget.h
similarity index 93%
rename from AdvancedDockingSystem/src/ads/section_widget.h
rename to AdvancedDockingSystem/include/ads/SectionWidget.h
index 17186f6..b9afc7c 100644
--- a/AdvancedDockingSystem/src/ads/section_widget.h
+++ b/AdvancedDockingSystem/include/ads/SectionWidget.h
@@ -6,8 +6,8 @@
 #include <QHash>
 #include <QFrame>
 
-#include "ads.h"
-#include "section_content.h"
+#include "ads/API.h"
+#include "ads/SectionContent.h"
 
 class QBoxLayout;
 class QStackedLayout;
diff --git a/AdvancedDockingSystem/src/ads/ads.cpp b/AdvancedDockingSystem/src/API.cpp
similarity index 90%
rename from AdvancedDockingSystem/src/ads/ads.cpp
rename to AdvancedDockingSystem/src/API.cpp
index bdaa793..92bb6ed 100644
--- a/AdvancedDockingSystem/src/ads/ads.cpp
+++ b/AdvancedDockingSystem/src/API.cpp
@@ -1,9 +1,9 @@
-#include "ads.h"
+#include "ads/API.h"
 
 #include <QWidget>
 #include <QSplitter>
 
-#include "container_widget.h"
+#include "ads/ContainerWidget.h"
 
 const QString DragData::MIMETYPE = QString("qt/ads-dragdata");
 
diff --git a/AdvancedDockingSystem/src/ads/container_widget.cpp b/AdvancedDockingSystem/src/ContainerWidget.cpp
similarity index 95%
rename from AdvancedDockingSystem/src/ads/container_widget.cpp
rename to AdvancedDockingSystem/src/ContainerWidget.cpp
index 0fd8a3a..29eb994 100644
--- a/AdvancedDockingSystem/src/ads/container_widget.cpp
+++ b/AdvancedDockingSystem/src/ContainerWidget.cpp
@@ -1,4 +1,4 @@
-#include "container_widget.h"
+#include "ads/ContainerWidget.h"
 
 #include <QPaintEvent>
 #include <QPainter>
diff --git a/AdvancedDockingSystem/src/ads/drop_overlay.cpp b/AdvancedDockingSystem/src/DropOverlay.cpp
similarity index 95%
rename from AdvancedDockingSystem/src/ads/drop_overlay.cpp
rename to AdvancedDockingSystem/src/DropOverlay.cpp
index 51fd1ee..f2d21cb 100644
--- a/AdvancedDockingSystem/src/ads/drop_overlay.cpp
+++ b/AdvancedDockingSystem/src/DropOverlay.cpp
@@ -1,4 +1,4 @@
-#include "drop_overlay.h"
+#include "ads/DropOverlay.h"
 
 #include <QDebug>
 #include <QPointer>
diff --git a/AdvancedDockingSystem/src/ads/floating_widget.cpp b/AdvancedDockingSystem/src/FloatingWidget.cpp
similarity index 90%
rename from AdvancedDockingSystem/src/ads/floating_widget.cpp
rename to AdvancedDockingSystem/src/FloatingWidget.cpp
index cc35494..67603dc 100644
--- a/AdvancedDockingSystem/src/ads/floating_widget.cpp
+++ b/AdvancedDockingSystem/src/FloatingWidget.cpp
@@ -1,4 +1,4 @@
-#include "floating_widget.h"
+#include "ads/FloatingWidget.h"
 
 #include <QDebug>
 #include <QBoxLayout>
@@ -7,9 +7,9 @@
 #include <QMouseEvent>
 #include <QStyle>
 
-#include "container_widget.h"
-#include "section_title_widget.h"
-#include "section_content_widget.h"
+#include "ads/ContainerWidget.h"
+#include "ads/SectionTitleWidget.h"
+#include "ads/SectionContentWidget.h"
 
 ADS_NAMESPACE_BEGIN
 
diff --git a/AdvancedDockingSystem/src/ads/section_content.cpp b/AdvancedDockingSystem/src/SectionContent.cpp
similarity index 92%
rename from AdvancedDockingSystem/src/ads/section_content.cpp
rename to AdvancedDockingSystem/src/SectionContent.cpp
index f6b85df..14d1c34 100644
--- a/AdvancedDockingSystem/src/ads/section_content.cpp
+++ b/AdvancedDockingSystem/src/SectionContent.cpp
@@ -1,4 +1,4 @@
-#include "section_content.h"
+#include "ads/SectionContent.h"
 
 #include <QLabel>
 
diff --git a/AdvancedDockingSystem/src/ads/section_content_widget.cpp b/AdvancedDockingSystem/src/SectionContentWidget.cpp
similarity index 86%
rename from AdvancedDockingSystem/src/ads/section_content_widget.cpp
rename to AdvancedDockingSystem/src/SectionContentWidget.cpp
index 2e711da..46753d1 100644
--- a/AdvancedDockingSystem/src/ads/section_content_widget.cpp
+++ b/AdvancedDockingSystem/src/SectionContentWidget.cpp
@@ -1,4 +1,4 @@
-#include "section_content_widget.h"
+#include "ads/SectionContentWidget.h"
 
 #include <QBoxLayout>
 
diff --git a/AdvancedDockingSystem/src/ads/section_title_widget.cpp b/AdvancedDockingSystem/src/SectionTitleWidget.cpp
similarity index 94%
rename from AdvancedDockingSystem/src/ads/section_title_widget.cpp
rename to AdvancedDockingSystem/src/SectionTitleWidget.cpp
index 240e80e..826d003 100644
--- a/AdvancedDockingSystem/src/ads/section_title_widget.cpp
+++ b/AdvancedDockingSystem/src/SectionTitleWidget.cpp
@@ -1,4 +1,4 @@
-#include "section_title_widget.h"
+#include "ads/SectionTitleWidget.h"
 
 #include <QDebug>
 #include <QString>
@@ -16,11 +16,11 @@
 #include <QParallelAnimationGroup>
 #endif
 
-#include "drop_overlay.h"
-#include "section_content.h"
-#include "section_widget.h"
-#include "floating_widget.h"
-#include "container_widget.h"
+#include "ads/DropOverlay.h"
+#include "ads/SectionContent.h"
+#include "ads/SectionWidget.h"
+#include "ads/FloatingWidget.h"
+#include "ads/ContainerWidget.h"
 
 ADS_NAMESPACE_BEGIN
 
diff --git a/AdvancedDockingSystem/src/ads/section_widget.cpp b/AdvancedDockingSystem/src/SectionWidget.cpp
similarity index 92%
rename from AdvancedDockingSystem/src/ads/section_widget.cpp
rename to AdvancedDockingSystem/src/SectionWidget.cpp
index 5623290..a9e077c 100644
--- a/AdvancedDockingSystem/src/ads/section_widget.cpp
+++ b/AdvancedDockingSystem/src/SectionWidget.cpp
@@ -1,4 +1,4 @@
-#include "section_widget.h"
+#include "ads/SectionWidget.h"
 
 #include <QApplication>
 #include <QBoxLayout>
@@ -14,12 +14,12 @@
 #include <QGraphicsDropShadowEffect>
 #endif
 
-#include "drop_overlay.h"
-#include "section_content.h"
-#include "section_title_widget.h"
-#include "section_content_widget.h"
-#include "floating_widget.h"
-#include "container_widget.h"
+#include "ads/DropOverlay.h"
+#include "ads/SectionContent.h"
+#include "ads/SectionTitleWidget.h"
+#include "ads/SectionContentWidget.h"
+#include "ads/FloatingWidget.h"
+#include "ads/ContainerWidget.h"
 
 ADS_NAMESPACE_BEGIN
 
diff --git a/AdvancedDockingSystemDemo/AdvancedDockingSystemDemo.pro b/AdvancedDockingSystemDemo/AdvancedDockingSystemDemo.pro
index 027964a..3cd8b77 100644
--- a/AdvancedDockingSystemDemo/AdvancedDockingSystemDemo.pro
+++ b/AdvancedDockingSystemDemo/AdvancedDockingSystemDemo.pro
@@ -27,8 +27,8 @@ win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../AdvancedDockingSyst
 else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../AdvancedDockingSystem/debug/ -lAdvancedDockingSystem
 else:unix: LIBS += -L$$OUT_PWD/../AdvancedDockingSystem/ -lAdvancedDockingSystem
 
-INCLUDEPATH += $$PWD/../AdvancedDockingSystem/src
-DEPENDPATH += $$PWD/../AdvancedDockingSystem/src
+INCLUDEPATH += $$PWD/../AdvancedDockingSystem/include
+DEPENDPATH += $$PWD/../AdvancedDockingSystem/include
 
 win32-g++:CONFIG(release, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../AdvancedDockingSystem/release/libAdvancedDockingSystem.a
 else:win32-g++:CONFIG(debug, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../AdvancedDockingSystem/debug/libAdvancedDockingSystem.a
diff --git a/AdvancedDockingSystemDemo/src/mainwindow.cpp b/AdvancedDockingSystemDemo/src/mainwindow.cpp
index 065f67a..431eb4f 100644
--- a/AdvancedDockingSystemDemo/src/mainwindow.cpp
+++ b/AdvancedDockingSystemDemo/src/mainwindow.cpp
@@ -9,9 +9,9 @@
 #include <QTreeView>
 #include <QFileSystemModel>
 
-#include "ads/container_widget.h"
-#include "ads/section_widget.h"
-#include "ads/section_content.h"
+#include "ads/ContainerWidget.h"
+#include "ads/SectionWidget.h"
+#include "ads/SectionContent.h"
 
 #include "icontitlewidget.h"
 
diff --git a/AdvancedDockingSystemDemo/src/mainwindow.h b/AdvancedDockingSystemDemo/src/mainwindow.h
index 6f94968..7c132d5 100644
--- a/AdvancedDockingSystemDemo/src/mainwindow.h
+++ b/AdvancedDockingSystemDemo/src/mainwindow.h
@@ -2,7 +2,7 @@
 #define MAINWINDOW_H
 
 #include <QMainWindow>
-#include "ads/ads.h"
+#include "ads/API.h"
 
 namespace Ui {
 class MainWindow;