diff --git a/debian-multiarch/changelog b/packaging/debian-multiarch/changelog
similarity index 100%
rename from debian-multiarch/changelog
rename to packaging/debian-multiarch/changelog
diff --git a/debian-multiarch/compat b/packaging/debian-multiarch/compat
similarity index 100%
rename from debian-multiarch/compat
rename to packaging/debian-multiarch/compat
diff --git a/debian-multiarch/control b/packaging/debian-multiarch/control
similarity index 100%
rename from debian-multiarch/control
rename to packaging/debian-multiarch/control
diff --git a/debian-multiarch/copyright b/packaging/debian-multiarch/copyright
similarity index 100%
rename from debian-multiarch/copyright
rename to packaging/debian-multiarch/copyright
diff --git a/debian-multiarch/rules b/packaging/debian-multiarch/rules
similarity index 100%
rename from debian-multiarch/rules
rename to packaging/debian-multiarch/rules
diff --git a/debian-multiarch/sogo-dev.install b/packaging/debian-multiarch/sogo-dev.install
similarity index 100%
rename from debian-multiarch/sogo-dev.install
rename to packaging/debian-multiarch/sogo-dev.install
diff --git a/debian-multiarch/sogo-openchange.install b/packaging/debian-multiarch/sogo-openchange.install
similarity index 100%
rename from debian-multiarch/sogo-openchange.install
rename to packaging/debian-multiarch/sogo-openchange.install
diff --git a/debian-multiarch/sogo.cron.daily b/packaging/debian-multiarch/sogo.cron.daily
similarity index 100%
rename from debian-multiarch/sogo.cron.daily
rename to packaging/debian-multiarch/sogo.cron.daily
diff --git a/debian-multiarch/sogo.dirs b/packaging/debian-multiarch/sogo.dirs
similarity index 100%
rename from debian-multiarch/sogo.dirs
rename to packaging/debian-multiarch/sogo.dirs
diff --git a/debian-multiarch/sogo.docs b/packaging/debian-multiarch/sogo.docs
similarity index 100%
rename from debian-multiarch/sogo.docs
rename to packaging/debian-multiarch/sogo.docs
diff --git a/debian-multiarch/sogo.init b/packaging/debian-multiarch/sogo.init
similarity index 100%
rename from debian-multiarch/sogo.init
rename to packaging/debian-multiarch/sogo.init
diff --git a/debian-multiarch/sogo.install b/packaging/debian-multiarch/sogo.install
similarity index 100%
rename from debian-multiarch/sogo.install
rename to packaging/debian-multiarch/sogo.install
diff --git a/debian-multiarch/sogo.overrides b/packaging/debian-multiarch/sogo.overrides
similarity index 100%
rename from debian-multiarch/sogo.overrides
rename to packaging/debian-multiarch/sogo.overrides
diff --git a/debian-multiarch/sogo.postinst b/packaging/debian-multiarch/sogo.postinst
similarity index 100%
rename from debian-multiarch/sogo.postinst
rename to packaging/debian-multiarch/sogo.postinst
diff --git a/debian-multiarch/sogo.postrm b/packaging/debian-multiarch/sogo.postrm
similarity index 100%
rename from debian-multiarch/sogo.postrm
rename to packaging/debian-multiarch/sogo.postrm
diff --git a/debian-multiarch/sogo.preinst b/packaging/debian-multiarch/sogo.preinst
similarity index 100%
rename from debian-multiarch/sogo.preinst
rename to packaging/debian-multiarch/sogo.preinst
diff --git a/debian-multiarch/sogo.prerm b/packaging/debian-multiarch/sogo.prerm
similarity index 100%
rename from debian-multiarch/sogo.prerm
rename to packaging/debian-multiarch/sogo.prerm
diff --git a/debian-multiarch/source/format b/packaging/debian-multiarch/source/format
similarity index 100%
rename from debian-multiarch/source/format
rename to packaging/debian-multiarch/source/format
diff --git a/debian/changelog b/packaging/debian/changelog
similarity index 100%
rename from debian/changelog
rename to packaging/debian/changelog
diff --git a/debian/compat b/packaging/debian/compat
similarity index 100%
rename from debian/compat
rename to packaging/debian/compat
diff --git a/debian/control b/packaging/debian/control
similarity index 100%
rename from debian/control
rename to packaging/debian/control
diff --git a/debian/control-squeeze b/packaging/debian/control-squeeze
similarity index 100%
rename from debian/control-squeeze
rename to packaging/debian/control-squeeze
diff --git a/debian/copyright b/packaging/debian/copyright
similarity index 100%
rename from debian/copyright
rename to packaging/debian/copyright
diff --git a/debian/rules b/packaging/debian/rules
similarity index 100%
rename from debian/rules
rename to packaging/debian/rules
diff --git a/debian/sogo-dev.install b/packaging/debian/sogo-dev.install
similarity index 100%
rename from debian/sogo-dev.install
rename to packaging/debian/sogo-dev.install
diff --git a/debian/sogo.cron.daily b/packaging/debian/sogo.cron.daily
similarity index 100%
rename from debian/sogo.cron.daily
rename to packaging/debian/sogo.cron.daily
diff --git a/debian/sogo.dirs b/packaging/debian/sogo.dirs
similarity index 100%
rename from debian/sogo.dirs
rename to packaging/debian/sogo.dirs
diff --git a/debian/sogo.docs b/packaging/debian/sogo.docs
similarity index 100%
rename from debian/sogo.docs
rename to packaging/debian/sogo.docs
diff --git a/debian/sogo.init b/packaging/debian/sogo.init
similarity index 100%
rename from debian/sogo.init
rename to packaging/debian/sogo.init
diff --git a/debian/sogo.install b/packaging/debian/sogo.install
similarity index 100%
rename from debian/sogo.install
rename to packaging/debian/sogo.install
diff --git a/debian/sogo.overrides b/packaging/debian/sogo.overrides
similarity index 100%
rename from debian/sogo.overrides
rename to packaging/debian/sogo.overrides
diff --git a/debian/sogo.postinst b/packaging/debian/sogo.postinst
similarity index 100%
rename from debian/sogo.postinst
rename to packaging/debian/sogo.postinst
diff --git a/debian/sogo.postrm b/packaging/debian/sogo.postrm
similarity index 100%
rename from debian/sogo.postrm
rename to packaging/debian/sogo.postrm
diff --git a/debian/sogo.preinst b/packaging/debian/sogo.preinst
similarity index 100%
rename from debian/sogo.preinst
rename to packaging/debian/sogo.preinst
diff --git a/debian/sogo.prerm b/packaging/debian/sogo.prerm
similarity index 100%
rename from debian/sogo.prerm
rename to packaging/debian/sogo.prerm
diff --git a/debian/source/format b/packaging/debian/source/format
similarity index 100%
rename from debian/source/format
rename to packaging/debian/source/format
diff --git a/sogo.spec b/packaging/rhel/sogo.spec
similarity index 100%
rename from sogo.spec
rename to packaging/rhel/sogo.spec