diff --git a/Makefile b/Makefile
index 3d6f739..0bdea63 100644
--- a/Makefile
+++ b/Makefile
@@ -7,41 +7,28 @@ BUILDDIR ?= ${PACKAGE}-${DEB_VERSION_UPSTREAM}
 
 DEB=${PACKAGE}_${DEB_VERSION_UPSTREAM_REVISION}_all.deb
 
-DESTDIR=
-
-PERL5DIR=${DESTDIR}/usr/share/perl5
-DOCDIR=${DESTDIR}/usr/share/doc/${PACKAGE}
-
 all:
 
 .PHONY: deb
 deb: ${DEB}
 ${DEB}:
 	rm -rf ${BUILDDIR}
-	rsync -a * ${BUILDDIR}
+	cp -a src ${BUILDDIR}
+	cp -a debian ${BUILDDIR}/
 	echo "git clone git://git.proxmox.com/git/pve-http-server\\ngit checkout $(GITVERSION)" > $(BUILDDIR)/debian/SOURCE
 	cd ${BUILDDIR}; dpkg-buildpackage -b -us -uc
 	lintian ${DEB}
 
-install: PVE
-	install -d -m 755 ${PERL5DIR}/PVE/APIServer
-	install -m 0644 PVE/APIServer/AnyEvent.pm ${PERL5DIR}/PVE/APIServer
-	install -m 0644 PVE/APIServer/Formatter.pm ${PERL5DIR}/PVE/APIServer
-	install -m 0644 PVE/APIServer/Utils.pm ${PERL5DIR}/PVE/APIServer
-	install -d -m 755 ${PERL5DIR}/PVE/APIServer/Formatter
-	install -m 0644 PVE/APIServer/Formatter/Standard.pm ${PERL5DIR}/PVE/APIServer/Formatter
-	install -m 0644 PVE/APIServer/Formatter/Bootstrap.pm ${PERL5DIR}/PVE/APIServer/Formatter
-	install -m 0644 PVE/APIServer/Formatter/HTML.pm ${PERL5DIR}/PVE/APIServer/Formatter
-
 .PHONY: upload
 upload: ${DEB}
 	tar cf - ${DEB} | ssh -X repoman@repo.proxmox.com -- upload --product pve,pmg --dist buster
 
 .PHONY: clean distclean
 distclean: clean
-	rm -f examples/simple-demo.pem
+	${MAKE} -C src $@
 
 clean:
+	${MAKE} -C src $@
 	rm -rf ${PACKAGE}-*/ *.deb *.changes *.buildinfo ${BTDIR} examples/simple-demo.lck
 	find . -name '*~' -exec rm {} ';'
 
diff --git a/src/Makefile b/src/Makefile
new file mode 100644
index 0000000..9e1a8f7
--- /dev/null
+++ b/src/Makefile
@@ -0,0 +1,23 @@
+DESTDIR=
+PERL5DIR=${DESTDIR}/usr/share/perl5
+DOCDIR=${DESTDIR}/usr/share/doc/${PACKAGE}
+
+all:
+
+install: PVE
+	install -d -m 755 ${PERL5DIR}/PVE/APIServer
+	install -m 0644 PVE/APIServer/AnyEvent.pm ${PERL5DIR}/PVE/APIServer
+	install -m 0644 PVE/APIServer/Formatter.pm ${PERL5DIR}/PVE/APIServer
+	install -m 0644 PVE/APIServer/Utils.pm ${PERL5DIR}/PVE/APIServer
+	install -d -m 755 ${PERL5DIR}/PVE/APIServer/Formatter
+	install -m 0644 PVE/APIServer/Formatter/Standard.pm ${PERL5DIR}/PVE/APIServer/Formatter
+	install -m 0644 PVE/APIServer/Formatter/Bootstrap.pm ${PERL5DIR}/PVE/APIServer/Formatter
+	install -m 0644 PVE/APIServer/Formatter/HTML.pm ${PERL5DIR}/PVE/APIServer/Formatter
+
+.PHONY: clean distclean
+distclean: clean
+	rm -f examples/simple-demo.pem
+
+clean:
+	rm -rf examples/simple-demo.lck
+	find . -name '*~' -exec rm {} ';'
diff --git a/PVE/APIServer/AnyEvent.pm b/src/PVE/APIServer/AnyEvent.pm
similarity index 100%
rename from PVE/APIServer/AnyEvent.pm
rename to src/PVE/APIServer/AnyEvent.pm
diff --git a/PVE/APIServer/Formatter.pm b/src/PVE/APIServer/Formatter.pm
similarity index 100%
rename from PVE/APIServer/Formatter.pm
rename to src/PVE/APIServer/Formatter.pm
diff --git a/PVE/APIServer/Formatter/Bootstrap.pm b/src/PVE/APIServer/Formatter/Bootstrap.pm
similarity index 100%
rename from PVE/APIServer/Formatter/Bootstrap.pm
rename to src/PVE/APIServer/Formatter/Bootstrap.pm
diff --git a/PVE/APIServer/Formatter/HTML.pm b/src/PVE/APIServer/Formatter/HTML.pm
similarity index 100%
rename from PVE/APIServer/Formatter/HTML.pm
rename to src/PVE/APIServer/Formatter/HTML.pm
diff --git a/PVE/APIServer/Formatter/Standard.pm b/src/PVE/APIServer/Formatter/Standard.pm
similarity index 100%
rename from PVE/APIServer/Formatter/Standard.pm
rename to src/PVE/APIServer/Formatter/Standard.pm
diff --git a/PVE/APIServer/Utils.pm b/src/PVE/APIServer/Utils.pm
similarity index 100%
rename from PVE/APIServer/Utils.pm
rename to src/PVE/APIServer/Utils.pm
diff --git a/examples/console-demo.pl b/src/examples/console-demo.pl
similarity index 100%
rename from examples/console-demo.pl
rename to src/examples/console-demo.pl
diff --git a/examples/simple-demo.pl b/src/examples/simple-demo.pl
similarity index 100%
rename from examples/simple-demo.pl
rename to src/examples/simple-demo.pl