diff --git a/appbar.cpp b/components/appbar.cpp
similarity index 100%
rename from appbar.cpp
rename to components/appbar.cpp
diff --git a/appbar.h b/components/appbar.h
similarity index 100%
rename from appbar.h
rename to components/appbar.h
diff --git a/checkbox.cpp b/components/checkbox.cpp
similarity index 100%
rename from checkbox.cpp
rename to components/checkbox.cpp
diff --git a/checkbox.h b/components/checkbox.h
similarity index 100%
rename from checkbox.h
rename to components/checkbox.h
diff --git a/dialog.cpp b/components/dialog.cpp
similarity index 100%
rename from dialog.cpp
rename to components/dialog.cpp
diff --git a/dialog.h b/components/dialog.h
similarity index 100%
rename from dialog.h
rename to components/dialog.h
diff --git a/flatbutton.cpp b/components/flatbutton.cpp
similarity index 100%
rename from flatbutton.cpp
rename to components/flatbutton.cpp
diff --git a/flatbutton.h b/components/flatbutton.h
similarity index 100%
rename from flatbutton.h
rename to components/flatbutton.h
diff --git a/iconbutton.cpp b/components/iconbutton.cpp
similarity index 100%
rename from iconbutton.cpp
rename to components/iconbutton.cpp
diff --git a/iconbutton.h b/components/iconbutton.h
similarity index 100%
rename from iconbutton.h
rename to components/iconbutton.h
diff --git a/iconmenu.cpp b/components/iconmenu.cpp
similarity index 100%
rename from iconmenu.cpp
rename to components/iconmenu.cpp
diff --git a/iconmenu.h b/components/iconmenu.h
similarity index 100%
rename from iconmenu.h
rename to components/iconmenu.h
diff --git a/list.cpp b/components/list.cpp
similarity index 100%
rename from list.cpp
rename to components/list.cpp
diff --git a/list.h b/components/list.h
similarity index 100%
rename from list.h
rename to components/list.h
diff --git a/radiobutton.cpp b/components/radiobutton.cpp
similarity index 100%
rename from radiobutton.cpp
rename to components/radiobutton.cpp
diff --git a/radiobutton.h b/components/radiobutton.h
similarity index 100%
rename from radiobutton.h
rename to components/radiobutton.h
diff --git a/slider.cpp b/components/slider.cpp
similarity index 100%
rename from slider.cpp
rename to components/slider.cpp
diff --git a/slider.h b/components/slider.h
similarity index 100%
rename from slider.h
rename to components/slider.h
diff --git a/tab.cpp b/components/tab.cpp
similarity index 100%
rename from tab.cpp
rename to components/tab.cpp
diff --git a/tab.h b/components/tab.h
similarity index 100%
rename from tab.h
rename to components/tab.h
diff --git a/table.cpp b/components/table.cpp
similarity index 100%
rename from table.cpp
rename to components/table.cpp
diff --git a/table.h b/components/table.h
similarity index 100%
rename from table.h
rename to components/table.h
diff --git a/tabs.cpp b/components/tabs.cpp
similarity index 100%
rename from tabs.cpp
rename to components/tabs.cpp
diff --git a/tabs.h b/components/tabs.h
similarity index 100%
rename from tabs.h
rename to components/tabs.h
diff --git a/textfield.cpp b/components/textfield.cpp
similarity index 100%
rename from textfield.cpp
rename to components/textfield.cpp
diff --git a/textfield.h b/components/textfield.h
similarity index 100%
rename from textfield.h
rename to components/textfield.h
diff --git a/toggle.cpp b/components/toggle.cpp
similarity index 100%
rename from toggle.cpp
rename to components/toggle.cpp
diff --git a/toggle.h b/components/toggle.h
similarity index 100%
rename from toggle.h
rename to components/toggle.h
diff --git a/mainwindow.cpp b/mainwindow.cpp
index 1bd83f5..23b8dd0 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -4,9 +4,9 @@
 #include <QMenuBar>
 #include <QLabel>
 #include "mainwindow.h"
-#include "flatbutton.h"
-#include "iconbutton.h"
-#include "appbar.h"
+#include "components/flatbutton.h"
+#include "components/iconbutton.h"
+#include "components/appbar.h"
 
 MainWindow::MainWindow(QWidget *parent)
     : QMainWindow(parent)
diff --git a/qt-material-widgets.pro b/qt-material-widgets.pro
index 7e9895a..7fdad59 100644
--- a/qt-material-widgets.pro
+++ b/qt-material-widgets.pro
@@ -1,9 +1,3 @@
-#-------------------------------------------------
-#
-# Project created by QtCreator 2016-03-18T11:23:14
-#
-#-------------------------------------------------
-
 QT       += core gui qml
 
 greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
@@ -11,40 +5,39 @@ greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
 TARGET = qt-material-widgets
 TEMPLATE = app
 
-
 SOURCES += main.cpp\
         mainwindow.cpp \
     style.cpp \
-    appbar.cpp \
-    checkbox.cpp \
-    dialog.cpp \
-    flatbutton.cpp \
-    iconbutton.cpp \
-    iconmenu.cpp \
-    list.cpp \
-    radiobutton.cpp \
-    slider.cpp \
-    tab.cpp \
-    tabs.cpp \
-    textfield.cpp \
-    table.cpp \
+    components/appbar.cpp \
+    components/checkbox.cpp \
+    components/dialog.cpp \
+    components/flatbutton.cpp \
+    components/iconbutton.cpp \
+    components/iconmenu.cpp \
+    components/list.cpp \
+    components/radiobutton.cpp \
+    components/slider.cpp \
+    components/tab.cpp \
+    components/tabs.cpp \
+    components/textfield.cpp \
+    components/table.cpp \
     ripple.cpp \
     rippleoverlay.cpp
 
 HEADERS  += mainwindow.h \
     style.h \
-    appbar.h \
-    checkbox.h \
-    dialog.h \
-    flatbutton.h \
-    iconbutton.h \
-    iconmenu.h \
-    list.h \
-    radiobutton.h \
-    slider.h \
-    tab.h \
-    tabs.h \
-    textfield.h \
-    table.h \
+    components/appbar.h \
+    components/checkbox.h \
+    components/dialog.h \
+    components/flatbutton.h \
+    components/iconbutton.h \
+    components/iconmenu.h \
+    components/list.h \
+    components/radiobutton.h \
+    components/slider.h \
+    components/tab.h \
+    components/tabs.h \
+    components/textfield.h \
+    components/table.h \
     ripple.h \
     rippleoverlay.h