diff --git a/config/application.gypi b/config/application.gypi
index 6f4f6fe17..e3240161f 100644
--- a/config/application.gypi
+++ b/config/application.gypi
@@ -12,10 +12,10 @@
             "../src/cpp/core/YogaWidget/yogawidget.cpp",
             # wrapped cpps
             "../src/cpp/QtGui/QApplication/qapplication_wrap.cpp",
-            "../src/cpp/QtGui/QWidget/qwidget_wrap.cpp",
             "../src/cpp/QtGui/QEvent/QKeyEvent/qkeyevent_wrap.cpp",
             "../src/cpp/QtGui/QPixmap/qpixmap_wrap.cpp",
             '../src/cpp/core/FlexLayout/flexlayout_wrap.cpp',
+            "../src/cpp/QtWidgets/QWidget/qwidget_wrap.cpp",
             "../src/cpp/QtWidgets/QGridLayout/qgridlayout_wrap.cpp",
             "../src/cpp/QtWidgets/QLabel/qlabel_wrap.cpp",
             "../src/cpp/QtWidgets/QLayout/qlayout_wrap.cpp",
diff --git a/config/moc.json b/config/moc.json
index 92a120e1d..135dfea34 100644
--- a/config/moc.json
+++ b/config/moc.json
@@ -1,7 +1,7 @@
 {
   "include": "src/cpp/core/NodeWidget/nodewidget.h",
   "headers": [
-    "src/cpp/QtGui/QWidget/nwidget.h",
+    "src/cpp/QtWidgets/QWidget/nwidget.h",
     "src/cpp/QtWidgets/QLabel/nlabel.h",
     "src/cpp/QtWidgets/QCheckBox/ncheckbox.h",
     "src/cpp/QtWidgets/QLineEdit/nlineedit.h",
diff --git a/src/cpp/QtWidgets/QCheckBox/qcheckbox_wrap.cpp b/src/cpp/QtWidgets/QCheckBox/qcheckbox_wrap.cpp
index 1534697de..797e67f86 100644
--- a/src/cpp/QtWidgets/QCheckBox/qcheckbox_wrap.cpp
+++ b/src/cpp/QtWidgets/QCheckBox/qcheckbox_wrap.cpp
@@ -1,5 +1,5 @@
 #include "qcheckbox_wrap.h"
-#include "src/cpp/QtGui/QWidget/qwidget_wrap.h"
+#include "src/cpp/QtWidgets/QWidget/qwidget_wrap.h"
 #include "src/cpp/Extras/Utils/nutils.h"
 #include <QWidget>
 
diff --git a/src/cpp/QtWidgets/QCheckBox/qcheckbox_wrap.h b/src/cpp/QtWidgets/QCheckBox/qcheckbox_wrap.h
index a7be7e72e..983a04d10 100644
--- a/src/cpp/QtWidgets/QCheckBox/qcheckbox_wrap.h
+++ b/src/cpp/QtWidgets/QCheckBox/qcheckbox_wrap.h
@@ -2,7 +2,7 @@
 
 #include <napi.h>
 #include "ncheckbox.h"
-#include "src/cpp/QtGui/QWidget/qwidget_macro.h"
+#include "src/cpp/QtWidgets/QWidget/qwidget_macro.h"
 
 
 class QCheckBoxWrap : public  Napi::ObjectWrap<QCheckBoxWrap>{
diff --git a/src/cpp/QtWidgets/QGridLayout/qgridlayout_wrap.cpp b/src/cpp/QtWidgets/QGridLayout/qgridlayout_wrap.cpp
index f5f961a96..dd6607a6f 100644
--- a/src/cpp/QtWidgets/QGridLayout/qgridlayout_wrap.cpp
+++ b/src/cpp/QtWidgets/QGridLayout/qgridlayout_wrap.cpp
@@ -1,5 +1,5 @@
 #include "qgridlayout_wrap.h"
-#include "src/cpp/QtGui/QWidget/qwidget_wrap.h"
+#include "src/cpp/QtWidgets/QWidget/qwidget_wrap.h"
 #include "src/cpp/Extras/Utils/nutils.h"
 
 Napi::FunctionReference QGridLayoutWrap::constructor;
diff --git a/src/cpp/QtWidgets/QLabel/qlabel_wrap.cpp b/src/cpp/QtWidgets/QLabel/qlabel_wrap.cpp
index 4d1739546..3f45b3cc5 100644
--- a/src/cpp/QtWidgets/QLabel/qlabel_wrap.cpp
+++ b/src/cpp/QtWidgets/QLabel/qlabel_wrap.cpp
@@ -1,5 +1,5 @@
 #include "qlabel_wrap.h"
-#include "src/cpp/QtGui/QWidget/qwidget_wrap.h"
+#include "src/cpp/QtWidgets/QWidget/qwidget_wrap.h"
 #include "src/cpp/QtGui/QPixmap/qpixmap_wrap.h"
 #include "src/cpp/Extras/Utils/nutils.h"
 #include <QWidget>
diff --git a/src/cpp/QtWidgets/QLabel/qlabel_wrap.h b/src/cpp/QtWidgets/QLabel/qlabel_wrap.h
index 24c04ebe9..036231311 100644
--- a/src/cpp/QtWidgets/QLabel/qlabel_wrap.h
+++ b/src/cpp/QtWidgets/QLabel/qlabel_wrap.h
@@ -2,7 +2,7 @@
 
 #include <napi.h>
 #include "nlabel.h"
-#include "src/cpp/QtGui/QWidget/qwidget_macro.h"
+#include "src/cpp/QtWidgets/QWidget/qwidget_macro.h"
 
 
 class QLabelWrap : public  Napi::ObjectWrap<QLabelWrap>{
diff --git a/src/cpp/QtWidgets/QLineEdit/qlineedit_wrap.cpp b/src/cpp/QtWidgets/QLineEdit/qlineedit_wrap.cpp
index 9a89acd76..95563d275 100644
--- a/src/cpp/QtWidgets/QLineEdit/qlineedit_wrap.cpp
+++ b/src/cpp/QtWidgets/QLineEdit/qlineedit_wrap.cpp
@@ -1,6 +1,6 @@
 
 #include "qlineedit_wrap.h"
-#include "src/cpp/QtGui/QWidget/qwidget_wrap.h"
+#include "src/cpp/QtWidgets/QWidget/qwidget_wrap.h"
 #include "src/cpp/Extras/Utils/nutils.h"
 #include <QWidget>
 
diff --git a/src/cpp/QtWidgets/QLineEdit/qlineedit_wrap.h b/src/cpp/QtWidgets/QLineEdit/qlineedit_wrap.h
index 1ca48fa6f..6330cbe01 100644
--- a/src/cpp/QtWidgets/QLineEdit/qlineedit_wrap.h
+++ b/src/cpp/QtWidgets/QLineEdit/qlineedit_wrap.h
@@ -2,7 +2,7 @@
 
 #include <napi.h>
 #include "nlineedit.h"
-#include "src/cpp/QtGui/QWidget/qwidget_macro.h"
+#include "src/cpp/QtWidgets/QWidget/qwidget_macro.h"
 
 
 class QLineEditWrap : public  Napi::ObjectWrap<QLineEditWrap>{
diff --git a/src/cpp/QtWidgets/QMainWindow/qmainwindow_wrap.cpp b/src/cpp/QtWidgets/QMainWindow/qmainwindow_wrap.cpp
index bde248687..6062d4b75 100644
--- a/src/cpp/QtWidgets/QMainWindow/qmainwindow_wrap.cpp
+++ b/src/cpp/QtWidgets/QMainWindow/qmainwindow_wrap.cpp
@@ -1,5 +1,5 @@
 #include "qmainwindow_wrap.h"
-#include "src/cpp/QtGui/QWidget/qwidget_wrap.h"
+#include "src/cpp/QtWidgets/QWidget/qwidget_wrap.h"
 #include "src/cpp/Extras/Utils/nutils.h"
 
 Napi::FunctionReference QMainWindowWrap::constructor;
diff --git a/src/cpp/QtWidgets/QMainWindow/qmainwindow_wrap.h b/src/cpp/QtWidgets/QMainWindow/qmainwindow_wrap.h
index 3cc4fba41..19d4abb28 100644
--- a/src/cpp/QtWidgets/QMainWindow/qmainwindow_wrap.h
+++ b/src/cpp/QtWidgets/QMainWindow/qmainwindow_wrap.h
@@ -2,7 +2,7 @@
 
 #include <napi.h>
 #include "nmainwindow.h"
-#include "src/cpp/QtGui/QWidget/qwidget_macro.h"
+#include "src/cpp/QtWidgets/QWidget/qwidget_macro.h"
 
 
 class QMainWindowWrap : public  Napi::ObjectWrap<QMainWindowWrap>{
diff --git a/src/cpp/QtWidgets/QProgressBar/qprogressbar_wrap.cpp b/src/cpp/QtWidgets/QProgressBar/qprogressbar_wrap.cpp
index ed93cb3c1..4da91aa57 100644
--- a/src/cpp/QtWidgets/QProgressBar/qprogressbar_wrap.cpp
+++ b/src/cpp/QtWidgets/QProgressBar/qprogressbar_wrap.cpp
@@ -1,6 +1,6 @@
 
 #include "qprogressbar_wrap.h"
-#include "src/cpp/QtGui/QWidget/qwidget_wrap.h"
+#include "src/cpp/QtWidgets/QWidget/qwidget_wrap.h"
 #include "src/cpp/Extras/Utils/nutils.h"
 #include <QWidget>
 
diff --git a/src/cpp/QtWidgets/QProgressBar/qprogressbar_wrap.h b/src/cpp/QtWidgets/QProgressBar/qprogressbar_wrap.h
index 69f60eb4a..3e7e885ba 100644
--- a/src/cpp/QtWidgets/QProgressBar/qprogressbar_wrap.h
+++ b/src/cpp/QtWidgets/QProgressBar/qprogressbar_wrap.h
@@ -2,7 +2,7 @@
 
 #include <napi.h>
 #include "nprogressbar.h"
-#include "src/cpp/QtGui/QWidget/qwidget_macro.h"
+#include "src/cpp/QtWidgets/QWidget/qwidget_macro.h"
 
 class QProgressBarWrap : public  Napi::ObjectWrap<QProgressBarWrap>{
  private:
diff --git a/src/cpp/QtWidgets/QPushButton/qpushbutton_wrap.cpp b/src/cpp/QtWidgets/QPushButton/qpushbutton_wrap.cpp
index a9545bf4d..6a036d9c4 100644
--- a/src/cpp/QtWidgets/QPushButton/qpushbutton_wrap.cpp
+++ b/src/cpp/QtWidgets/QPushButton/qpushbutton_wrap.cpp
@@ -1,5 +1,5 @@
 #include "qpushbutton_wrap.h"
-#include "src/cpp/QtGui/QWidget/qwidget_wrap.h"
+#include "src/cpp/QtWidgets/QWidget/qwidget_wrap.h"
 #include "src/cpp/Extras/Utils/nutils.h"
 
 Napi::FunctionReference QPushButtonWrap::constructor;
diff --git a/src/cpp/QtWidgets/QPushButton/qpushbutton_wrap.h b/src/cpp/QtWidgets/QPushButton/qpushbutton_wrap.h
index 4e4647886..e0eb494f0 100644
--- a/src/cpp/QtWidgets/QPushButton/qpushbutton_wrap.h
+++ b/src/cpp/QtWidgets/QPushButton/qpushbutton_wrap.h
@@ -2,7 +2,7 @@
 
 #include <napi.h>
 #include "npushbutton.h"
-#include "src/cpp/QtGui/QWidget/qwidget_macro.h"
+#include "src/cpp/QtWidgets/QWidget/qwidget_macro.h"
 
 #include "src/cpp/Extras/Utils/nutils.h"
 
diff --git a/src/cpp/QtWidgets/QRadioButton/qradiobutton_wrap.cpp b/src/cpp/QtWidgets/QRadioButton/qradiobutton_wrap.cpp
index e91eafd03..d73ba4b21 100644
--- a/src/cpp/QtWidgets/QRadioButton/qradiobutton_wrap.cpp
+++ b/src/cpp/QtWidgets/QRadioButton/qradiobutton_wrap.cpp
@@ -1,6 +1,6 @@
 
 #include "qradiobutton_wrap.h"
-#include "src/cpp/QtGui/QWidget/qwidget_wrap.h"
+#include "src/cpp/QtWidgets/QWidget/qwidget_wrap.h"
 #include "src/cpp/Extras/Utils/nutils.h"
 #include <QWidget>
 
diff --git a/src/cpp/QtWidgets/QRadioButton/qradiobutton_wrap.h b/src/cpp/QtWidgets/QRadioButton/qradiobutton_wrap.h
index fdb380fb8..cde253594 100644
--- a/src/cpp/QtWidgets/QRadioButton/qradiobutton_wrap.h
+++ b/src/cpp/QtWidgets/QRadioButton/qradiobutton_wrap.h
@@ -2,7 +2,7 @@
 
 #include <napi.h>
 #include "nradiobutton.h"
-#include "src/cpp/QtGui/QWidget/qwidget_macro.h"
+#include "src/cpp/QtWidgets/QWidget/qwidget_macro.h"
 
 
 class QRadioButtonWrap : public  Napi::ObjectWrap<QRadioButtonWrap>{
diff --git a/src/cpp/QtGui/QWidget/nwidget.h b/src/cpp/QtWidgets/QWidget/nwidget.h
similarity index 100%
rename from src/cpp/QtGui/QWidget/nwidget.h
rename to src/cpp/QtWidgets/QWidget/nwidget.h
diff --git a/src/cpp/QtGui/QWidget/nwidget_moc.cpp b/src/cpp/QtWidgets/QWidget/nwidget_moc.cpp
similarity index 100%
rename from src/cpp/QtGui/QWidget/nwidget_moc.cpp
rename to src/cpp/QtWidgets/QWidget/nwidget_moc.cpp
diff --git a/src/cpp/QtGui/QWidget/qwidget_macro.h b/src/cpp/QtWidgets/QWidget/qwidget_macro.h
similarity index 100%
rename from src/cpp/QtGui/QWidget/qwidget_macro.h
rename to src/cpp/QtWidgets/QWidget/qwidget_macro.h
diff --git a/src/cpp/QtGui/QWidget/qwidget_wrap.cpp b/src/cpp/QtWidgets/QWidget/qwidget_wrap.cpp
similarity index 100%
rename from src/cpp/QtGui/QWidget/qwidget_wrap.cpp
rename to src/cpp/QtWidgets/QWidget/qwidget_wrap.cpp
diff --git a/src/cpp/QtGui/QWidget/qwidget_wrap.h b/src/cpp/QtWidgets/QWidget/qwidget_wrap.h
similarity index 89%
rename from src/cpp/QtGui/QWidget/qwidget_wrap.h
rename to src/cpp/QtWidgets/QWidget/qwidget_wrap.h
index 7735e53d8..196e855aa 100644
--- a/src/cpp/QtGui/QWidget/qwidget_wrap.h
+++ b/src/cpp/QtWidgets/QWidget/qwidget_wrap.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "src/cpp/QtGui/QWidget/qwidget_macro.h"
+#include "src/cpp/QtWidgets/QWidget/qwidget_macro.h"
 
 #include <napi.h>
 #include "nwidget.h"
diff --git a/src/cpp/autogen/nwidget_moc.cpp b/src/cpp/autogen/nwidget_moc.cpp
index 9e4b1befb..dd46532ce 100644
--- a/src/cpp/autogen/nwidget_moc.cpp
+++ b/src/cpp/autogen/nwidget_moc.cpp
@@ -7,7 +7,7 @@
 *****************************************************************************/
 
 #include <memory>
-#include "../QtGui/QWidget/nwidget.h"
+#include "../QtWidgets/QWidget/nwidget.h"
 #include <QtCore/qbytearray.h>
 #include <QtCore/qmetatype.h>
 #if !defined(Q_MOC_OUTPUT_REVISION)
diff --git a/src/cpp/core/FlexLayout/flexlayout_wrap.cpp b/src/cpp/core/FlexLayout/flexlayout_wrap.cpp
index f7f943f70..7295060e7 100644
--- a/src/cpp/core/FlexLayout/flexlayout_wrap.cpp
+++ b/src/cpp/core/FlexLayout/flexlayout_wrap.cpp
@@ -1,5 +1,5 @@
 #include "flexlayout_wrap.h"
-#include "src/cpp/QtGui/QWidget/qwidget_wrap.h"
+#include "src/cpp/QtWidgets/QWidget/qwidget_wrap.h"
 #include "src/cpp/Extras/Utils/nutils.h"
 
 Napi::FunctionReference FlexLayoutWrap::constructor;
diff --git a/src/cpp/main.cpp b/src/cpp/main.cpp
index e067c2709..e07b52cdf 100644
--- a/src/cpp/main.cpp
+++ b/src/cpp/main.cpp
@@ -1,5 +1,5 @@
 #include "src/cpp/QtGui/QApplication/qapplication_wrap.h"
-#include "src/cpp/QtGui/QWidget/qwidget_wrap.h"
+#include "src/cpp/QtWidgets/QWidget/qwidget_wrap.h"
 #include "src/cpp/QtGui/QPixmap/qpixmap_wrap.h"
 #include "src/cpp/QtWidgets/QGridLayout/qgridlayout_wrap.h"
 #include "src/cpp/QtWidgets/QLayout/qlayout_wrap.h"