diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3d4f9b513..4772cae71 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,19 +1,10 @@
 cmake_minimum_required(VERSION 3.1)
-if(${CMAKE_VERSION} VERSION_LESS 3.15)
-    cmake_policy(VERSION ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION})
-else()
-    cmake_policy(VERSION 3.15)
-endif()
 
-set(CMAKE_INCLUDE_CURRENT_DIR ON)
-# Need for automatic moc. Moc executable path is set in qt.cmake
-set(CMAKE_AUTOMOC ON)
-set(QT_VERSION_MAJOR 5)
-add_executable(Qt5::moc IMPORTED)
+include(./config/common.cmake)
+include(./config/qt.cmake)
+include(./config/napi.cmake)
 
-project(NodeGUI 
-    VERSION 1.0
-)
+project(NodeGUI VERSION 1.0)
 
 set(CORE_WIDGETS_ADDON "nodegui_core")
 # ---------------------------------------
@@ -81,14 +72,8 @@ add_library(${CORE_WIDGETS_ADDON} SHARED
     "${PROJECT_SOURCE_DIR}/src/cpp/include/nodegui/QtWidgets/QTabWidget/ntabwidget.hpp"
 ) 
 
-# common
-include(./config/common.cmake)
 AddCommonConfig(${CORE_WIDGETS_ADDON})
-# qt
-include(./config/qt.cmake)
 AddQtSupport(${CORE_WIDGETS_ADDON})
-# napi
-include(./config/napi.cmake)
 AddNapiSupport(${CORE_WIDGETS_ADDON})
 
 target_include_directories(${CORE_WIDGETS_ADDON} PRIVATE 
diff --git a/config/plugin.cmake b/config/plugin.cmake
index 53de5d2dd..34f67925b 100644
--- a/config/plugin.cmake
+++ b/config/plugin.cmake
@@ -3,15 +3,13 @@ set(PLUGIN_CMAKE_DIR "${CMAKE_CURRENT_LIST_DIR}")
 set(NODEGUI_ROOT "${PLUGIN_CMAKE_DIR}/..")
 set(NODEGUI_LIBRARY "${NODEGUI_ROOT}/build/Release/nodegui_core.node")
 
+include("${PLUGIN_CMAKE_DIR}/common.cmake")
+include("${PLUGIN_CMAKE_DIR}/qt.cmake")
+include("${PLUGIN_CMAKE_DIR}/napi.cmake")
+
 function(AddPluginConfig addonName)
-    # common
-    include("${PLUGIN_CMAKE_DIR}/common.cmake")
     AddCommonConfig(${addonName})
-    # qt
-    include("${PLUGIN_CMAKE_DIR}/qt.cmake")
     AddQtSupport(${addonName})
-    # napi
-    include("${PLUGIN_CMAKE_DIR}/napi.cmake")
     AddNapiSupport(${addonName})
 
     target_link_libraries(${addonName} PRIVATE
@@ -27,6 +25,5 @@ function(AddPluginConfig addonName)
         "${NODEGUI_ROOT}/src/cpp/include/nodegui"
     )
 
-
 endfunction(AddPluginConfig addonName)
 
diff --git a/config/qt.cmake b/config/qt.cmake
index 868441613..c45e1a6ac 100644
--- a/config/qt.cmake
+++ b/config/qt.cmake
@@ -1,4 +1,10 @@
 # Adds Qt support
+# make sure you include this at the top of whichever Cmakelist file you are going to use.
+# Need for automatic moc. Moc executable path is set in qt.cmake
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+set(QT_VERSION_MAJOR 5)
+add_executable(Qt5::moc IMPORTED)
 
 function(AddQtSupport addonName)
     execute_process(COMMAND node -p "require('@nodegui/qode').qtHome"