diff --git a/.gitignore b/.gitignore
index 112d262..58f2dae 100644
--- a/.gitignore
+++ b/.gitignore
@@ -101,4 +101,10 @@ ENV/
 .mypy_cache/
 
 # generated models
-/models
+/src/models
+
+# build files
+debian/howdy.substvars
+debian/files
+debian/debhelper-build-stamp
+debian/howdy
diff --git a/.travis.yml b/.travis.yml
index 89fdb96..95d6041 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,11 +4,11 @@ sudo: required
 before_install:
   - git clone https://github.com/Boltgolt/howdy.git /tmp/howdy_build
   - cd /tmp/howdy_build
-  - dpkg-buildpackage -rfakeroot -d -us -uc -S
+  - debuild -i -us -uc -b
 
-install: sudo apt-get install ./build.deb
+install: sudo apt install ../*.deb
 
-script: howdy help
+script: sudo howdy help
 
 notifications:
   email: false
diff --git a/autocomplete.sh b/autocomplete/howdy
old mode 100644
new mode 100755
similarity index 100%
rename from autocomplete.sh
rename to autocomplete/howdy
diff --git a/debian/control b/debian/control
index 7aefc59..1f4bc91 100644
--- a/debian/control
+++ b/debian/control
@@ -11,4 +11,5 @@ Homepage: https://github.com/Boltgolt/howdy
 Architecture: all
 Depends: git, python3, python3-pip, python3-dev, python3-setuptools, build-essential, libpam-python, fswebcam, libopencv-dev, python-opencv, cmake
 Description: Windows Hello™ style authentication for Ubuntu.
- Use your built-in IR emitters and camera in combination with face recognition to prove who you are.
+ Use your built-in IR emitters and camera in combination with face recognition
+ to prove who you are.
diff --git a/debian/install b/debian/install
new file mode 100644
index 0000000..c35719b
--- /dev/null
+++ b/debian/install
@@ -0,0 +1,2 @@
+src/. lib/security/howdy
+autocomplete/. usr/share/bash-completion/completions
diff --git a/debian/postinst b/debian/postinst
index 02c6fe4..9977789 100755
--- a/debian/postinst
+++ b/debian/postinst
@@ -137,7 +137,7 @@ for line in fileinput.input(["/lib/security/howdy/config.ini"], inplace = 1):
 handleStatus(subprocess.call(["chmod 600 -R /lib/security/howdy/"], shell=True))
 
 # Install the command autocomplete, don't error on failure
-subprocess.call(["sudo cp /lib/security/howdy/autocomplete.sh /etc/bash_completion.d/howdy"], shell=True)
+# subprocess.call(["sudo cp /lib/security/howdy/autocomplete.sh /etc/bash_completion.d/howdy"], shell=True)
 
 log("Adding howdy as PAM module")
 
diff --git a/debian/rules b/debian/rules
index 5e3a4f9..6d3bdcb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,14 +7,5 @@ include /usr/share/dpkg/default.mk
 %:
 	dh $@
 
-clean:
-	echo "ok"
-
-build:
-	echo "ok"
-
 binary:
 	dh binary
-	mkdir ./debian/howdy/lib
-	mkdir ./debian/howdy/lib/security
-	cp -R bin ./debian/howdy/lib/security/howdy/
diff --git a/cli.py b/src/cli.py
similarity index 100%
rename from cli.py
rename to src/cli.py
diff --git a/cli/__init__.py b/src/cli/__init__.py
similarity index 100%
rename from cli/__init__.py
rename to src/cli/__init__.py
diff --git a/cli/add.py b/src/cli/add.py
similarity index 100%
rename from cli/add.py
rename to src/cli/add.py
diff --git a/cli/clear.py b/src/cli/clear.py
similarity index 100%
rename from cli/clear.py
rename to src/cli/clear.py
diff --git a/cli/help.py b/src/cli/help.py
similarity index 100%
rename from cli/help.py
rename to src/cli/help.py
diff --git a/cli/list.py b/src/cli/list.py
similarity index 100%
rename from cli/list.py
rename to src/cli/list.py
diff --git a/cli/remove.py b/src/cli/remove.py
similarity index 100%
rename from cli/remove.py
rename to src/cli/remove.py
diff --git a/cli/test.py b/src/cli/test.py
similarity index 100%
rename from cli/test.py
rename to src/cli/test.py
diff --git a/compare.py b/src/compare.py
similarity index 100%
rename from compare.py
rename to src/compare.py
diff --git a/config.ini b/src/config.ini
similarity index 100%
rename from config.ini
rename to src/config.ini
diff --git a/pam.py b/src/pam.py
similarity index 100%
rename from pam.py
rename to src/pam.py