diff --git a/contrib/examples/nico/conf/type/__nico_afs/files/afs/CellServDB b/other/examples/nico/conf/type/__nico_afs/files/afs/CellServDB
similarity index 100%
rename from contrib/examples/nico/conf/type/__nico_afs/files/afs/CellServDB
rename to other/examples/nico/conf/type/__nico_afs/files/afs/CellServDB
diff --git a/contrib/examples/nico/conf/type/__nico_afs/files/afs/ThisCell b/other/examples/nico/conf/type/__nico_afs/files/afs/ThisCell
similarity index 100%
rename from contrib/examples/nico/conf/type/__nico_afs/files/afs/ThisCell
rename to other/examples/nico/conf/type/__nico_afs/files/afs/ThisCell
diff --git a/contrib/examples/nico/conf/type/__nico_afs/files/krb5/krb5.conf b/other/examples/nico/conf/type/__nico_afs/files/krb5/krb5.conf
similarity index 100%
rename from contrib/examples/nico/conf/type/__nico_afs/files/krb5/krb5.conf
rename to other/examples/nico/conf/type/__nico_afs/files/krb5/krb5.conf
diff --git a/contrib/examples/nico/conf/type/__nico_afs/files/ssh/JAS.pub b/other/examples/nico/conf/type/__nico_afs/files/ssh/JAS.pub
similarity index 100%
rename from contrib/examples/nico/conf/type/__nico_afs/files/ssh/JAS.pub
rename to other/examples/nico/conf/type/__nico_afs/files/ssh/JAS.pub
diff --git a/contrib/examples/nico/conf/type/__nico_afs/files/ssh/bugblue.pub b/other/examples/nico/conf/type/__nico_afs/files/ssh/bugblue.pub
similarity index 100%
rename from contrib/examples/nico/conf/type/__nico_afs/files/ssh/bugblue.pub
rename to other/examples/nico/conf/type/__nico_afs/files/ssh/bugblue.pub
diff --git a/contrib/examples/nico/conf/type/__nico_afs/files/ssh/docsteel.pub b/other/examples/nico/conf/type/__nico_afs/files/ssh/docsteel.pub
similarity index 100%
rename from contrib/examples/nico/conf/type/__nico_afs/files/ssh/docsteel.pub
rename to other/examples/nico/conf/type/__nico_afs/files/ssh/docsteel.pub
diff --git a/contrib/examples/nico/conf/type/__nico_afs/files/ssh/downhill.pub b/other/examples/nico/conf/type/__nico_afs/files/ssh/downhill.pub
similarity index 100%
rename from contrib/examples/nico/conf/type/__nico_afs/files/ssh/downhill.pub
rename to other/examples/nico/conf/type/__nico_afs/files/ssh/downhill.pub
diff --git a/contrib/examples/nico/conf/type/__nico_afs/files/ssh/sur5r@samsa.pub b/other/examples/nico/conf/type/__nico_afs/files/ssh/sur5r@samsa.pub
similarity index 100%
rename from contrib/examples/nico/conf/type/__nico_afs/files/ssh/sur5r@samsa.pub
rename to other/examples/nico/conf/type/__nico_afs/files/ssh/sur5r@samsa.pub
diff --git a/contrib/examples/nico/conf/type/__nico_afs/manifest b/other/examples/nico/conf/type/__nico_afs/manifest
similarity index 100%
rename from contrib/examples/nico/conf/type/__nico_afs/manifest
rename to other/examples/nico/conf/type/__nico_afs/manifest
diff --git a/contrib/examples/nico/conf/type/__nico_afs/singleton b/other/examples/nico/conf/type/__nico_afs/singleton
similarity index 100%
rename from contrib/examples/nico/conf/type/__nico_afs/singleton
rename to other/examples/nico/conf/type/__nico_afs/singleton
diff --git a/contrib/examples/nico/conf/type/__nico_desktop/files/hostname b/other/examples/nico/conf/type/__nico_desktop/files/hostname
similarity index 100%
rename from contrib/examples/nico/conf/type/__nico_desktop/files/hostname
rename to other/examples/nico/conf/type/__nico_desktop/files/hostname
diff --git a/contrib/examples/nico/conf/type/__nico_desktop/files/slim-preseed b/other/examples/nico/conf/type/__nico_desktop/files/slim-preseed
similarity index 100%
rename from contrib/examples/nico/conf/type/__nico_desktop/files/slim-preseed
rename to other/examples/nico/conf/type/__nico_desktop/files/slim-preseed
diff --git a/contrib/examples/nico/conf/type/__nico_desktop/manifest b/other/examples/nico/conf/type/__nico_desktop/manifest
similarity index 100%
rename from contrib/examples/nico/conf/type/__nico_desktop/manifest
rename to other/examples/nico/conf/type/__nico_desktop/manifest
diff --git a/contrib/examples/nico/conf/type/__nico_desktop/parameter/required b/other/examples/nico/conf/type/__nico_desktop/parameter/required
similarity index 100%
rename from contrib/examples/nico/conf/type/__nico_desktop/parameter/required
rename to other/examples/nico/conf/type/__nico_desktop/parameter/required
diff --git a/contrib/examples/nico/conf/type/__nico_desktop/singleton b/other/examples/nico/conf/type/__nico_desktop/singleton
similarity index 100%
rename from contrib/examples/nico/conf/type/__nico_desktop/singleton
rename to other/examples/nico/conf/type/__nico_desktop/singleton
diff --git a/contrib/examples/nico/conf/type/__nico_mpd/files/slim-preseed b/other/examples/nico/conf/type/__nico_mpd/files/slim-preseed
similarity index 100%
rename from contrib/examples/nico/conf/type/__nico_mpd/files/slim-preseed
rename to other/examples/nico/conf/type/__nico_mpd/files/slim-preseed
diff --git a/contrib/examples/nico/conf/type/__nico_mpd/manifest b/other/examples/nico/conf/type/__nico_mpd/manifest
similarity index 100%
rename from contrib/examples/nico/conf/type/__nico_mpd/manifest
rename to other/examples/nico/conf/type/__nico_mpd/manifest
diff --git a/contrib/examples/nico/conf/type/__nico_mpd/parameter/required b/other/examples/nico/conf/type/__nico_mpd/parameter/required
similarity index 100%
rename from contrib/examples/nico/conf/type/__nico_mpd/parameter/required
rename to other/examples/nico/conf/type/__nico_mpd/parameter/required
diff --git a/contrib/examples/nico/conf/type/__nico_mpd/singleton b/other/examples/nico/conf/type/__nico_mpd/singleton
similarity index 100%
rename from contrib/examples/nico/conf/type/__nico_mpd/singleton
rename to other/examples/nico/conf/type/__nico_mpd/singleton
diff --git a/contrib/examples/nico/conf/type/__nico_network/files/interfaces-eth0 b/other/examples/nico/conf/type/__nico_network/files/interfaces-eth0
similarity index 100%
rename from contrib/examples/nico/conf/type/__nico_network/files/interfaces-eth0
rename to other/examples/nico/conf/type/__nico_network/files/interfaces-eth0
diff --git a/contrib/examples/nico/conf/type/__nico_network/files/interfaces-wlan0 b/other/examples/nico/conf/type/__nico_network/files/interfaces-wlan0
similarity index 100%
rename from contrib/examples/nico/conf/type/__nico_network/files/interfaces-wlan0
rename to other/examples/nico/conf/type/__nico_network/files/interfaces-wlan0
diff --git a/contrib/examples/nico/conf/type/__nico_network/manifest b/other/examples/nico/conf/type/__nico_network/manifest
similarity index 100%
rename from contrib/examples/nico/conf/type/__nico_network/manifest
rename to other/examples/nico/conf/type/__nico_network/manifest
diff --git a/contrib/examples/nico/conf/type/__nico_network/parameter/required b/other/examples/nico/conf/type/__nico_network/parameter/required
similarity index 100%
rename from contrib/examples/nico/conf/type/__nico_network/parameter/required
rename to other/examples/nico/conf/type/__nico_network/parameter/required
diff --git a/contrib/examples/nico/conf/type/__nico_network/singleton b/other/examples/nico/conf/type/__nico_network/singleton
similarity index 100%
rename from contrib/examples/nico/conf/type/__nico_network/singleton
rename to other/examples/nico/conf/type/__nico_network/singleton
diff --git a/contrib/examples/nico/conf/type/__nico_nfs_client/files/slim-preseed b/other/examples/nico/conf/type/__nico_nfs_client/files/slim-preseed
similarity index 100%
rename from contrib/examples/nico/conf/type/__nico_nfs_client/files/slim-preseed
rename to other/examples/nico/conf/type/__nico_nfs_client/files/slim-preseed
diff --git a/contrib/examples/nico/conf/type/__nico_nfs_client/manifest b/other/examples/nico/conf/type/__nico_nfs_client/manifest
similarity index 100%
rename from contrib/examples/nico/conf/type/__nico_nfs_client/manifest
rename to other/examples/nico/conf/type/__nico_nfs_client/manifest
diff --git a/contrib/examples/nico/conf/type/__nico_nfs_client/singleton b/other/examples/nico/conf/type/__nico_nfs_client/singleton
similarity index 100%
rename from contrib/examples/nico/conf/type/__nico_nfs_client/singleton
rename to other/examples/nico/conf/type/__nico_nfs_client/singleton
diff --git a/contrib/examples/nico/conf/type/__nico_notebook/manifest b/other/examples/nico/conf/type/__nico_notebook/manifest
similarity index 100%
rename from contrib/examples/nico/conf/type/__nico_notebook/manifest
rename to other/examples/nico/conf/type/__nico_notebook/manifest
diff --git a/contrib/examples/nico/conf/type/__nico_notebook/singleton b/other/examples/nico/conf/type/__nico_notebook/singleton
similarity index 100%
rename from contrib/examples/nico/conf/type/__nico_notebook/singleton
rename to other/examples/nico/conf/type/__nico_notebook/singleton
diff --git a/contrib/examples/nico/conf/type/__nico_packages/manifest b/other/examples/nico/conf/type/__nico_packages/manifest
similarity index 100%
rename from contrib/examples/nico/conf/type/__nico_packages/manifest
rename to other/examples/nico/conf/type/__nico_packages/manifest
diff --git a/contrib/examples/nico/conf/type/__nico_packages/singleton b/other/examples/nico/conf/type/__nico_packages/singleton
similarity index 100%
rename from contrib/examples/nico/conf/type/__nico_packages/singleton
rename to other/examples/nico/conf/type/__nico_packages/singleton
diff --git a/contrib/examples/nico/conf/type/__nico_sudo/files/sudo-nico b/other/examples/nico/conf/type/__nico_sudo/files/sudo-nico
similarity index 100%
rename from contrib/examples/nico/conf/type/__nico_sudo/files/sudo-nico
rename to other/examples/nico/conf/type/__nico_sudo/files/sudo-nico
diff --git a/contrib/examples/nico/conf/type/__nico_sudo/manifest b/other/examples/nico/conf/type/__nico_sudo/manifest
similarity index 100%
rename from contrib/examples/nico/conf/type/__nico_sudo/manifest
rename to other/examples/nico/conf/type/__nico_sudo/manifest
diff --git a/contrib/examples/nico/conf/type/__nico_sudo/parameter/gencode b/other/examples/nico/conf/type/__nico_sudo/parameter/gencode
similarity index 100%
rename from contrib/examples/nico/conf/type/__nico_sudo/parameter/gencode
rename to other/examples/nico/conf/type/__nico_sudo/parameter/gencode
diff --git a/contrib/examples/nico/conf/type/__nico_sudo/parameter/manifest b/other/examples/nico/conf/type/__nico_sudo/parameter/manifest
similarity index 100%
rename from contrib/examples/nico/conf/type/__nico_sudo/parameter/manifest
rename to other/examples/nico/conf/type/__nico_sudo/parameter/manifest
diff --git a/contrib/examples/nico/conf/type/__nico_sudo/parameter/optional b/other/examples/nico/conf/type/__nico_sudo/parameter/optional
similarity index 100%
rename from contrib/examples/nico/conf/type/__nico_sudo/parameter/optional
rename to other/examples/nico/conf/type/__nico_sudo/parameter/optional
diff --git a/contrib/examples/nico/conf/type/__nico_sudo/parameter/required b/other/examples/nico/conf/type/__nico_sudo/parameter/required
similarity index 100%
rename from contrib/examples/nico/conf/type/__nico_sudo/parameter/required
rename to other/examples/nico/conf/type/__nico_sudo/parameter/required
diff --git a/contrib/examples/nico/conf/type/__nico_sudo/singleton b/other/examples/nico/conf/type/__nico_sudo/singleton
similarity index 100%
rename from contrib/examples/nico/conf/type/__nico_sudo/singleton
rename to other/examples/nico/conf/type/__nico_sudo/singleton
diff --git a/contrib/examples/nico/conf/type/__nico_tee/files/99-apt-nico b/other/examples/nico/conf/type/__nico_tee/files/99-apt-nico
similarity index 100%
rename from contrib/examples/nico/conf/type/__nico_tee/files/99-apt-nico
rename to other/examples/nico/conf/type/__nico_tee/files/99-apt-nico
diff --git a/contrib/examples/nico/conf/type/__nico_tee/files/hostname b/other/examples/nico/conf/type/__nico_tee/files/hostname
similarity index 100%
rename from contrib/examples/nico/conf/type/__nico_tee/files/hostname
rename to other/examples/nico/conf/type/__nico_tee/files/hostname
diff --git a/contrib/examples/nico/conf/type/__nico_tee/manifest b/other/examples/nico/conf/type/__nico_tee/manifest
similarity index 100%
rename from contrib/examples/nico/conf/type/__nico_tee/manifest
rename to other/examples/nico/conf/type/__nico_tee/manifest
diff --git a/contrib/examples/nico/conf/type/__nico_tee/singleton b/other/examples/nico/conf/type/__nico_tee/singleton
similarity index 100%
rename from contrib/examples/nico/conf/type/__nico_tee/singleton
rename to other/examples/nico/conf/type/__nico_tee/singleton
diff --git a/contrib/types_pending_inclusion/__package_zypper/README b/other/types_pending_inclusion/__package_zypper/README
similarity index 100%
rename from contrib/types_pending_inclusion/__package_zypper/README
rename to other/types_pending_inclusion/__package_zypper/README
diff --git a/contrib/types_pending_inclusion/__package_zypper/explorer/pkg_version b/other/types_pending_inclusion/__package_zypper/explorer/pkg_version
similarity index 100%
rename from contrib/types_pending_inclusion/__package_zypper/explorer/pkg_version
rename to other/types_pending_inclusion/__package_zypper/explorer/pkg_version
diff --git a/contrib/types_pending_inclusion/__package_zypper/gencode-remote b/other/types_pending_inclusion/__package_zypper/gencode-remote
similarity index 100%
rename from contrib/types_pending_inclusion/__package_zypper/gencode-remote
rename to other/types_pending_inclusion/__package_zypper/gencode-remote
diff --git a/contrib/types_pending_inclusion/__package_zypper/man.text b/other/types_pending_inclusion/__package_zypper/man.text
similarity index 100%
rename from contrib/types_pending_inclusion/__package_zypper/man.text
rename to other/types_pending_inclusion/__package_zypper/man.text
diff --git a/contrib/types_pending_inclusion/__package_zypper/parameter/optional b/other/types_pending_inclusion/__package_zypper/parameter/optional
similarity index 100%
rename from contrib/types_pending_inclusion/__package_zypper/parameter/optional
rename to other/types_pending_inclusion/__package_zypper/parameter/optional
diff --git a/contrib/types_pending_inclusion/__package_zypper/parameter/required b/other/types_pending_inclusion/__package_zypper/parameter/required
similarity index 100%
rename from contrib/types_pending_inclusion/__package_zypper/parameter/required
rename to other/types_pending_inclusion/__package_zypper/parameter/required