diff --git a/distribution/debian/changelog b/contrib/debian/changelog
similarity index 100%
rename from distribution/debian/changelog
rename to contrib/debian/changelog
diff --git a/distribution/debian/compat b/contrib/debian/compat
similarity index 100%
rename from distribution/debian/compat
rename to contrib/debian/compat
diff --git a/distribution/debian/control b/contrib/debian/control
similarity index 100%
rename from distribution/debian/control
rename to contrib/debian/control
diff --git a/distribution/debian/copyright b/contrib/debian/copyright
similarity index 100%
rename from distribution/debian/copyright
rename to contrib/debian/copyright
diff --git a/distribution/debian/holland-common.files b/contrib/debian/holland-common.files
similarity index 100%
rename from distribution/debian/holland-common.files
rename to contrib/debian/holland-common.files
diff --git a/distribution/debian/holland-commvault.dirs b/contrib/debian/holland-commvault.dirs
similarity index 100%
rename from distribution/debian/holland-commvault.dirs
rename to contrib/debian/holland-commvault.dirs
diff --git a/distribution/debian/holland-commvault.files b/contrib/debian/holland-commvault.files
similarity index 100%
rename from distribution/debian/holland-commvault.files
rename to contrib/debian/holland-commvault.files
diff --git a/distribution/debian/holland-commvault.lintian-overrides b/contrib/debian/holland-commvault.lintian-overrides
similarity index 100%
rename from distribution/debian/holland-commvault.lintian-overrides
rename to contrib/debian/holland-commvault.lintian-overrides
diff --git a/distribution/debian/holland-commvault.manpages b/contrib/debian/holland-commvault.manpages
similarity index 100%
rename from distribution/debian/holland-commvault.manpages
rename to contrib/debian/holland-commvault.manpages
diff --git a/distribution/debian/holland-example.files b/contrib/debian/holland-example.files
similarity index 100%
rename from distribution/debian/holland-example.files
rename to contrib/debian/holland-example.files
diff --git a/distribution/debian/holland-maatkit.files b/contrib/debian/holland-maatkit.files
similarity index 100%
rename from distribution/debian/holland-maatkit.files
rename to contrib/debian/holland-maatkit.files
diff --git a/distribution/debian/holland-mysqlcmds.files b/contrib/debian/holland-mysqlcmds.files
similarity index 100%
rename from distribution/debian/holland-mysqlcmds.files
rename to contrib/debian/holland-mysqlcmds.files
diff --git a/distribution/debian/holland-mysqldump.files b/contrib/debian/holland-mysqldump.files
similarity index 100%
rename from distribution/debian/holland-mysqldump.files
rename to contrib/debian/holland-mysqldump.files
diff --git a/distribution/debian/holland-mysqlhotcopy.files b/contrib/debian/holland-mysqlhotcopy.files
similarity index 100%
rename from distribution/debian/holland-mysqlhotcopy.files
rename to contrib/debian/holland-mysqlhotcopy.files
diff --git a/distribution/debian/holland.dirs b/contrib/debian/holland.dirs
similarity index 100%
rename from distribution/debian/holland.dirs
rename to contrib/debian/holland.dirs
diff --git a/distribution/debian/holland.files b/contrib/debian/holland.files
similarity index 100%
rename from distribution/debian/holland.files
rename to contrib/debian/holland.files
diff --git a/distribution/debian/holland.manpages b/contrib/debian/holland.manpages
similarity index 100%
rename from distribution/debian/holland.manpages
rename to contrib/debian/holland.manpages
diff --git a/distribution/debian/pyversions b/contrib/debian/pyversions
similarity index 100%
rename from distribution/debian/pyversions
rename to contrib/debian/pyversions
diff --git a/distribution/debian/rules b/contrib/debian/rules
similarity index 100%
rename from distribution/debian/rules
rename to contrib/debian/rules
diff --git a/distribution/holland.spec b/contrib/holland.spec
similarity index 100%
rename from distribution/holland.spec
rename to contrib/holland.spec
diff --git a/distribution/ubuntu/ubuntu.jaunty/activeaddons b/contrib/ubuntu/ubuntu.jaunty/activeaddons
similarity index 100%
rename from distribution/ubuntu/ubuntu.jaunty/activeaddons
rename to contrib/ubuntu/ubuntu.jaunty/activeaddons
diff --git a/distribution/ubuntu/ubuntu.jaunty/activeplugins b/contrib/ubuntu/ubuntu.jaunty/activeplugins
similarity index 100%
rename from distribution/ubuntu/ubuntu.jaunty/activeplugins
rename to contrib/ubuntu/ubuntu.jaunty/activeplugins
diff --git a/distribution/ubuntu/ubuntu.jaunty/changelog b/contrib/ubuntu/ubuntu.jaunty/changelog
similarity index 100%
rename from distribution/ubuntu/ubuntu.jaunty/changelog
rename to contrib/ubuntu/ubuntu.jaunty/changelog
diff --git a/distribution/ubuntu/ubuntu.jaunty/compat b/contrib/ubuntu/ubuntu.jaunty/compat
similarity index 100%
rename from distribution/ubuntu/ubuntu.jaunty/compat
rename to contrib/ubuntu/ubuntu.jaunty/compat
diff --git a/distribution/ubuntu/ubuntu.jaunty/control b/contrib/ubuntu/ubuntu.jaunty/control
similarity index 100%
rename from distribution/ubuntu/ubuntu.jaunty/control
rename to contrib/ubuntu/ubuntu.jaunty/control
diff --git a/distribution/ubuntu/ubuntu.jaunty/copyright b/contrib/ubuntu/ubuntu.jaunty/copyright
similarity index 100%
rename from distribution/ubuntu/ubuntu.jaunty/copyright
rename to contrib/ubuntu/ubuntu.jaunty/copyright
diff --git a/distribution/ubuntu/ubuntu.jaunty/dirs b/contrib/ubuntu/ubuntu.jaunty/dirs
similarity index 100%
rename from distribution/ubuntu/ubuntu.jaunty/dirs
rename to contrib/ubuntu/ubuntu.jaunty/dirs
diff --git a/distribution/ubuntu/ubuntu.jaunty/docs b/contrib/ubuntu/ubuntu.jaunty/docs
similarity index 100%
rename from distribution/ubuntu/ubuntu.jaunty/docs
rename to contrib/ubuntu/ubuntu.jaunty/docs
diff --git a/distribution/ubuntu/ubuntu.jaunty/rules b/contrib/ubuntu/ubuntu.jaunty/rules
similarity index 100%
rename from distribution/ubuntu/ubuntu.jaunty/rules
rename to contrib/ubuntu/ubuntu.jaunty/rules