diff --git a/package/gluon-mesh-batman-adv-core/files/lib/gluon/radvd/arguments b/package/gluon-mesh-batman-adv-core/luasrc/lib/gluon/radvd/arguments
similarity index 100%
rename from package/gluon-mesh-batman-adv-core/files/lib/gluon/radvd/arguments
rename to package/gluon-mesh-batman-adv-core/luasrc/lib/gluon/radvd/arguments
diff --git a/package/gluon-next-node/Makefile b/package/gluon-next-node/Makefile
index 87c8edf9..312c7a1e 100644
--- a/package/gluon-next-node/Makefile
+++ b/package/gluon-next-node/Makefile
@@ -27,10 +27,12 @@ define Build/Configure
 endef
 
 define Build/Compile
+	$(call GluonSrcDiet,./luasrc,$(PKG_BUILD_DIR)/luadest/)
 endef
 
 define Package/gluon-next-node/install
 	$(CP) ./files/* $(1)/
+	$(CP) $(PKG_BUILD_DIR)/luadest/* $(1)/
 endef
 
 define Package/gluon-next-node/postinst
diff --git a/package/gluon-next-node/files/lib/gluon/upgrade/400-next-node b/package/gluon-next-node/luasrc/lib/gluon/upgrade/400-next-node
similarity index 100%
rename from package/gluon-next-node/files/lib/gluon/upgrade/400-next-node
rename to package/gluon-next-node/luasrc/lib/gluon/upgrade/400-next-node
diff --git a/package/gluon-node-info/Makefile b/package/gluon-node-info/Makefile
index 8dd31553..27cd16f2 100644
--- a/package/gluon-node-info/Makefile
+++ b/package/gluon-node-info/Makefile
@@ -22,8 +22,13 @@ define Build/Prepare
 	$(CP) ./src/* $(PKG_BUILD_DIR)/
 endef
 
+define Build/Compile
+	$(call GluonSrcDiet,./luasrc,$(PKG_BUILD_DIR)/luadest/)
+endef
+
 define Package/gluon-node-info/install
 	$(CP) ./files/* $(1)/
+	$(CP) $(PKG_BUILD_DIR)/luadest/* $(1)/
 
 	$(INSTALL_DIR) $(1)/lib/gluon/respondd
 	$(CP) $(PKG_BUILD_DIR)/respondd.so $(1)/lib/gluon/respondd/node-info.so
diff --git a/package/gluon-node-info/files/lib/gluon/upgrade/500-node-info-system b/package/gluon-node-info/luasrc/lib/gluon/upgrade/500-node-info-system
similarity index 100%
rename from package/gluon-node-info/files/lib/gluon/upgrade/500-node-info-system
rename to package/gluon-node-info/luasrc/lib/gluon/upgrade/500-node-info-system
diff --git a/package/gluon-node-info/files/lib/gluon/upgrade/510-node-info-role b/package/gluon-node-info/luasrc/lib/gluon/upgrade/510-node-info-role
similarity index 100%
rename from package/gluon-node-info/files/lib/gluon/upgrade/510-node-info-role
rename to package/gluon-node-info/luasrc/lib/gluon/upgrade/510-node-info-role
diff --git a/package/gluon-node-info/files/lib/gluon/upgrade/520-node-info-whitespace-fix b/package/gluon-node-info/luasrc/lib/gluon/upgrade/520-node-info-whitespace-fix
similarity index 100%
rename from package/gluon-node-info/files/lib/gluon/upgrade/520-node-info-whitespace-fix
rename to package/gluon-node-info/luasrc/lib/gluon/upgrade/520-node-info-whitespace-fix