diff --git a/core/debian/Makefile b/debian/Makefile
similarity index 100%
rename from core/debian/Makefile
rename to debian/Makefile
diff --git a/core/debian/bareos-bconsole.install.in b/debian/bareos-bconsole.install.in
similarity index 100%
rename from core/debian/bareos-bconsole.install.in
rename to debian/bareos-bconsole.install.in
diff --git a/core/debian/bareos-bconsole.postinst.in b/debian/bareos-bconsole.postinst.in
similarity index 100%
rename from core/debian/bareos-bconsole.postinst.in
rename to debian/bareos-bconsole.postinst.in
diff --git a/core/debian/bareos-bconsole.postrm b/debian/bareos-bconsole.postrm
similarity index 100%
rename from core/debian/bareos-bconsole.postrm
rename to debian/bareos-bconsole.postrm
diff --git a/core/debian/bareos-common.dirs b/debian/bareos-common.dirs
similarity index 100%
rename from core/debian/bareos-common.dirs
rename to debian/bareos-common.dirs
diff --git a/core/debian/bareos-common.docs b/debian/bareos-common.docs
similarity index 100%
rename from core/debian/bareos-common.docs
rename to debian/bareos-common.docs
diff --git a/core/debian/bareos-common.install.in b/debian/bareos-common.install.in
similarity index 100%
rename from core/debian/bareos-common.install.in
rename to debian/bareos-common.install.in
diff --git a/core/debian/bareos-common.postinst.in b/debian/bareos-common.postinst.in
similarity index 100%
rename from core/debian/bareos-common.postinst.in
rename to debian/bareos-common.postinst.in
diff --git a/core/debian/bareos-common.postrm b/debian/bareos-common.postrm
similarity index 100%
rename from core/debian/bareos-common.postrm
rename to debian/bareos-common.postrm
diff --git a/core/debian/bareos-common.preinst.in b/debian/bareos-common.preinst.in
similarity index 100%
rename from core/debian/bareos-common.preinst.in
rename to debian/bareos-common.preinst.in
diff --git a/core/debian/bareos-database-common.config.in b/debian/bareos-database-common.config.in
similarity index 100%
rename from core/debian/bareos-database-common.config.in
rename to debian/bareos-database-common.config.in
diff --git a/core/debian/bareos-database-common.install.in b/debian/bareos-database-common.install.in
similarity index 100%
rename from core/debian/bareos-database-common.install.in
rename to debian/bareos-database-common.install.in
diff --git a/core/debian/bareos-database-common.postinst.in b/debian/bareos-database-common.postinst.in
similarity index 100%
rename from core/debian/bareos-database-common.postinst.in
rename to debian/bareos-database-common.postinst.in
diff --git a/core/debian/bareos-database-common.postrm b/debian/bareos-database-common.postrm
similarity index 100%
rename from core/debian/bareos-database-common.postrm
rename to debian/bareos-database-common.postrm
diff --git a/core/debian/bareos-database-common.prerm b/debian/bareos-database-common.prerm
similarity index 100%
rename from core/debian/bareos-database-common.prerm
rename to debian/bareos-database-common.prerm
diff --git a/core/debian/bareos-database-mysql.install.in b/debian/bareos-database-mysql.install.in
similarity index 100%
rename from core/debian/bareos-database-mysql.install.in
rename to debian/bareos-database-mysql.install.in
diff --git a/core/debian/bareos-database-postgresql.dirs.in b/debian/bareos-database-postgresql.dirs.in
similarity index 100%
rename from core/debian/bareos-database-postgresql.dirs.in
rename to debian/bareos-database-postgresql.dirs.in
diff --git a/core/debian/bareos-database-postgresql.install.in b/debian/bareos-database-postgresql.install.in
similarity index 100%
rename from core/debian/bareos-database-postgresql.install.in
rename to debian/bareos-database-postgresql.install.in
diff --git a/core/debian/bareos-database-sqlite3.install.in b/debian/bareos-database-sqlite3.install.in
similarity index 100%
rename from core/debian/bareos-database-sqlite3.install.in
rename to debian/bareos-database-sqlite3.install.in
diff --git a/core/debian/bareos-database-tools.install.in b/debian/bareos-database-tools.install.in
similarity index 100%
rename from core/debian/bareos-database-tools.install.in
rename to debian/bareos-database-tools.install.in
diff --git a/core/debian/bareos-devel.install.in b/debian/bareos-devel.install.in
similarity index 100%
rename from core/debian/bareos-devel.install.in
rename to debian/bareos-devel.install.in
diff --git a/core/debian/bareos-director-python-plugin.install.in b/debian/bareos-director-python-plugin.install.in
similarity index 100%
rename from core/debian/bareos-director-python-plugin.install.in
rename to debian/bareos-director-python-plugin.install.in
diff --git a/core/debian/bareos-director.bareos-dir.init.in b/debian/bareos-director.bareos-dir.init.in
similarity index 100%
rename from core/debian/bareos-director.bareos-dir.init.in
rename to debian/bareos-director.bareos-dir.init.in
diff --git a/core/debian/bareos-director.dirs b/debian/bareos-director.dirs
similarity index 100%
rename from core/debian/bareos-director.dirs
rename to debian/bareos-director.dirs
diff --git a/core/debian/bareos-director.install.in b/debian/bareos-director.install.in
similarity index 100%
rename from core/debian/bareos-director.install.in
rename to debian/bareos-director.install.in
diff --git a/core/debian/bareos-director.postinst.in b/debian/bareos-director.postinst.in
similarity index 100%
rename from core/debian/bareos-director.postinst.in
rename to debian/bareos-director.postinst.in
diff --git a/core/debian/bareos-director.postrm b/debian/bareos-director.postrm
similarity index 100%
rename from core/debian/bareos-director.postrm
rename to debian/bareos-director.postrm
diff --git a/core/debian/bareos-director.preinst.in b/debian/bareos-director.preinst.in
similarity index 100%
rename from core/debian/bareos-director.preinst.in
rename to debian/bareos-director.preinst.in
diff --git a/core/debian/bareos-director.prerm b/debian/bareos-director.prerm
similarity index 100%
rename from core/debian/bareos-director.prerm
rename to debian/bareos-director.prerm
diff --git a/core/debian/bareos-director.service.in b/debian/bareos-director.service.in
similarity index 100%
rename from core/debian/bareos-director.service.in
rename to debian/bareos-director.service.in
diff --git a/core/debian/bareos-filedaemon-ceph-plugin.install.in b/debian/bareos-filedaemon-ceph-plugin.install.in
similarity index 100%
rename from core/debian/bareos-filedaemon-ceph-plugin.install.in
rename to debian/bareos-filedaemon-ceph-plugin.install.in
diff --git a/core/debian/bareos-filedaemon-glusterfs-plugin.install.in b/debian/bareos-filedaemon-glusterfs-plugin.install.in
similarity index 100%
rename from core/debian/bareos-filedaemon-glusterfs-plugin.install.in
rename to debian/bareos-filedaemon-glusterfs-plugin.install.in
diff --git a/core/debian/bareos-filedaemon-ldap-python-plugin.install.in b/debian/bareos-filedaemon-ldap-python-plugin.install.in
similarity index 100%
rename from core/debian/bareos-filedaemon-ldap-python-plugin.install.in
rename to debian/bareos-filedaemon-ldap-python-plugin.install.in
diff --git a/core/debian/bareos-filedaemon-percona-xtrabackup-python-plugin.install.in b/debian/bareos-filedaemon-percona-xtrabackup-python-plugin.install.in
similarity index 100%
rename from core/debian/bareos-filedaemon-percona-xtrabackup-python-plugin.install.in
rename to debian/bareos-filedaemon-percona-xtrabackup-python-plugin.install.in
diff --git a/core/debian/bareos-filedaemon-python-plugin.install.in b/debian/bareos-filedaemon-python-plugin.install.in
similarity index 100%
rename from core/debian/bareos-filedaemon-python-plugin.install.in
rename to debian/bareos-filedaemon-python-plugin.install.in
diff --git a/core/debian/bareos-filedaemon.bareos-fd.init.in b/debian/bareos-filedaemon.bareos-fd.init.in
similarity index 100%
rename from core/debian/bareos-filedaemon.bareos-fd.init.in
rename to debian/bareos-filedaemon.bareos-fd.init.in
diff --git a/core/debian/bareos-filedaemon.install.in b/debian/bareos-filedaemon.install.in
similarity index 100%
rename from core/debian/bareos-filedaemon.install.in
rename to debian/bareos-filedaemon.install.in
diff --git a/core/debian/bareos-filedaemon.postinst.in b/debian/bareos-filedaemon.postinst.in
similarity index 100%
rename from core/debian/bareos-filedaemon.postinst.in
rename to debian/bareos-filedaemon.postinst.in
diff --git a/core/debian/bareos-filedaemon.postrm b/debian/bareos-filedaemon.postrm
similarity index 100%
rename from core/debian/bareos-filedaemon.postrm
rename to debian/bareos-filedaemon.postrm
diff --git a/core/debian/bareos-filedaemon.preinst.in b/debian/bareos-filedaemon.preinst.in
similarity index 100%
rename from core/debian/bareos-filedaemon.preinst.in
rename to debian/bareos-filedaemon.preinst.in
diff --git a/core/debian/bareos-filedaemon.prerm b/debian/bareos-filedaemon.prerm
similarity index 100%
rename from core/debian/bareos-filedaemon.prerm
rename to debian/bareos-filedaemon.prerm
diff --git a/core/debian/bareos-filedaemon.service.in b/debian/bareos-filedaemon.service.in
similarity index 100%
rename from core/debian/bareos-filedaemon.service.in
rename to debian/bareos-filedaemon.service.in
diff --git a/core/debian/bareos-regress-config.install.in b/debian/bareos-regress-config.install.in
similarity index 100%
rename from core/debian/bareos-regress-config.install.in
rename to debian/bareos-regress-config.install.in
diff --git a/core/debian/bareos-regress-config.preinst.in b/debian/bareos-regress-config.preinst.in
similarity index 100%
rename from core/debian/bareos-regress-config.preinst.in
rename to debian/bareos-regress-config.preinst.in
diff --git a/core/debian/bareos-storage-ceph.install.in b/debian/bareos-storage-ceph.install.in
similarity index 100%
rename from core/debian/bareos-storage-ceph.install.in
rename to debian/bareos-storage-ceph.install.in
diff --git a/core/debian/bareos-storage-fifo.install.in b/debian/bareos-storage-fifo.install.in
similarity index 100%
rename from core/debian/bareos-storage-fifo.install.in
rename to debian/bareos-storage-fifo.install.in
diff --git a/core/debian/bareos-storage-glusterfs.install.in b/debian/bareos-storage-glusterfs.install.in
similarity index 100%
rename from core/debian/bareos-storage-glusterfs.install.in
rename to debian/bareos-storage-glusterfs.install.in
diff --git a/core/debian/bareos-storage-python-plugin.install.in b/debian/bareos-storage-python-plugin.install.in
similarity index 100%
rename from core/debian/bareos-storage-python-plugin.install.in
rename to debian/bareos-storage-python-plugin.install.in
diff --git a/core/debian/bareos-storage-tape.install.in b/debian/bareos-storage-tape.install.in
similarity index 100%
rename from core/debian/bareos-storage-tape.install.in
rename to debian/bareos-storage-tape.install.in
diff --git a/core/debian/bareos-storage.bareos-sd.init.in b/debian/bareos-storage.bareos-sd.init.in
similarity index 100%
rename from core/debian/bareos-storage.bareos-sd.init.in
rename to debian/bareos-storage.bareos-sd.init.in
diff --git a/core/debian/bareos-storage.dirs b/debian/bareos-storage.dirs
similarity index 100%
rename from core/debian/bareos-storage.dirs
rename to debian/bareos-storage.dirs
diff --git a/core/debian/bareos-storage.install.in b/debian/bareos-storage.install.in
similarity index 100%
rename from core/debian/bareos-storage.install.in
rename to debian/bareos-storage.install.in
diff --git a/core/debian/bareos-storage.postinst.in b/debian/bareos-storage.postinst.in
similarity index 100%
rename from core/debian/bareos-storage.postinst.in
rename to debian/bareos-storage.postinst.in
diff --git a/core/debian/bareos-storage.postrm b/debian/bareos-storage.postrm
similarity index 100%
rename from core/debian/bareos-storage.postrm
rename to debian/bareos-storage.postrm
diff --git a/core/debian/bareos-storage.preinst.in b/debian/bareos-storage.preinst.in
similarity index 100%
rename from core/debian/bareos-storage.preinst.in
rename to debian/bareos-storage.preinst.in
diff --git a/core/debian/bareos-storage.prerm b/debian/bareos-storage.prerm
similarity index 100%
rename from core/debian/bareos-storage.prerm
rename to debian/bareos-storage.prerm
diff --git a/core/debian/bareos-storage.service.in b/debian/bareos-storage.service.in
similarity index 100%
rename from core/debian/bareos-storage.service.in
rename to debian/bareos-storage.service.in
diff --git a/core/debian/bareos-tools.install.in b/debian/bareos-tools.install.in
similarity index 100%
rename from core/debian/bareos-tools.install.in
rename to debian/bareos-tools.install.in
diff --git a/core/debian/bareos-traymonitor.install.in b/debian/bareos-traymonitor.install.in
similarity index 100%
rename from core/debian/bareos-traymonitor.install.in
rename to debian/bareos-traymonitor.install.in
diff --git a/core/debian/bareos-traymonitor.postinst.in b/debian/bareos-traymonitor.postinst.in
similarity index 100%
rename from core/debian/bareos-traymonitor.postinst.in
rename to debian/bareos-traymonitor.postinst.in
diff --git a/core/debian/bareos-traymonitor.postrm b/debian/bareos-traymonitor.postrm
similarity index 100%
rename from core/debian/bareos-traymonitor.postrm
rename to debian/bareos-traymonitor.postrm
diff --git a/core/debian/compat b/debian/compat
similarity index 100%
rename from core/debian/compat
rename to debian/compat
diff --git a/core/debian/control b/debian/control
similarity index 100%
rename from core/debian/control
rename to debian/control
diff --git a/core/debian/control.bareos-director-python-plugin b/debian/control.bareos-director-python-plugin
similarity index 100%
rename from core/debian/control.bareos-director-python-plugin
rename to debian/control.bareos-director-python-plugin
diff --git a/core/debian/control.bareos-filedaemon-ceph-plugin b/debian/control.bareos-filedaemon-ceph-plugin
similarity index 100%
rename from core/debian/control.bareos-filedaemon-ceph-plugin
rename to debian/control.bareos-filedaemon-ceph-plugin
diff --git a/core/debian/control.bareos-filedaemon-glusterfs-plugin b/debian/control.bareos-filedaemon-glusterfs-plugin
similarity index 100%
rename from core/debian/control.bareos-filedaemon-glusterfs-plugin
rename to debian/control.bareos-filedaemon-glusterfs-plugin
diff --git a/core/debian/control.bareos-filedaemon-python-plugin b/debian/control.bareos-filedaemon-python-plugin
similarity index 100%
rename from core/debian/control.bareos-filedaemon-python-plugin
rename to debian/control.bareos-filedaemon-python-plugin
diff --git a/core/debian/control.bareos-storage-ceph b/debian/control.bareos-storage-ceph
similarity index 100%
rename from core/debian/control.bareos-storage-ceph
rename to debian/control.bareos-storage-ceph
diff --git a/core/debian/control.bareos-storage-glusterfs b/debian/control.bareos-storage-glusterfs
similarity index 100%
rename from core/debian/control.bareos-storage-glusterfs
rename to debian/control.bareos-storage-glusterfs
diff --git a/core/debian/control.bareos-storage-python-plugin b/debian/control.bareos-storage-python-plugin
similarity index 100%
rename from core/debian/control.bareos-storage-python-plugin
rename to debian/control.bareos-storage-python-plugin
diff --git a/core/debian/control.bareos-traymonitor b/debian/control.bareos-traymonitor
similarity index 100%
rename from core/debian/control.bareos-traymonitor
rename to debian/control.bareos-traymonitor
diff --git a/core/debian/control.in b/debian/control.in
similarity index 100%
rename from core/debian/control.in
rename to debian/control.in
diff --git a/core/debian/control.univention-bareos b/debian/control.univention-bareos
similarity index 100%
rename from core/debian/control.univention-bareos
rename to debian/control.univention-bareos
diff --git a/core/debian/copyright b/debian/copyright
similarity index 100%
rename from core/debian/copyright
rename to debian/copyright
diff --git a/core/debian/copyright.footer b/debian/copyright.footer
similarity index 100%
rename from core/debian/copyright.footer
rename to debian/copyright.footer
diff --git a/core/debian/copyright.header b/debian/copyright.header
similarity index 100%
rename from core/debian/copyright.header
rename to debian/copyright.header
diff --git a/core/debian/rules b/debian/rules
similarity index 100%
rename from core/debian/rules
rename to debian/rules
diff --git a/core/debian/source/format b/debian/source/format
similarity index 100%
rename from core/debian/source/format
rename to debian/source/format
diff --git a/core/debian/univention-bareos.docs b/debian/univention-bareos.docs
similarity index 100%
rename from core/debian/univention-bareos.docs
rename to debian/univention-bareos.docs
diff --git a/core/debian/univention-bareos.install b/debian/univention-bareos.install
similarity index 100%
rename from core/debian/univention-bareos.install
rename to debian/univention-bareos.install
diff --git a/core/debian/univention-bareos.postinst.in b/debian/univention-bareos.postinst.in
similarity index 100%
rename from core/debian/univention-bareos.postinst.in
rename to debian/univention-bareos.postinst.in
diff --git a/core/debian/univention-bareos.postrm b/debian/univention-bareos.postrm
similarity index 100%
rename from core/debian/univention-bareos.postrm
rename to debian/univention-bareos.postrm
diff --git a/core/debian/univention-bareos.preinst b/debian/univention-bareos.preinst
similarity index 100%
rename from core/debian/univention-bareos.preinst
rename to debian/univention-bareos.preinst
diff --git a/core/debian/univention-bareos.prerm b/debian/univention-bareos.prerm
similarity index 100%
rename from core/debian/univention-bareos.prerm
rename to debian/univention-bareos.prerm
diff --git a/core/debian/univention-bareos.univention-config-registry b/debian/univention-bareos.univention-config-registry
similarity index 100%
rename from core/debian/univention-bareos.univention-config-registry
rename to debian/univention-bareos.univention-config-registry
diff --git a/core/debian/univention-bareos.univention-config-registry-variables b/debian/univention-bareos.univention-config-registry-variables
similarity index 100%
rename from core/debian/univention-bareos.univention-config-registry-variables
rename to debian/univention-bareos.univention-config-registry-variables
diff --git a/core/debian/univention-bareos.univention-service b/debian/univention-bareos.univention-service
similarity index 100%
rename from core/debian/univention-bareos.univention-service
rename to debian/univention-bareos.univention-service
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 00000000000..4490df83176
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,3 @@
+version=3
+opts=filenamemangle=s/.+\/v?(\d\S*)\.tar\.gz/bareos-$1\.tar\.gz/ \
+ https://github.com/bareos/bareos/releases .*/v?(\d\S*)\.tar\*