diff --git a/components/qtmaterialcheckbox_p.h b/components/qtmaterialcheckbox_p.h
index a26c1d8..40781c6 100644
--- a/components/qtmaterialcheckbox_p.h
+++ b/components/qtmaterialcheckbox_p.h
@@ -1,7 +1,7 @@
 #ifndef QTMATERIALCHECKBOX_P_H
 #define QTMATERIALCHECKBOX_P_H
 
-#include "lib/qtmaterialcheckable_p.h"
+#include "materiallib/qtmaterialcheckable_p.h"
 
 class QtMaterialCheckBox;
 
diff --git a/components/qtmaterialradiobutton_p.h b/components/qtmaterialradiobutton_p.h
index 9673b63..dd117ec 100644
--- a/components/qtmaterialradiobutton_p.h
+++ b/components/qtmaterialradiobutton_p.h
@@ -1,7 +1,7 @@
 #ifndef QTMATERIALRADIOBUTTON_P_H
 #define QTMATERIALRADIOBUTTON_P_H
 
-#include "lib/qtmaterialcheckable_p.h"
+#include "materiallib/qtmaterialcheckable_p.h"
 
 class QtMaterialRadioButton;
 
diff --git a/include/qmetarial/lib/qtmaterialcheckable_p.h b/include/qmetarial/lib/qtmaterialcheckable_p.h
deleted file mode 100644
index f501c14..0000000
--- a/include/qmetarial/lib/qtmaterialcheckable_p.h
+++ /dev/null
@@ -1,43 +0,0 @@
-#ifndef QTMATERIALCHECKABLE_P_H
-#define QTMATERIALCHECKABLE_P_H
-
-#include "lib/qtmaterialcheckable.h"
-#include <QtGlobal>
-
-class QStateMachine;
-class QState;
-class QSignalTransition;
-class QtMaterialRippleOverlay;
-class QtMaterialCheckableIcon;
-
-class QtMaterialCheckablePrivate
-{
-    Q_DISABLE_COPY(QtMaterialCheckablePrivate)
-    Q_DECLARE_PUBLIC(QtMaterialCheckable)
-
-public:
-    QtMaterialCheckablePrivate(QtMaterialCheckable *q);
-    virtual ~QtMaterialCheckablePrivate();
-
-    void init();
-
-    QtMaterialCheckable *const q_ptr;
-    QtMaterialRippleOverlay *rippleOverlay;
-    QtMaterialCheckableIcon *checkedIcon;
-    QtMaterialCheckableIcon *uncheckedIcon;
-    QStateMachine *stateMachine;
-    QState *uncheckedState;
-    QState *checkedState;
-    QState *disabledUncheckedState;
-    QState *disabledCheckedState;
-    QSignalTransition *uncheckedTransition;
-    QSignalTransition *checkedTransition;
-    QtMaterialCheckable::LabelPosition labelPosition;
-    QColor checkedColor;
-    QColor uncheckedColor;
-    QColor textColor;
-    QColor disabledColor;
-    bool useThemeColors;
-};
-
-#endif  // QTMATERIALCHECKABLE_P_H
diff --git a/include/qmetarial/lib/qtmaterialstyle.h b/include/qmetarial/lib/qtmaterialstyle.h
index b72fc2f..0bb9e99 100644
--- a/include/qmetarial/lib/qtmaterialstyle.h
+++ b/include/qmetarial/lib/qtmaterialstyle.h
@@ -1,7 +1,7 @@
 #ifndef QTMATERIALSTYLE_H
 #define QTMATERIALSTYLE_H
 
-#include "lib/qtmaterialstyle_p.h"
+#include "materiallib/qtmaterialstyle_p.h"
 #include <QtWidgets/QCommonStyle>
 
 #define MATERIAL_DISABLE_THEME_COLORS                                                                                            \
diff --git a/include/qmetarial/lib/qtmaterialstyle_p.h b/include/qmetarial/lib/qtmaterialstyle_p.h
deleted file mode 100644
index e96e1cd..0000000
--- a/include/qmetarial/lib/qtmaterialstyle_p.h
+++ /dev/null
@@ -1,24 +0,0 @@
-#ifndef QTMATERIALSTYLE_P_H
-#define QTMATERIALSTYLE_P_H
-
-#include <QtGlobal>
-
-class QtMaterialStyle;
-class QtMaterialTheme;
-
-class QtMaterialStylePrivate
-{
-    Q_DISABLE_COPY(QtMaterialStylePrivate)
-    Q_DECLARE_PUBLIC(QtMaterialStyle)
-
-public:
-    QtMaterialStylePrivate(QtMaterialStyle *q);
-    ~QtMaterialStylePrivate();
-
-    void init();
-
-    QtMaterialStyle *const q_ptr;
-    QtMaterialTheme *theme;
-};
-
-#endif  // QTMATERIALSTYLE_P_H
diff --git a/include/qmetarial/lib/qtmaterialtheme_p.h b/include/qmetarial/lib/qtmaterialtheme_p.h
deleted file mode 100644
index 85b619b..0000000
--- a/include/qmetarial/lib/qtmaterialtheme_p.h
+++ /dev/null
@@ -1,24 +0,0 @@
-#ifndef QTMATERIALTHEME_P_H
-#define QTMATERIALTHEME_P_H
-
-#include <QColor>
-#include <QHash>
-
-class QtMaterialTheme;
-
-class QtMaterialThemePrivate
-{
-    Q_DISABLE_COPY(QtMaterialThemePrivate)
-    Q_DECLARE_PUBLIC(QtMaterialTheme)
-
-public:
-    QtMaterialThemePrivate(QtMaterialTheme *q);
-    ~QtMaterialThemePrivate();
-
-    QColor rgba(int r, int g, int b, qreal a) const;
-
-    QtMaterialTheme *const q_ptr;
-    QHash<QString, QColor> colors;
-};
-
-#endif  // QTMATERIALTHEME_P_H