diff --git a/package/gluon-alfred/Makefile b/package/gluon-alfred/Makefile
index 01fbdf438fc99b696cc6acfc753a523417677b97..be0ff0da4818cbd48c27b36a399077b69c0cd25a 100644
--- a/package/gluon-alfred/Makefile
+++ b/package/gluon-alfred/Makefile
@@ -6,7 +6,7 @@ PKG_RELEASE:=1
PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
-include $(GLUONDIR)/include/package.mk
+include ../gluon.mk
define Package/gluon-alfred
diff --git a/package/gluon-authorized-keys/Makefile b/package/gluon-authorized-keys/Makefile
index 83eaf04f8f67e6542e0f04d34b392e683979a8d0..7d010dc9af64fc8f3fae47a18d4bc61de47660e4 100644
--- a/package/gluon-authorized-keys/Makefile
+++ b/package/gluon-authorized-keys/Makefile
@@ -5,7 +5,7 @@ PKG_VERSION:=2
PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
-include $(GLUONDIR)/include/package.mk
+include ../gluon.mk
define Package/gluon-authorized-keys
diff --git a/package/gluon-autoupdater/Makefile b/package/gluon-autoupdater/Makefile
index baae06baf78d2f1ec3d7b3a2363a7c1d9456f6b7..41cdf7965701f8d7793647e2f35a10ac27ebaba3 100644
--- a/package/gluon-autoupdater/Makefile
+++ b/package/gluon-autoupdater/Makefile
@@ -7,7 +7,7 @@ PKG_RELEASE:=$(GLUON_BRANCH)
PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
PKG_BUILD_DEPENDS := respondd
-include $(GLUONDIR)/include/package.mk
+include ../gluon.mk
define Package/gluon-autoupdater
diff --git a/package/gluon-client-bridge/Makefile b/package/gluon-client-bridge/Makefile
index cbd62a3844fbb226e1c01b2ab5017d67764e7723..57d5b314f12b41d1cfd35290eb21fd02615a66a9 100644
--- a/package/gluon-client-bridge/Makefile
+++ b/package/gluon-client-bridge/Makefile
@@ -5,7 +5,7 @@ PKG_VERSION:=1
PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
-include $(GLUONDIR)/include/package.mk
+include ../gluon.mk
define Package/gluon-client-bridge
diff --git a/package/gluon-config-mode-autoupdater/Makefile b/package/gluon-config-mode-autoupdater/Makefile
index ab5d1adc5faf0afe68463c5494a25cade212e298..2fe1ccb2e44a2ad1fb29824d17b2e7d008e67cbe 100644
--- a/package/gluon-config-mode-autoupdater/Makefile
+++ b/package/gluon-config-mode-autoupdater/Makefile
@@ -5,7 +5,7 @@ PKG_VERSION:=1
PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
-include $(GLUONDIR)/include/package.mk
+include ../gluon.mk
PKG_CONFIG_DEPENDS += $(GLUON_I18N_CONFIG)
diff --git a/package/gluon-config-mode-contact-info/Makefile b/package/gluon-config-mode-contact-info/Makefile
index 3ac8a0b3cde41ab943d91902ba5cb78aafdaecdb..7a3780a66dc382ea597972fbc2baac63e0b86102 100644
--- a/package/gluon-config-mode-contact-info/Makefile
+++ b/package/gluon-config-mode-contact-info/Makefile
@@ -5,7 +5,7 @@ PKG_VERSION:=1
PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
-include $(GLUONDIR)/include/package.mk
+include ../gluon.mk
PKG_CONFIG_DEPENDS += $(GLUON_I18N_CONFIG)
diff --git a/package/gluon-config-mode-core/Makefile b/package/gluon-config-mode-core/Makefile
index 52a4f0e13d5fba9973579fc268bcc40a254b45c6..d629c265373aee803c734cdcc9b3207e4f4e821c 100644
--- a/package/gluon-config-mode-core/Makefile
+++ b/package/gluon-config-mode-core/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:=2
PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
-include $(GLUONDIR)/include/package.mk
+include ../gluon.mk
PKG_CONFIG_DEPENDS += $(GLUON_I18N_CONFIG)
diff --git a/package/gluon-config-mode-geo-location/Makefile b/package/gluon-config-mode-geo-location/Makefile
index aa16ad06e62aed3a697de6be4b42e67f98247922..af523f093da03c72175ef3ce6fa92364d63f6a36 100644
--- a/package/gluon-config-mode-geo-location/Makefile
+++ b/package/gluon-config-mode-geo-location/Makefile
@@ -5,7 +5,7 @@ PKG_VERSION:=1
PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
-include $(GLUONDIR)/include/package.mk
+include ../gluon.mk
PKG_CONFIG_DEPENDS += $(GLUON_I18N_CONFIG)
diff --git a/package/gluon-config-mode-hostname/Makefile b/package/gluon-config-mode-hostname/Makefile
index 6e30466d049036d76b785f9856501e969c218783..2b24a640f1d02c92b0949da01bd4708fd5d12493 100644
--- a/package/gluon-config-mode-hostname/Makefile
+++ b/package/gluon-config-mode-hostname/Makefile
@@ -5,7 +5,7 @@ PKG_VERSION:=1
PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
-include $(GLUONDIR)/include/package.mk
+include ../gluon.mk
PKG_CONFIG_DEPENDS += $(GLUON_I18N_CONFIG)
diff --git a/package/gluon-config-mode-mesh-vpn/Makefile b/package/gluon-config-mode-mesh-vpn/Makefile
index ec819a9ca5ad0a567972b011bf17674ea48a875f..c52ffed1d3430818e10f2fda81e6e1621fc9fb13 100644
--- a/package/gluon-config-mode-mesh-vpn/Makefile
+++ b/package/gluon-config-mode-mesh-vpn/Makefile
@@ -5,7 +5,7 @@ PKG_VERSION:=2
PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
-include $(GLUONDIR)/include/package.mk
+include ../gluon.mk
PKG_CONFIG_DEPENDS += $(GLUON_I18N_CONFIG)
diff --git a/package/gluon-core/Makefile b/package/gluon-core/Makefile
index 9917a5e0026cef6e737384d6b4979e0f6e63be13..3e0ae0598acff0430cd63c2c6f306ddd3cece81e 100644
--- a/package/gluon-core/Makefile
+++ b/package/gluon-core/Makefile
@@ -6,7 +6,7 @@ PKG_RELEASE:=$(GLUON_VERSION)
PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
-include $(GLUONDIR)/include/package.mk
+include ../gluon.mk
define Package/gluon-core
diff --git a/package/gluon-legacy/Makefile b/package/gluon-legacy/Makefile
index 1cb2e5f45ecd79d42f77e0c01ccf27562f4b0a4b..64607ea31df406330df653c4497f38bc03d89f3a 100644
--- a/package/gluon-legacy/Makefile
+++ b/package/gluon-legacy/Makefile
@@ -5,7 +5,7 @@ PKG_VERSION:=2
PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
-include $(GLUONDIR)/include/package.mk
+include ../gluon.mk
define Package/gluon-legacy
diff --git a/package/gluon-luci-admin/Makefile b/package/gluon-luci-admin/Makefile
index 7b5f632a310607cc4d461d8d525034b75fc6d049..bb6f8350dea672c233ee1127b1ab0308be77ca37 100644
--- a/package/gluon-luci-admin/Makefile
+++ b/package/gluon-luci-admin/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE:=1
PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
-include $(GLUONDIR)/include/package.mk
+include ../gluon.mk
PKG_CONFIG_DEPENDS += $(GLUON_I18N_CONFIG)
diff --git a/package/gluon-luci-autoupdater/Makefile b/package/gluon-luci-autoupdater/Makefile
index 908a08794b344a2012bb6ea9f85deb669a61cf78..4cecb10ac75b679cdb1ea3bc11e297c8ca5f666d 100644
--- a/package/gluon-luci-autoupdater/Makefile
+++ b/package/gluon-luci-autoupdater/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE:=1
PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
-include $(GLUONDIR)/include/package.mk
+include ../gluon.mk
PKG_CONFIG_DEPENDS += $(GLUON_I18N_CONFIG)
diff --git a/package/gluon-luci-mesh-vpn-fastd/Makefile b/package/gluon-luci-mesh-vpn-fastd/Makefile
index b6b7ce4f9aab42a93f9e2ebd00ea6067ad72b614..71dadce7928ad4c3dd114a3e9cbb59b82f7e8c42 100644
--- a/package/gluon-luci-mesh-vpn-fastd/Makefile
+++ b/package/gluon-luci-mesh-vpn-fastd/Makefile
@@ -6,7 +6,7 @@ PKG_RELEASE:=1
PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
-include $(GLUONDIR)/include/package.mk
+include ../gluon.mk
PKG_CONFIG_DEPENDS += $(GLUON_I18N_CONFIG)
diff --git a/package/gluon-luci-node-role/Makefile b/package/gluon-luci-node-role/Makefile
index 2c8626101118383e9628a0d6d8480db996682300..058e879cb4efe05082886bbb463d4326bd925448 100644
--- a/package/gluon-luci-node-role/Makefile
+++ b/package/gluon-luci-node-role/Makefile
@@ -6,7 +6,7 @@ PKG_RELEASE:=1
PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
-include $(GLUONDIR)/include/package.mk
+include ../gluon.mk
PKG_CONFIG_DEPENDS += $(GLUON_I18N_CONFIG)
diff --git a/package/gluon-luci-portconfig/Makefile b/package/gluon-luci-portconfig/Makefile
index d4590864ed8afb816b8002c1e8001a3f701ff949..eaec9db49028421b4dfd459be52c760a29bc34bf 100644
--- a/package/gluon-luci-portconfig/Makefile
+++ b/package/gluon-luci-portconfig/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE:=1
PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
-include $(GLUONDIR)/include/package.mk
+include ../gluon.mk
PKG_CONFIG_DEPENDS += $(GLUON_I18N_CONFIG)
diff --git a/package/gluon-luci-private-wifi/Makefile b/package/gluon-luci-private-wifi/Makefile
index 3460890073f1570fe6218f2f45afec6df5537186..ef6f2a0add09011b855e83cb36f4204fcfcb5448 100644
--- a/package/gluon-luci-private-wifi/Makefile
+++ b/package/gluon-luci-private-wifi/Makefile
@@ -6,7 +6,7 @@ PKG_RELEASE:=1
PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
-include $(GLUONDIR)/include/package.mk
+include ../gluon.mk
PKG_CONFIG_DEPENDS += $(GLUON_I18N_CONFIG)
diff --git a/package/gluon-luci-theme/Makefile b/package/gluon-luci-theme/Makefile
index 6e65db3c7ae3b925167c4959bd10e383a5febeb2..2486519a339c162a79049eb04df54e539d3480cb 100644
--- a/package/gluon-luci-theme/Makefile
+++ b/package/gluon-luci-theme/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE:=1
PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
-include $(GLUONDIR)/include/package.mk
+include ../gluon.mk
define Package/gluon-luci-theme
diff --git a/package/gluon-luci-wifi-config/Makefile b/package/gluon-luci-wifi-config/Makefile
index 0f0d90f29e75c5c7fbfc02b06060a679e9d94fc2..881f2f0edd4232afedd6002a44319c331b4b424d 100644
--- a/package/gluon-luci-wifi-config/Makefile
+++ b/package/gluon-luci-wifi-config/Makefile
@@ -6,7 +6,7 @@ PKG_RELEASE:=1
PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
-include $(GLUONDIR)/include/package.mk
+include ../gluon.mk
PKG_CONFIG_DEPENDS += $(GLUON_I18N_CONFIG)
diff --git a/package/gluon-mesh-batman-adv-14/Makefile b/package/gluon-mesh-batman-adv-14/Makefile
index aa53e85fbed34122d2b135f39bc4a813ce775855..cd3aa2fbf0e5ce8d6eb9080c7246cbdd46367f2e 100644
--- a/package/gluon-mesh-batman-adv-14/Makefile
+++ b/package/gluon-mesh-batman-adv-14/Makefile
@@ -5,7 +5,7 @@ PKG_VERSION:=1
PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
-include $(GLUONDIR)/include/package.mk
+include ../gluon.mk
define Package/gluon-mesh-batman-adv-14
diff --git a/package/gluon-mesh-batman-adv-15/Makefile b/package/gluon-mesh-batman-adv-15/Makefile
index d64fea88af071e8fc2f71c20e3e3fb307a559ff8..7f8d8a8058d687ea86358acdad9e0c5002db343c 100644
--- a/package/gluon-mesh-batman-adv-15/Makefile
+++ b/package/gluon-mesh-batman-adv-15/Makefile
@@ -5,7 +5,7 @@ PKG_VERSION:=1
PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
-include $(GLUONDIR)/include/package.mk
+include ../gluon.mk
define Package/gluon-mesh-batman-adv-15
diff --git a/package/gluon-mesh-batman-adv-core/Makefile b/package/gluon-mesh-batman-adv-core/Makefile
index 1989ab786adc348fc55f86a8f0ca4cfbd4321adb..d476d4f8d1997fe8a10c3f9d97fe927378404c06 100644
--- a/package/gluon-mesh-batman-adv-core/Makefile
+++ b/package/gluon-mesh-batman-adv-core/Makefile
@@ -6,7 +6,7 @@ PKG_VERSION:=1
PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
PKG_BUILD_DEPENDS := respondd
-include $(GLUONDIR)/include/package.mk
+include ../gluon.mk
define Package/gluon-mesh-batman-adv-core
diff --git a/package/gluon-mesh-vpn-fastd/Makefile b/package/gluon-mesh-vpn-fastd/Makefile
index 4d75116e7cdfa9b1a59f8d90bc915bbe1a729deb..8fceae1aba7b40b284165624373a74449a0b504a 100644
--- a/package/gluon-mesh-vpn-fastd/Makefile
+++ b/package/gluon-mesh-vpn-fastd/Makefile
@@ -6,7 +6,7 @@ PKG_VERSION:=3
PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
PKG_BUILD_DEPENDS := respondd
-include $(GLUONDIR)/include/package.mk
+include ../gluon.mk
define Package/gluon-mesh-vpn-fastd
diff --git a/package/gluon-neighbour-info/Makefile b/package/gluon-neighbour-info/Makefile
index 498abc4f290737b0df89c939200a6f33d058c6dc..867f32f6d099fdeee0958c7175d7d53a56c516d2 100644
--- a/package/gluon-neighbour-info/Makefile
+++ b/package/gluon-neighbour-info/Makefile
@@ -6,7 +6,7 @@ PKG_RELEASE:=1
PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
-include $(GLUONDIR)/include/package.mk
+include ../gluon.mk
define Package/gluon-neighbour-info
diff --git a/package/gluon-node-info/Makefile b/package/gluon-node-info/Makefile
index 8dd31553e25b53cf01b5153b3d4f3a3d6d405a32..59f60dfd87414093928052c5b8fd56531671cf84 100644
--- a/package/gluon-node-info/Makefile
+++ b/package/gluon-node-info/Makefile
@@ -7,7 +7,7 @@ PKG_RELEASE:=1
PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
PKG_BUILD_DEPENDS := respondd
-include $(GLUONDIR)/include/package.mk
+include ../gluon.mk
define Package/gluon-node-info
diff --git a/package/gluon-radvd/Makefile b/package/gluon-radvd/Makefile
index 0ca181773c61f04dd2a51d2d72b0916187776ad7..ba04c04e6b0960b80f8f1d6d6cb7d3b6cf452033 100644
--- a/package/gluon-radvd/Makefile
+++ b/package/gluon-radvd/Makefile
@@ -5,7 +5,7 @@ PKG_VERSION:=3
PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
-include $(GLUONDIR)/include/package.mk
+include ../gluon.mk
define Package/gluon-radvd
diff --git a/package/gluon-respondd/Makefile b/package/gluon-respondd/Makefile
index c6cc71e4f7cbd13d0c25d3f9d42b3fbac2dd386b..c0b201fa9ffec0721edddb2a8b327fcbf5bd01bd 100644
--- a/package/gluon-respondd/Makefile
+++ b/package/gluon-respondd/Makefile
@@ -5,7 +5,7 @@ PKG_VERSION:=1
PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
-include $(GLUONDIR)/include/package.mk
+include ../gluon.mk
define Package/gluon-respondd
diff --git a/package/gluon-setup-mode/Makefile b/package/gluon-setup-mode/Makefile
index ea9722c0f67fcaa960af5479e7a506099e3e48ea..e34f48586195ae86a6a65bdd3ed421721ba18d79 100644
--- a/package/gluon-setup-mode/Makefile
+++ b/package/gluon-setup-mode/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:=1
PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
-include $(GLUONDIR)/include/package.mk
+include ../gluon.mk
define Package/gluon-setup-mode
diff --git a/package/gluon-site/Makefile b/package/gluon-site/Makefile
index a0d120e80cd48d240669147fc548af66b4629d5c..b7138e3ce55a134d1a8f979d6779310caad1b07b 100644
--- a/package/gluon-site/Makefile
+++ b/package/gluon-site/Makefile
@@ -9,7 +9,7 @@ PKG_BUILD_DEPENDS := luci-base/host lua-cjson/host
PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
-include $(GLUONDIR)/include/package.mk
+include ../gluon.mk
PKG_CONFIG_DEPENDS += $(GLUON_I18N_CONFIG)
@@ -28,7 +28,7 @@ define Build/Configure
endef
define Build/Compile
- lua -e 'print(require("cjson").encode(assert(dofile("$(GLUONDIR)/scripts/site_config.lua"))))' > $(PKG_BUILD_DIR)/site.json
+ lua -e 'print(require("cjson").encode(assert(dofile("../../scripts/site_config.lua"))))' > $(PKG_BUILD_DIR)/site.json
$(call GluonBuildI18N,gluon-site,$(GLUON_SITEDIR)/i18n)
endef
diff --git a/package/gluon-status-page-api/Makefile b/package/gluon-status-page-api/Makefile
index 703d97f614858552ce1b31aed16e822c22d91c56..1c54dac0a4ba45d4a8005ca9e7f28dc0ad528a75 100644
--- a/package/gluon-status-page-api/Makefile
+++ b/package/gluon-status-page-api/Makefile
@@ -7,7 +7,7 @@ PKG_RELEASE:=1
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
PKG_BUILD_DEPENDS := respondd
-include $(GLUONDIR)/include/package.mk
+include ../gluon.mk
define Package/gluon-status-page-api
diff --git a/package/gluon-wan-dnsmasq/Makefile b/package/gluon-wan-dnsmasq/Makefile
index c672902dbb0918687197acf5dbae20bcbfdaf792..c7c63ca9198c7a6fff78364566f6002bbcb12b79 100644
--- a/package/gluon-wan-dnsmasq/Makefile
+++ b/package/gluon-wan-dnsmasq/Makefile
@@ -5,7 +5,7 @@ PKG_VERSION:=1
PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
-include $(GLUONDIR)/include/package.mk
+include ../gluon.mk
define Package/gluon-wan-dnsmasq
diff --git a/include/package.mk b/package/gluon.mk
similarity index 100%
rename from include/package.mk
rename to package/gluon.mk
diff --git a/package/libgluonutil/Makefile b/package/libgluonutil/Makefile
index bebeb2b3a2c710625688db77e25c1bae0b376922..489a9ba9916771923491b1afea4c24419b401e2d 100644
--- a/package/libgluonutil/Makefile
+++ b/package/libgluonutil/Makefile
@@ -8,7 +8,7 @@ PKG_LICENSE:=BSD-2-Clause
PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
-include $(GLUONDIR)/include/package.mk
+include ../gluon.mk
include $(INCLUDE_DIR)/cmake.mk