diff --git a/etc/runonce.d/10-set-mac-addresses b/debian/10-set-mac-addresses
similarity index 100%
rename from etc/runonce.d/10-set-mac-addresses
rename to debian/10-set-mac-addresses
diff --git a/etc/NetworkManager/conf.d/wifi.ignore-p2p0.conf b/debian/NetworkManager/conf.d/wifi.ignore-p2p0.conf
similarity index 100%
rename from etc/NetworkManager/conf.d/wifi.ignore-p2p0.conf
rename to debian/NetworkManager/conf.d/wifi.ignore-p2p0.conf
diff --git a/etc/NetworkManager/conf.d/wifi.scan-rand-mac-address.conf b/debian/NetworkManager/conf.d/wifi.scan-rand-mac-address.conf
similarity index 100%
rename from etc/NetworkManager/conf.d/wifi.scan-rand-mac-address.conf
rename to debian/NetworkManager/conf.d/wifi.scan-rand-mac-address.conf
diff --git a/debian/changelog b/debian/changelog
index 9cdc1a9..32ccc55 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+imx-board-wlan (4-1) UNRELEASED; urgency=medium
+
+  * Build qcacld-2.0 module out of tree
+  * Restructure package a bit
+
+ -- Coral <coral-support@google.com>  Mon, 15 Jul 2019 13:42:26 -0700
+
 imx-board-wlan (3-1) mendel-chef; urgency=medium
 
   * Fix to the MAC address vendor script.
diff --git a/debian/control b/debian/control
index 7ab3a68..c76f038 100644
--- a/debian/control
+++ b/debian/control
@@ -1,6 +1,6 @@
 Source: imx-board-wlan
 Maintainer: Coral <coral-support@google.com>
-Build-Depends: debhelper (>=10)
+Build-Depends: debhelper (>=10), linux-headers-4.14.98-imx, linux-kbuild-4.14.98-imx
 Section: net
 Priority: optional
 Standards-Version: 3.9.8
diff --git a/lib/firmware/bdwlan30.bin b/debian/firmware/bdwlan30.bin
similarity index 100%
rename from lib/firmware/bdwlan30.bin
rename to debian/firmware/bdwlan30.bin
Binary files differ
diff --git a/lib/firmware/otp30.bin b/debian/firmware/otp30.bin
similarity index 100%
rename from lib/firmware/otp30.bin
rename to debian/firmware/otp30.bin
Binary files differ
diff --git a/lib/firmware/qwlan30.bin b/debian/firmware/qwlan30.bin
similarity index 100%
rename from lib/firmware/qwlan30.bin
rename to debian/firmware/qwlan30.bin
Binary files differ
diff --git a/lib/firmware/utf30.bin b/debian/firmware/utf30.bin
similarity index 100%
rename from lib/firmware/utf30.bin
rename to debian/firmware/utf30.bin
Binary files differ
diff --git a/lib/firmware/wlan/qcom_cfg.ini b/debian/firmware/wlan/qcom_cfg.ini
similarity index 100%
rename from lib/firmware/wlan/qcom_cfg.ini
rename to debian/firmware/wlan/qcom_cfg.ini
diff --git a/debian/imx-board-wlan.install b/debian/imx-board-wlan.install
deleted file mode 100644
index d0b7fe8..0000000
--- a/debian/imx-board-wlan.install
+++ /dev/null
@@ -1,2 +0,0 @@
-etc /
-lib /
diff --git a/debian/rules b/debian/rules
index ea37544..b3ba22f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,5 +4,30 @@
 # Uncomment this to turn on verbose mode.
 # export DH_VERBOSE=1
 
+DESTDIR := $(shell pwd)/debian/imx-board-wlan
+LDFLAGS := -z relro
+KERNEL_VER := 4.14.98-imx
+
+KERNEL_MAKEOPTS := \
+	CROSS_COMPILE=aarch64-linux-gnu- \
+	KERNEL_SRC=/lib/modules/$(KERNEL_VER)/build \
+	ARCH=arm64 \
+	INSTALL_MOD_PATH=$(DESTDIR)
+
 %:
 	dh $@
+
+override_dh_auto_clean:
+	true
+
+override_dh_auto_build:
+	make $(KERNEL_MAKEOPTS) -j$(shell nproc)
+
+override_dh_auto_install:
+	make $(KERNEL_MAKEOPTS) modules_install
+	install -d $(DESTDIR)/lib/firmware
+	cp -r debian/firmware/* $(DESTDIR)/lib/firmware
+	install -d $(DESTDIR)/etc/runonce.d
+	cp debian/10-set-mac-addresses $(DESTDIR)/etc/runonce.d
+	install -d $(DESTDIR)/etc/
+	cp -r debian/NetworkManager $(DESTDIR)/etc
diff --git a/lib/systemd/system/imx-board-wlan.service b/lib/systemd/system/imx-board-wlan.service
deleted file mode 100644
index 433d3b4..0000000
--- a/lib/systemd/system/imx-board-wlan.service
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=Enterprise Board WLAN
-
-[Service]
-Type=oneshot
-ExecStart=/bin/bash -c "echo '/lib/firmware' > /sys/module/wlan/parameters/fwpath"
-
-[Install]
-WantedBy=multi-user.target