Updating paths in packaging for new upstream version.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

13 files changed, 243 insertions, 230 deletions

diff --git a/debian/open-infrastructure-container-tools.config b/debian/open-infrastructure-container-tools.config
index 5cc0771..3d6f9e5 100644
--- a/debian/open-infrastructure-container-tools.config
+++ b/debian/open-infrastructure-container-tools.config
@@ -2,7 +2,7 @@
 
 set -e
 
-CONFFILE="/etc/default/container-tools"
+CONFFILE="/etc/open-infrastructure/container.conf"
 
 . /usr/share/debconf/confmodule
 
@@ -30,9 +30,9 @@ db_settitle open-infrastructure-container-tools/title
 db_input low open-infrastructure-container-tools/cache || true
 db_go
 
-if [ -e /usr/share/container-tools/scripts ]
+if [ -e /usr/share/open-infrastructure/container/scripts ]
 then
-	SCRIPT_CHOICES="$(cd /usr/share/container-tools/scripts && find -maxdepth 1 -not -type d -and -not -name 'default' -and -not -name 'debconf' -and -not -name '*.d' -printf '%P\n' | sort)"
+	SCRIPT_CHOICES="$(cd /usr/share/open-infrastructure/container/scripts && find -maxdepth 1 -not -type d -and -not -name 'default' -and -not -name 'debconf' -and -not -name '*.d' -printf '%P\n' | sort)"
 	db_subst open-infrastructure-container-tools/script SCRIPT_CHOICES "$(echo ${SCRIPT_CHOICES} | sed -e 's| |, |g')"
 
 	if [ -x /usr/bin/lsb_release ]
diff --git a/debian/open-infrastructure-container-tools.postinst b/debian/open-infrastructure-container-tools.postinst
index 7a04ebf..f602ae0 100755
--- a/debian/open-infrastructure-container-tools.postinst
+++ b/debian/open-infrastructure-container-tools.postinst
@@ -2,7 +2,7 @@
 
 set -e
 
-CONFFILE="/etc/default/container-tools"
+CONFFILE="/etc/open-infrastructure/container.conf"
 
 Install ()
 {
@@ -40,10 +40,10 @@ Install ()
 
 case "${1}" in
 	configure)
-		update-alternatives --quiet --install /usr/share/container-tools/scripts/default container-tools_script /usr/share/container-tools/scripts/debootstrap 1000
-		update-alternatives --quiet --install /usr/share/container-tools/scripts/default container-tools_script /usr/share/container-tools/scripts/curl 2000
-		update-alternatives --quiet --install /usr/share/container-tools/scripts/default container-tools_script /usr/share/container-tools/scripts/progress-linux 3000
-		update-alternatives --quiet --install /usr/share/container-tools/scripts/default container-tools_script /usr/share/container-tools/scripts/debian 4000
+		update-alternatives --quiet --install /usr/share/open-infrastructure/container/scripts/default container_script /usr/share/open-infrastructure/container/scripts/debootstrap 1000
+		update-alternatives --quiet --install /usr/share/open-infrastructure/container/scripts/default container_script /usr/share/open-infrastructure/container/scripts/curl 2000
+		update-alternatives --quiet --install /usr/share/open-infrastructure/container/scripts/default container_script /usr/share/open-infrastructure/container/scripts/progress-linux 3000
+		update-alternatives --quiet --install /usr/share/open-infrastructure/container/scripts/default container_script /usr/share/open-infrastructure/container/scripts/debian 4000
 
 		. /usr/share/debconf/confmodule
 
@@ -74,19 +74,19 @@ case "${1}" in
 		db_stop
 
 		Install "/var/lib/machines" "${MACHINES}"
-		Install "/etc/container-tools/config" "${CONFIG}"
-		Install "/etc/container-tools/debconf" "${DEBCONF}"
-		Install "/etc/container-tools/hooks" "${HOOKS}"
-		Install "/etc/container-tools/keys" "${KEYS}"
-		Install "/var/cache/container-tools" "${CACHE}"
+		Install "/etc/open-infrastructure/container/config" "${CONFIG}"
+		Install "/etc/open-infrastructure/container/debconf" "${DEBCONF}"
+		Install "/etc/open-infrastructure/container/hooks" "${HOOKS}"
+		Install "/etc/open-infrastructure/container/keys" "${KEYS}"
+		Install "/var/cache/open-infrastructure/container" "${CACHE}"
 
-		update-alternatives --quiet --set container-tools_script "/usr/share/container-tools/scripts/${SCRIPT}"
+		update-alternatives --quiet --set container_script "/usr/share/open-infrastructure/container/scripts/${SCRIPT}"
 
 		if [ ! -e "${CONFFILE}" ]
 		then
 
 cat > "${CONFFILE}" << EOF
-# /etc/default/container-tools
+# ${CONFFILE}
 
 IRK_TARGETS="${IRK_TARGETS}"
 EOF
@@ -109,7 +109,7 @@ EOF
 
 		if [ -x /sbin/sysctl ]
 		then
-			sysctl -q -p /etc/sysctl.d/zz-container-tools.conf
+			sysctl -q -p /etc/sysctl.d/zz-container.conf
 		fi
 		;;
 
diff --git a/debian/open-infrastructure-container-tools.postrm b/debian/open-infrastructure-container-tools.postrm
index b19d1f3..ab1ea41 100755
--- a/debian/open-infrastructure-container-tools.postrm
+++ b/debian/open-infrastructure-container-tools.postrm
@@ -29,16 +29,16 @@ Remove ()
 
 case "${1}" in
 	remove)
-		Remove /var/cache/container-tools
-		Remove /etc/container-tools/debconf
-		Remove /etc/container-tools/config
-		Remove /etc/container-tools/hooks
-		Remove /etc/container-tools/keys
+		Remove /var/cache/open-infrastructure/container
+		Remove /etc/open-infrastructure/container/debconf
+		Remove /etc/open-infrastructure/container/config
+		Remove /etc/open-infrastructure/container/hooks
+		Remove /etc/open-infrastructure/container/keys
 		Remove /var/lib/machines
 		;;
 
 	purge)
-		rm -f /etc/default/container-tools
+		rm -f /etc/open-infrastructure/container.conf
 		;;
 
 	upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
diff --git a/debian/open-infrastructure-container-tools.prerm b/debian/open-infrastructure-container-tools.prerm
index 3805a10..c80e544 100755
--- a/debian/open-infrastructure-container-tools.prerm
+++ b/debian/open-infrastructure-container-tools.prerm
@@ -4,10 +4,10 @@ set -e
 
 case "${1}" in
 	remove|upgrade|deconfigure)
-		update-alternatives --quiet --remove container-tools_script /usr/share/container-tools/scripts/debootstrap
-		update-alternatives --quiet --remove container-tools_script /usr/share/container-tools/scripts/curl
-		update-alternatives --quiet --remove container-tools_script /usr/share/container-tools/scripts/progress-linux
-		update-alternatives --quiet --remove container-tools_script /usr/share/container-tools/scripts/debian
+		update-alternatives --quiet --remove container_script /usr/share/open-infrastructure/container/scripts/debootstrap
+		update-alternatives --quiet --remove container_script /usr/share/open-infrastructure/container/scripts/curl
+		update-alternatives --quiet --remove container_script /usr/share/open-infrastructure/container/scripts/progress-linux
+		update-alternatives --quiet --remove container_script /usr/share/open-infrastructure/container/scripts/debian
 		;;
 
 	failed-upgrade)
diff --git a/debian/open-infrastructure-container-tools.templates b/debian/open-infrastructure-container-tools.templates
index c4fc677..d251028 100644
--- a/debian/open-infrastructure-container-tools.templates
+++ b/debian/open-infrastructure-container-tools.templates
@@ -13,52 +13,52 @@ _Description: machines directory:
 
 Template: open-infrastructure-container-tools/config
 Type: string
-_Default: /etc/container-tools/config
+_Default: /etc/open-infrastructure/container/config
 _Description: config directory:
  Please specify the directory that will be used to store the container
  configuration files.
  .
- If unsure, use /etc/container-tools/config (default) or
+ If unsure, use /etc/open-infrastructure/container/config (default) or
  /srv/container/config when using shared storage.
 
 Template: open-infrastructure-container-tools/debconf
 Type: string
-_Default: /etc/container-tools/debconf
+_Default: /etc/open-infrastructure/container/debconf
 _Description: debconf directory:
  Please specify the directory that will be used to store the container
  preseed files.
  .
- If unsure, use /etc/container-tools/debconf (default) or
+ If unsure, use /etc/open-infrastructure/container/debconf (default) or
  /srv/container/debconf when using shared storage.
 
 Template: open-infrastructure-container-tools/hooks
 Type: string
-_Default: /etc/container-tools/hooks
+_Default: /etc/open-infrastructure/container/hooks
 _Description: debconf directory:
  Please specify the directory that will be used to store the container
  hooks.
  .
- If unsure, use /etc/container-tools/hooks (default) or
+ If unsure, use /etc/open-infrastructure/container/hooks (default) or
  /srv/container/hooks when using shared storage.
 
 Template: open-infrastructure-container-tools/keys
 Type: string
-_Default: /etc/container-tools/keys
+_Default: /etc/open-infrastructure/container/keys
 _Description: debconf directory:
  Please specify the directory that will be used to store the container
  keys for verifying container image downloads.
  .
- If unsure, use /etc/container-tools/keys (default) or
+ If unsure, use /etc/open-infrastructure/container/keys (default) or
  /srv/container/keys when using shared storage.
 
 Template: open-infrastructure-container-tools/cache
 Type: string
-_Default: /var/cache/container-tools
+_Default: /var/cache/open-infrastructure/container
 _Description: cache directory:
  Please specify the directory that will be used to cache files during
  creation of containers.
  .
- If unsure, use /var/cache/container-tools (default) or
+ If unsure, use /var/cache/open-infrastructure/container (default) or
  /srv/container/cache when using shared storage.
 
 Template: open-infrastructure-container-tools/script
diff --git a/debian/po/de.po b/debian/po/de.po
index 8badcc8..7e777ba 100644
--- a/debian/po/de.po
+++ b/debian/po/de.po
@@ -1,12 +1,12 @@
 # German debconf translation of open-infrastructure-container-tools
 # Copyright (C) 2017 Markus Hiereth <markus.hiereth@freenet.de>
 # This file is distributed under the same license as the open-infrastructure-container-tools package.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: open-infrastructure-container-tools 20180527-1\n"
-"Report-Msgid-Bugs-To: open-infrastructure-container-tools@packages.debian."
-"org\n"
-"POT-Creation-Date: 2017-07-23 10:37+0200\n"
+"Report-Msgid-Bugs-To: open-infrastructure-compute-tools@packages.debian.org\n"
+"POT-Creation-Date: 2019-02-23 16:47+0100\n"
 "PO-Revision-Date: 2018-08-06 21:31+0200\n"
 "Last-Translator: Markus Hiereth <translation@hiereth.de>\n"
 "Language-Team: debian-l10n-german <debian-l10n-german@lists.debian.org>\n"
@@ -54,8 +54,8 @@ msgstr ""
 #. Type: string
 #. Default
 #: ../open-infrastructure-container-tools.templates:3001
-msgid "/etc/container-tools/config"
-msgstr "/etc/container-tools/config"
+msgid "/etc/open-infrastructure/container/config"
+msgstr "/etc/open-infrastructure/container/config"
 
 #. Type: string
 #. Description
@@ -77,17 +77,17 @@ msgstr ""
 #. Description
 #: ../open-infrastructure-container-tools.templates:3002
 msgid ""
-"If unsure, use /etc/container-tools/config (default) or /srv/container/"
-"config when using shared storage."
+"If unsure, use /etc/open-infrastructure/container/config (default) or /srv/"
+"container/config when using shared storage."
 msgstr ""
-"Wenn Sie unsicher sind, verwenden Sie das Standardverzeichnis /etc/container-"
-"tools/config oder für gemeinsam benutzten Speicher /srv/container/config."
+"Wenn Sie unsicher sind, verwenden Sie das Standardverzeichnis /etc/open-"
+"infrastructure/container/config oder für gemeinsam benutzten Speicher /srv/container/config."
 
 #. Type: string
 #. Default
 #: ../open-infrastructure-container-tools.templates:4001
-msgid "/etc/container-tools/debconf"
-msgstr "/etc/container-tools/debconf"
+msgid "/etc/open-infrastructure/container/debconf"
+msgstr "/etc/open-infrastructure/container/debconf"
 
 #. Type: string
 #. Description
@@ -115,17 +115,17 @@ msgstr ""
 #. Description
 #: ../open-infrastructure-container-tools.templates:4002
 msgid ""
-"If unsure, use /etc/container-tools/debconf (default) or /srv/container/"
-"debconf when using shared storage."
+"If unsure, use /etc/open-infrastructure/container/debconf (default) or /srv/"
+"container/debconf when using shared storage."
 msgstr ""
-"Wenn Sie unsicher sind, verwenden Sie das Standardverzeichnis /etc/container-"
-"tools/debconf oder /srv/container/debconf für gemeinsam benutzten Speicher."
+"Wenn Sie unsicher sind, verwenden Sie das Standardverzeichnis /etc/open-"
+"infrastructure/container/debconf oder /srv/container/debconf für gemeinsam benutzten Speicher."
 
 #. Type: string
 #. Default
 #: ../open-infrastructure-container-tools.templates:5001
-msgid "/etc/container-tools/hooks"
-msgstr "/etc/container-tools/hooks"
+msgid "/etc/open-infrastructure/container/hooks"
+msgstr "/etc/open-infrastructure/container/hooks"
 
 #. Type: string
 #. Description
@@ -140,17 +140,17 @@ msgstr ""
 #. Description
 #: ../open-infrastructure-container-tools.templates:5002
 msgid ""
-"If unsure, use /etc/container-tools/hooks (default) or /srv/container/hooks "
-"when using shared storage."
+"If unsure, use /etc/open-infrastructure/container/hooks (default) or /srv/"
+"container/hooks when using shared storage."
 msgstr ""
-"Wenn Sie unsicher sind, verwenden Sie das Standardverzeichnis /etc/container-"
-"tools/hooks oder für gemeinsam benutzten Speicher /srv/container/hooks."
+"Wenn Sie unsicher sind, verwenden Sie das Standardverzeichnis /etc/open-"
+"infrastructure/container/hooks oder für gemeinsam benutzten Speicher /srv/container/hooks."
 
 #. Type: string
 #. Default
 #: ../open-infrastructure-container-tools.templates:6001
-msgid "/etc/container-tools/keys"
-msgstr "/etc/container-tools/keys"
+msgid "/etc/open-infrastructure/container/keys"
+msgstr "/etc/open-infrastructure/container/keys"
 
 #. Type: string
 #. Description
@@ -166,17 +166,17 @@ msgstr ""
 #. Description
 #: ../open-infrastructure-container-tools.templates:6002
 msgid ""
-"If unsure, use /etc/container-tools/keys (default) or /srv/container/keys "
-"when using shared storage."
+"If unsure, use /etc/open-infrastructure/container/keys (default) or /srv/"
+"container/keys when using shared storage."
 msgstr ""
-"Wenn Sie unsicher sind, verwenden Sie das Standardverzeichnis /etc/container-"
-"tools/keys oder /srv/container/keys für gemeinsam benutzten Speicher."
+"Wenn Sie unsicher sind, verwenden Sie das Standardverzeichnis /etc/open-"
+"infrastructure/container/keys oder /srv/container/keys für gemeinsam benutzten Speicher."
 
 #. Type: string
 #. Default
 #: ../open-infrastructure-container-tools.templates:7001
-msgid "/var/cache/container-tools"
-msgstr "/var/cache/container-tools"
+msgid "/var/cache/open-infrastructure/container"
+msgstr "/var/cache/open-infrastructure/container"
 
 #. Type: string
 #. Description
@@ -198,11 +198,11 @@ msgstr ""
 #. Description
 #: ../open-infrastructure-container-tools.templates:7002
 msgid ""
-"If unsure, use /var/cache/container-tools (default) or /srv/container/cache "
-"when using shared storage."
+"If unsure, use /var/cache/open-infrastructure/container (default) or /srv/"
+"container/cache when using shared storage."
 msgstr ""
 "Wenn Sie unsicher sind, verwenden Sie das Standardverzeichnis /var/cache/"
-"container-tools oder für gemeinsam benutzten Speicher /srv/container/cache."
+"open-infrastructure/container oder für gemeinsam benutzten Speicher /srv/container/cache."
 
 #. Type: select
 #. Choices
diff --git a/debian/po/fr.po b/debian/po/fr.po
index 39c594e..d58deaa 100644
--- a/debian/po/fr.po
+++ b/debian/po/fr.po
@@ -5,9 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: open-infrastructure-container-tools\n"
-"Report-Msgid-Bugs-To: open-infrastructure-container-tools@packages.debian."
-"org\n"
-"POT-Creation-Date: 2017-07-23 10:37+0200\n"
+"Report-Msgid-Bugs-To: open-infrastructure-compute-tools@packages.debian.org\n"
+"POT-Creation-Date: 2019-02-23 16:47+0100\n"
 "PO-Revision-Date: 2016-08-09 15:23+0100\n"
 "Last-Translator: Jean-Pierre Giraud <jean-pierregiraud@neuf.fr>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -55,8 +54,8 @@ msgstr ""
 #. Type: string
 #. Default
 #: ../open-infrastructure-container-tools.templates:3001
-msgid "/etc/container-tools/config"
-msgstr "/etc/container-tools/config"
+msgid "/etc/open-infrastructure/container/config"
+msgstr "/etc/open-infrastructure/container/config"
 
 #. Type: string
 #. Description
@@ -78,17 +77,17 @@ msgstr ""
 #. Description
 #: ../open-infrastructure-container-tools.templates:3002
 msgid ""
-"If unsure, use /etc/container-tools/config (default) or /srv/container/"
-"config when using shared storage."
+"If unsure, use /etc/open-infrastructure/container/config (default) or /srv/"
+"container/config when using shared storage."
 msgstr ""
-"En cas de doute, utilisez /etc/container-tools/config (répertoire par "
+"En cas de doute, utilisez /etc/open-infrastructure/container/config (répertoire par "
 "défaut) ou /srv/container/config si vous utilisez un stockage partagé."
 
 #. Type: string
 #. Default
 #: ../open-infrastructure-container-tools.templates:4001
-msgid "/etc/container-tools/debconf"
-msgstr "/etc/container-tools/debconf"
+msgid "/etc/open-infrastructure/container/debconf"
+msgstr "/etc/open-infrastructure/container/debconf"
 
 #. Type: string
 #. Description
@@ -116,17 +115,17 @@ msgstr ""
 #. Description
 #: ../open-infrastructure-container-tools.templates:4002
 msgid ""
-"If unsure, use /etc/container-tools/debconf (default) or /srv/container/"
-"debconf when using shared storage."
+"If unsure, use /etc/open-infrastructure/container/debconf (default) or /srv/"
+"container/debconf when using shared storage."
 msgstr ""
-"En cas de doute, utilisez /etc/container-tools/debconf (répertoire par "
+"En cas de doute, utilisez /etc/open-infrastructure/container/debconf (répertoire par "
 "défaut) ou /srv/container/debconf si vous utilisez un stockage partagé."
 
 #. Type: string
 #. Default
 #: ../open-infrastructure-container-tools.templates:5001
-msgid "/etc/container-tools/hooks"
-msgstr "/etc/container-tools/hooks"
+msgid "/etc/open-infrastructure/container/hooks"
+msgstr "/etc/open-infrastructure/container/hooks"
 
 #. Type: string
 #. Description
@@ -139,15 +138,17 @@ msgstr ""
 #. Description
 #: ../open-infrastructure-container-tools.templates:5002
 msgid ""
-"If unsure, use /etc/container-tools/hooks (default) or /srv/container/hooks "
-"when using shared storage."
+"If unsure, use /etc/open-infrastructure/container/hooks (default) or /srv/"
+"container/hooks when using shared storage."
 msgstr ""
+"En cas de doute, utilisez /etc/open-infrastructure/container/keys (répertoire par défaut) "
+"ou /srv/container/keys si vous utilisez un stockage partagé."
 
 #. Type: string
 #. Default
 #: ../open-infrastructure-container-tools.templates:6001
-msgid "/etc/container-tools/keys"
-msgstr "/etc/container-tools/keys"
+msgid "/etc/open-infrastructure/container/keys"
+msgstr ""
 
 #. Type: string
 #. Description
@@ -167,17 +168,17 @@ msgstr ""
 #. Description
 #: ../open-infrastructure-container-tools.templates:6002
 msgid ""
-"If unsure, use /etc/container-tools/keys (default) or /srv/container/keys "
-"when using shared storage."
+"If unsure, use /etc/open-infrastructure/container/keys (default) or /srv/"
+"container/keys when using shared storage."
 msgstr ""
-"En cas de doute, utilisez /etc/container-tools/keys (répertoire par "
-"défaut) ou /srv/container/keys si vous utilisez un stockage partagé."
+"En cas de doute, utilisez /etc/open-infrastructure/container/keys (répertoire par défaut) "
+"ou /srv/container/keys si vous utilisez un stockage partagé."
 
 #. Type: string
 #. Default
 #: ../open-infrastructure-container-tools.templates:7001
-msgid "/var/cache/container-tools"
-msgstr "/var/cache/container-tools"
+msgid "/var/cache/open-infrastructure/container"
+msgstr "/var/cache/open-infrastructure/container"
 
 #. Type: string
 #. Description
@@ -199,10 +200,10 @@ msgstr ""
 #. Description
 #: ../open-infrastructure-container-tools.templates:7002
 msgid ""
-"If unsure, use /var/cache/container-tools (default) or /srv/container/cache "
-"when using shared storage."
+"If unsure, use /var/cache/open-infrastructure/container (default) or /srv/"
+"container/cache when using shared storage."
 msgstr ""
-"En cas de doute, utilisez /var/cache/container-tools (répertoire par défaut) "
+"En cas de doute, utilisez /var/cache/open-infrastructure/container (répertoire par défaut) "
 "ou /srv/container/cache si vous utilisez un stockage partagé."
 
 #. Type: select
@@ -265,3 +266,6 @@ msgstr ""
 #: ../open-infrastructure-container-tools.templates:9002
 msgid "If unsure, leave empty (default)."
 msgstr ""
+
+#~ msgid "/etc/container-tools/keys"
+#~ msgstr "/etc/container-tools/keys"
diff --git a/debian/po/nl.po b/debian/po/nl.po
index 78822b3..a0d0bb6 100644
--- a/debian/po/nl.po
+++ b/debian/po/nl.po
@@ -5,9 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: open-infrastructure-container-tools\n"
-"Report-Msgid-Bugs-To: open-infrastructure-container-tools@packages.debian."
-"org\n"
-"POT-Creation-Date: 2017-07-23 10:37+0200\n"
+"Report-Msgid-Bugs-To: open-infrastructure-compute-tools@packages.debian.org\n"
+"POT-Creation-Date: 2019-02-23 16:47+0100\n"
 "PO-Revision-Date: 2017-08-10 16:42+0200\n"
 "Last-Translator: Frans Spiesschaert <Frans.Spiesschaert@yucom.be>\n"
 "Language-Team: Debian Dutch l10n Team <debian-l10n-dutch@lists.debian.org>\n"
@@ -55,8 +54,8 @@ msgstr ""
 #. Type: string
 #. Default
 #: ../open-infrastructure-container-tools.templates:3001
-msgid "/etc/container-tools/config"
-msgstr "/etc/container-tools/config"
+msgid "/etc/open-infrastructure/container/config"
+msgstr "/etc/open-infrastructure/container/config"
 
 #. Type: string
 #. Description
@@ -78,18 +77,18 @@ msgstr ""
 #. Description
 #: ../open-infrastructure-container-tools.templates:3002
 msgid ""
-"If unsure, use /etc/container-tools/config (default) or /srv/container/"
-"config when using shared storage."
+"If unsure, use /etc/open-infrastructure/container/config (default) or /srv/"
+"container/config when using shared storage."
 msgstr ""
-"Indien u twijfelt, gebruik dan /etc/container-tools/config (standaard) of /"
+"Indien u twijfelt, gebruik dan /etc/open-infrastructure/container/config (standaard) of /"
 "srv/container/config in het geval er gebruik gemaakt wordt van gedeelde "
 "opslag."
 
 #. Type: string
 #. Default
 #: ../open-infrastructure-container-tools.templates:4001
-msgid "/etc/container-tools/debconf"
-msgstr "/etc/container-tools/debconf"
+msgid "/etc/open-infrastructure/container/debconf"
+msgstr "/etc/open-infrastructure/container/debconf"
 
 #. Type: string
 #. Description
@@ -117,18 +116,18 @@ msgstr ""
 #. Description
 #: ../open-infrastructure-container-tools.templates:4002
 msgid ""
-"If unsure, use /etc/container-tools/debconf (default) or /srv/container/"
-"debconf when using shared storage."
+"If unsure, use /etc/open-infrastructure/container/debconf (default) or /srv/"
+"container/debconf when using shared storage."
 msgstr ""
-"Indien u twijfelt, gebruik dan /etc/container-tools/debconf (standaard) of /"
+"Indien u twijfelt, gebruik dan /etc/open-infrastructure/container/debconf (standaard) of /"
 "srv/container/debconf in het geval er gebruik gemaakt wordt van gedeelde "
 "opslag."
 
 #. Type: string
 #. Default
 #: ../open-infrastructure-container-tools.templates:5001
-msgid "/etc/container-tools/hooks"
-msgstr "/etc/container-tools/hooks"
+msgid "/etc/open-infrastructure/container/hooks"
+msgstr "/etc/open-infrastructure/container/hooks"
 
 #. Type: string
 #. Description
@@ -143,18 +142,18 @@ msgstr ""
 #. Description
 #: ../open-infrastructure-container-tools.templates:5002
 msgid ""
-"If unsure, use /etc/container-tools/hooks (default) or /srv/container/hooks "
-"when using shared storage."
+"If unsure, use /etc/open-infrastructure/container/hooks (default) or /srv/"
+"container/hooks when using shared storage."
 msgstr ""
-"Indien u twijfelt, gebruik dan /etc/container-tools/hooks (standaard) of /"
+"Indien u twijfelt, gebruik dan /etc/open-infrastructure/container/hooks (standaard) of /"
 "srv/container/hooks in het geval er gebruik gemaakt wordt van gedeelde "
 "opslag."
 
 #. Type: string
 #. Default
 #: ../open-infrastructure-container-tools.templates:6001
-msgid "/etc/container-tools/keys"
-msgstr "/etc/container-tools/keys"
+msgid "/etc/open-infrastructure/container/keys"
+msgstr ""
 
 #. Type: string
 #. Description
@@ -170,17 +169,17 @@ msgstr ""
 #. Description
 #: ../open-infrastructure-container-tools.templates:6002
 msgid ""
-"If unsure, use /etc/container-tools/keys (default) or /srv/container/keys "
-"when using shared storage."
+"If unsure, use /etc/open-infrastructure/container/keys (default) or /srv/"
+"container/keys when using shared storage."
 msgstr ""
-"Indien u twijfelt, gebruik dan /etc/container-tools/keys (standaard) of /srv/"
+"Indien u twijfelt, gebruik dan /etc/open-infrastructure/container/keys (standaard) of /srv/"
 "container/keys in het geval er gebruik gemaakt wordt van gedeelde opslag."
 
 #. Type: string
 #. Default
 #: ../open-infrastructure-container-tools.templates:7001
-msgid "/var/cache/container-tools"
-msgstr "/var/cache/container-tools"
+msgid "/var/cache/open-infrastructure/container"
+msgstr "/var/cache/open-infrastructure/container"
 
 #. Type: string
 #. Description
@@ -202,10 +201,10 @@ msgstr ""
 #. Description
 #: ../open-infrastructure-container-tools.templates:7002
 msgid ""
-"If unsure, use /var/cache/container-tools (default) or /srv/container/cache "
-"when using shared storage."
+"If unsure, use /var/cache/open-infrastructure/container (default) or /srv/"
+"container/cache when using shared storage."
 msgstr ""
-"Indien u twijfelt, gebruik dan /var/cache/container-tools (standaard) of /"
+"Indien u twijfelt, gebruik dan /var/cache/open-infrastructure/container (standaard) of /"
 "srv/container/cache in het geval er gebruik gemaakt wordt van gedeelde "
 "opslag."
 
@@ -272,3 +271,6 @@ msgstr "  irc://irc.oftc.net:6668/open-infrastructure"
 #: ../open-infrastructure-container-tools.templates:9002
 msgid "If unsure, leave empty (default)."
 msgstr "Als u twijfelt, laat u dit best leeg (standaard)."
+
+#~ msgid "/etc/container-tools/keys"
+#~ msgstr "/etc/container-tools/keys"
diff --git a/debian/po/pt.po b/debian/po/pt.po
index b2a1e20..4444a38 100644
--- a/debian/po/pt.po
+++ b/debian/po/pt.po
@@ -5,9 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: open-infrastructure-container-tools 20161101-lts2-2\n"
-"Report-Msgid-Bugs-To: open-infrastructure-container-tools@packages.debian."
-"org\n"
-"POT-Creation-Date: 2017-07-23 10:37+0200\n"
+"Report-Msgid-Bugs-To: open-infrastructure-compute-tools@packages.debian.org\n"
+"POT-Creation-Date: 2019-02-23 16:47+0100\n"
 "PO-Revision-Date: 2017-08-02 21:47+0000\n"
 "Last-Translator: Rui Branco - DebianPT <ruipb@debianpt.org>\n"
 "Language-Team: Portuguese <traduz@debianpt.org>\n"
@@ -56,8 +55,8 @@ msgstr ""
 #. Type: string
 #. Default
 #: ../open-infrastructure-container-tools.templates:3001
-msgid "/etc/container-tools/config"
-msgstr "/etc/container-tools/config"
+msgid "/etc/open-infrastructure/container/config"
+msgstr "/etc/open-infrastructure/container/config"
 
 #. Type: string
 #. Description
@@ -79,17 +78,17 @@ msgstr ""
 #. Description
 #: ../open-infrastructure-container-tools.templates:3002
 msgid ""
-"If unsure, use /etc/container-tools/config (default) or /srv/container/"
-"config when using shared storage."
+"If unsure, use /etc/open-infrastructure/container/config (default) or /srv/"
+"container/config when using shared storage."
 msgstr ""
-"Em caso de dúvida utilize /etc/container-tools/config (predefinido) ou /srv/"
+"Em caso de dúvida utilize /etc/open-infrastructure/container/config (predefinido) ou /srv/"
 "container/config quando utilizar armazenamento partilhado."
 
 #. Type: string
 #. Default
 #: ../open-infrastructure-container-tools.templates:4001
-msgid "/etc/container-tools/debconf"
-msgstr "/etc/container-tools/debconf"
+msgid "/etc/open-infrastructure/container/debconf"
+msgstr "/etc/open-infrastructure/container/debconf"
 
 #. Type: string
 #. Description
@@ -117,17 +116,17 @@ msgstr ""
 #. Description
 #: ../open-infrastructure-container-tools.templates:4002
 msgid ""
-"If unsure, use /etc/container-tools/debconf (default) or /srv/container/"
-"debconf when using shared storage."
+"If unsure, use /etc/open-infrastructure/container/debconf (default) or /srv/"
+"container/debconf when using shared storage."
 msgstr ""
-"Em caso de dúvida utilize /etc/container-tools/debconf (predefinido) ou /srv/"
+"Em caso de dúvida utilize /etc/open-infrastructure/container/debconf (predefinido) ou /srv/"
 "container/debconf quando utilizar armazenamento partilhado."
 
 #. Type: string
 #. Default
 #: ../open-infrastructure-container-tools.templates:5001
-msgid "/etc/container-tools/hooks"
-msgstr "/etc/container-tools/hooks"
+msgid "/etc/open-infrastructure/container/hooks"
+msgstr "/etc/open-infrastructure/container/hooks"
 
 #. Type: string
 #. Description
@@ -142,17 +141,17 @@ msgstr ""
 #. Description
 #: ../open-infrastructure-container-tools.templates:5002
 msgid ""
-"If unsure, use /etc/container-tools/hooks (default) or /srv/container/hooks "
-"when using shared storage."
+"If unsure, use /etc/open-infrastructure/container/hooks (default) or /srv/"
+"container/hooks when using shared storage."
 msgstr ""
-"Em caso de dúvida utilize /etc/container-tools/hooks (predefinido) ou /srv/"
+"Em caso de dúvida utilize /etc/open-infrastructure/container/hooks (predefinido) ou /srv/"
 "container/hooks quando utilizar armazenamento partilhado."
 
 #. Type: string
 #. Default
 #: ../open-infrastructure-container-tools.templates:6001
-msgid "/etc/container-tools/keys"
-msgstr "/etc/container-tools/keys"
+msgid "/etc/open-infrastructure/container/keys"
+msgstr ""
 
 #. Type: string
 #. Description
@@ -168,17 +167,17 @@ msgstr ""
 #. Description
 #: ../open-infrastructure-container-tools.templates:6002
 msgid ""
-"If unsure, use /etc/container-tools/keys (default) or /srv/container/keys "
-"when using shared storage."
+"If unsure, use /etc/open-infrastructure/container/keys (default) or /srv/"
+"container/keys when using shared storage."
 msgstr ""
-"Em caso de dúvida utilize /etc/container-tools/keys (predefinido) ou /srv/"
+"Em caso de dúvida utilize /etc/open-infrastructure/container/keys (predefinido) ou /srv/"
 "container/keys quando utilizar armazenamento partilhado."
 
 #. Type: string
 #. Default
 #: ../open-infrastructure-container-tools.templates:7001
-msgid "/var/cache/container-tools"
-msgstr "/var/cache/container-tools"
+msgid "/var/cache/open-infrastructure/container"
+msgstr "/var/cache/open-infrastructure/container"
 
 #. Type: string
 #. Description
@@ -200,10 +199,10 @@ msgstr ""
 #. Description
 #: ../open-infrastructure-container-tools.templates:7002
 msgid ""
-"If unsure, use /var/cache/container-tools (default) or /srv/container/cache "
-"when using shared storage."
+"If unsure, use /var/cache/open-infrastructure/container (default) or /srv/"
+"container/cache when using shared storage."
 msgstr ""
-"Em caso de dúvida utilize /var/cache/container-tools (predefinido) ou /srv/"
+"Em caso de dúvida utilize /var/cache/open-infrastructure/container (predefinido) ou /srv/"
 "container/cache quando utilizar armazenamento partilhado."
 
 #. Type: select
@@ -270,3 +269,6 @@ msgstr "  irc://irc.oftc.net:6668/open-infrastructure"
 #: ../open-infrastructure-container-tools.templates:9002
 msgid "If unsure, leave empty (default)."
 msgstr "Se tem dúvidas deixe em branco (predefinição)."
+
+#~ msgid "/etc/container-tools/keys"
+#~ msgstr "/etc/container-tools/keys"
diff --git a/debian/po/pt_BR.po b/debian/po/pt_BR.po
index 3f83533..f317fbf 100644
--- a/debian/po/pt_BR.po
+++ b/debian/po/pt_BR.po
@@ -5,9 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: open-infrastructure-container-tools\n"
-"Report-Msgid-Bugs-To: open-infrastructure-container-tools@packages.debian."
-"org\n"
-"POT-Creation-Date: 2017-07-23 10:37+0200\n"
+"Report-Msgid-Bugs-To: open-infrastructure-compute-tools@packages.debian.org\n"
+"POT-Creation-Date: 2019-02-23 16:47+0100\n"
 "PO-Revision-Date: 2016-08-25 22:07-0300\n"
 "Last-Translator: Adriano Rafael Gomes <adrianorg@debian.org>\n"
 "Language-Team: Brazilian Portuguese <debian-l10n-portuguese@lists.debian."
@@ -56,8 +55,8 @@ msgstr ""
 #. Type: string
 #. Default
 #: ../open-infrastructure-container-tools.templates:3001
-msgid "/etc/container-tools/config"
-msgstr "/etc/container-tools/config"
+msgid "/etc/open-infrastructure/container/config"
+msgstr "/etc/open-infrastructure/container/config"
 
 #. Type: string
 #. Description
@@ -79,17 +78,17 @@ msgstr ""
 #. Description
 #: ../open-infrastructure-container-tools.templates:3002
 msgid ""
-"If unsure, use /etc/container-tools/config (default) or /srv/container/"
-"config when using shared storage."
+"If unsure, use /etc/open-infrastructure/container/config (default) or /srv/"
+"container/config when using shared storage."
 msgstr ""
-"Se não tiver certeza, use /etc/container-tools/config (padrão) ou /srv/"
+"Se não tiver certeza, use /etc/open-infrastructure/container/config (padrão) ou /srv/"
 "container/config ao usar armazenamento compartilhado."
 
 #. Type: string
 #. Default
 #: ../open-infrastructure-container-tools.templates:4001
-msgid "/etc/container-tools/debconf"
-msgstr "/etc/container-tools/debconf"
+msgid "/etc/open-infrastructure/container/debconf"
+msgstr "/etc/open-infrastructure/container/debconf"
 
 #. Type: string
 #. Description
@@ -117,17 +116,17 @@ msgstr ""
 #. Description
 #: ../open-infrastructure-container-tools.templates:4002
 msgid ""
-"If unsure, use /etc/container-tools/debconf (default) or /srv/container/"
-"debconf when using shared storage."
+"If unsure, use /etc/open-infrastructure/container/debconf (default) or /srv/"
+"container/debconf when using shared storage."
 msgstr ""
-"Se não tiver certeza, use /etc/container-tools/debconf (padrão) ou /srv/"
+"Se não tiver certeza, use /etc/open-infrastructure/container/debconf (padrão) ou /srv/"
 "container/debconf ao usar armazenamento compartilhado."
 
 #. Type: string
 #. Default
 #: ../open-infrastructure-container-tools.templates:5001
-msgid "/etc/container-tools/hooks"
-msgstr "/etc/container-tools/hooks"
+msgid "/etc/open-infrastructure/container/hooks"
+msgstr "/etc/open-infrastructure/container/hooks"
 
 #. Type: string
 #. Description
@@ -140,15 +139,17 @@ msgstr ""
 #. Description
 #: ../open-infrastructure-container-tools.templates:5002
 msgid ""
-"If unsure, use /etc/container-tools/hooks (default) or /srv/container/hooks "
-"when using shared storage."
+"If unsure, use /etc/open-infrastructure/container/hooks (default) or /srv/"
+"container/hooks when using shared storage."
 msgstr ""
+"Se não tiver certeza, use /etc/open-infrastructure/container/keys (padrão) ou /srv/"
+"container/keys ao usar armazenamento compartilhado."
 
 #. Type: string
 #. Default
 #: ../open-infrastructure-container-tools.templates:6001
-msgid "/etc/container-tools/keys"
-msgstr "/etc/container-tools/keys"
+msgid "/etc/open-infrastructure/container/keys"
+msgstr ""
 
 #. Type: string
 #. Description
@@ -168,17 +169,17 @@ msgstr ""
 #. Description
 #: ../open-infrastructure-container-tools.templates:6002
 msgid ""
-"If unsure, use /etc/container-tools/keys (default) or /srv/container/keys "
-"when using shared storage."
+"If unsure, use /etc/open-infrastructure/container/keys (default) or /srv/"
+"container/keys when using shared storage."
 msgstr ""
-"Se não tiver certeza, use /etc/container-tools/keys (padrão) ou /srv/"
+"Se não tiver certeza, use /etc/open-infrastructure/container/keys (padrão) ou /srv/"
 "container/keys ao usar armazenamento compartilhado."
 
 #. Type: string
 #. Default
 #: ../open-infrastructure-container-tools.templates:7001
-msgid "/var/cache/container-tools"
-msgstr "/var/cache/container-tools"
+msgid "/var/cache/open-infrastructure/container"
+msgstr "/var/cache/open-infrastructure/container"
 
 #. Type: string
 #. Description
@@ -200,10 +201,10 @@ msgstr ""
 #. Description
 #: ../open-infrastructure-container-tools.templates:7002
 msgid ""
-"If unsure, use /var/cache/container-tools (default) or /srv/container/cache "
-"when using shared storage."
+"If unsure, use /var/cache/open-infrastructure/container (default) or /srv/"
+"container/cache when using shared storage."
 msgstr ""
-"Se não tiver certeza, use /var/cache/container-tools (padrão) ou /srv/"
+"Se não tiver certeza, use /var/cache/open-infrastructure/container (padrão) ou /srv/"
 "container/cache ao usar armazenamento compartilhado."
 
 #. Type: select
@@ -266,3 +267,6 @@ msgstr ""
 #: ../open-infrastructure-container-tools.templates:9002
 msgid "If unsure, leave empty (default)."
 msgstr ""
+
+#~ msgid "/etc/container-tools/keys"
+#~ msgstr "/etc/container-tools/keys"
diff --git a/debian/po/ru.po b/debian/po/ru.po
index bd96892..3e5d5e1 100644
--- a/debian/po/ru.po
+++ b/debian/po/ru.po
@@ -4,9 +4,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: open-infrastructure-container-tools\n"
-"Report-Msgid-Bugs-To: open-infrastructure-container-tools@packages.debian."
-"org\n"
-"POT-Creation-Date: 2017-07-23 10:37+0200\n"
+"Report-Msgid-Bugs-To: open-infrastructure-compute-tools@packages.debian.org\n"
+"POT-Creation-Date: 2019-02-23 16:47+0100\n"
 "PO-Revision-Date: 2017-12-03 22:46+0500\n"
 "Last-Translator: Lev Lamberov <dogsleg@debian.org>\n"
 "Language-Team: \n"
@@ -55,8 +54,8 @@ msgstr ""
 #. Type: string
 #. Default
 #: ../open-infrastructure-container-tools.templates:3001
-msgid "/etc/container-tools/config"
-msgstr "/etc/container-tools/config"
+msgid "/etc/open-infrastructure/container/config"
+msgstr "/etc/open-infrastructure/container/config"
 
 #. Type: string
 #. Description
@@ -77,17 +76,17 @@ msgstr ""
 #. Description
 #: ../open-infrastructure-container-tools.templates:3002
 msgid ""
-"If unsure, use /etc/container-tools/config (default) or /srv/container/"
-"config when using shared storage."
+"If unsure, use /etc/open-infrastructure/container/config (default) or /srv/"
+"container/config when using shared storage."
 msgstr ""
 "Если вы не уверены, то при использовании общего хранилища выберите /etc/"
-"container-tools/config (по умолчанию) или /srv/container/config."
+"open-infrastructure/container/config (по умолчанию) или /srv/container/config."
 
 #. Type: string
 #. Default
 #: ../open-infrastructure-container-tools.templates:4001
-msgid "/etc/container-tools/debconf"
-msgstr "/etc/container-tools/debconf"
+msgid "/etc/open-infrastructure/container/debconf"
+msgstr "/etc/open-infrastructure/container/debconf"
 
 #. Type: string
 #. Description
@@ -115,17 +114,17 @@ msgstr ""
 #. Description
 #: ../open-infrastructure-container-tools.templates:4002
 msgid ""
-"If unsure, use /etc/container-tools/debconf (default) or /srv/container/"
-"debconf when using shared storage."
+"If unsure, use /etc/open-infrastructure/container/debconf (default) or /srv/"
+"container/debconf when using shared storage."
 msgstr ""
 "Если вы не уверены, то при использовании общего хранилища выберите /etc/"
-"container-tools/debconf (по умолчанию) или /srv/container/debconf."
+"open-infrastructure/container/debconf (по умолчанию) или /srv/container/debconf."
 
 #. Type: string
 #. Default
 #: ../open-infrastructure-container-tools.templates:5001
-msgid "/etc/container-tools/hooks"
-msgstr "/etc/container-tools/hooks"
+msgid "/etc/open-infrastructure/container/hooks"
+msgstr "/etc/open-infrastructure/container/hooks"
 
 #. Type: string
 #. Description
@@ -140,17 +139,17 @@ msgstr ""
 #. Description
 #: ../open-infrastructure-container-tools.templates:5002
 msgid ""
-"If unsure, use /etc/container-tools/hooks (default) or /srv/container/hooks "
-"when using shared storage."
+"If unsure, use /etc/open-infrastructure/container/hooks (default) or /srv/"
+"container/hooks when using shared storage."
 msgstr ""
 "Если вы не уверены, то при использовании общего хранилища выберите /etc/"
-"container-tools/hooks (по умолчанию) или /srv/container/hooks."
+"open-infrastructure/container/hooks (по умолчанию) или /srv/container/hooks."
 
 #. Type: string
 #. Default
 #: ../open-infrastructure-container-tools.templates:6001
-msgid "/etc/container-tools/keys"
-msgstr "/etc/container-tools/keys"
+msgid "/etc/open-infrastructure/container/keys"
+msgstr ""
 
 #. Type: string
 #. Description
@@ -166,17 +165,17 @@ msgstr ""
 #. Description
 #: ../open-infrastructure-container-tools.templates:6002
 msgid ""
-"If unsure, use /etc/container-tools/keys (default) or /srv/container/keys "
-"when using shared storage."
+"If unsure, use /etc/open-infrastructure/container/keys (default) or /srv/"
+"container/keys when using shared storage."
 msgstr ""
 "Если вы не уверены, то при использовании общего хранилища выберите /etc/"
-"container-tools/keys (по умолчанию) или /srv/container/keys."
+"open-infrastructure/container/keys (по умолчанию) или /srv/container/keys."
 
 #. Type: string
 #. Default
 #: ../open-infrastructure-container-tools.templates:7001
-msgid "/var/cache/container-tools"
-msgstr "/var/cache/container-tools"
+msgid "/var/cache/open-infrastructure/container"
+msgstr "/var/cache/open-infrastructure/container"
 
 #. Type: string
 #. Description
@@ -198,11 +197,11 @@ msgstr ""
 #. Description
 #: ../open-infrastructure-container-tools.templates:7002
 msgid ""
-"If unsure, use /var/cache/container-tools (default) or /srv/container/cache "
-"when using shared storage."
+"If unsure, use /var/cache/open-infrastructure/container (default) or /srv/"
+"container/cache when using shared storage."
 msgstr ""
 "Если вы не уверены, то при использовании общего хранилища выберите /var/"
-"cache/container-tools (по умолчанию) или /srv/container/cache."
+"cache/open-infrastructure/container (по умолчанию) или /srv/container/cache."
 
 #. Type: select
 #. Choices
@@ -267,3 +266,6 @@ msgstr "  irc://irc.oftc.net:6668/open-infrastructure"
 #: ../open-infrastructure-container-tools.templates:9002
 msgid "If unsure, leave empty (default)."
 msgstr "Если вы не уверены, то оставьте это поле пустым (по умолчанию)."
+
+#~ msgid "/etc/container-tools/keys"
+#~ msgstr "/etc/container-tools/keys"
diff --git a/debian/po/templates.pot b/debian/po/templates.pot
index 0873884..bdcc854 100644
--- a/debian/po/templates.pot
+++ b/debian/po/templates.pot
@@ -1,15 +1,14 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the open-infrastructure-container-tools package.
+# This file is distributed under the same license as the open-infrastructure-compute-tools package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: open-infrastructure-container-tools\n"
-"Report-Msgid-Bugs-To: open-infrastructure-container-tools@packages.debian."
-"org\n"
-"POT-Creation-Date: 2017-07-23 10:37+0200\n"
+"Project-Id-Version: open-infrastructure-compute-tools\n"
+"Report-Msgid-Bugs-To: open-infrastructure-compute-tools@packages.debian.org\n"
+"POT-Creation-Date: 2019-02-23 16:47+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -53,7 +52,7 @@ msgstr ""
 #. Type: string
 #. Default
 #: ../open-infrastructure-container-tools.templates:3001
-msgid "/etc/container-tools/config"
+msgid "/etc/open-infrastructure/container/config"
 msgstr ""
 
 #. Type: string
@@ -74,14 +73,14 @@ msgstr ""
 #. Description
 #: ../open-infrastructure-container-tools.templates:3002
 msgid ""
-"If unsure, use /etc/container-tools/config (default) or /srv/container/"
-"config when using shared storage."
+"If unsure, use /etc/open-infrastructure/container/config (default) or /srv/"
+"container/config when using shared storage."
 msgstr ""
 
 #. Type: string
 #. Default
 #: ../open-infrastructure-container-tools.templates:4001
-msgid "/etc/container-tools/debconf"
+msgid "/etc/open-infrastructure/container/debconf"
 msgstr ""
 
 #. Type: string
@@ -108,14 +107,14 @@ msgstr ""
 #. Description
 #: ../open-infrastructure-container-tools.templates:4002
 msgid ""
-"If unsure, use /etc/container-tools/debconf (default) or /srv/container/"
-"debconf when using shared storage."
+"If unsure, use /etc/open-infrastructure/container/debconf (default) or /srv/"
+"container/debconf when using shared storage."
 msgstr ""
 
 #. Type: string
 #. Default
 #: ../open-infrastructure-container-tools.templates:5001
-msgid "/etc/container-tools/hooks"
+msgid "/etc/open-infrastructure/container/hooks"
 msgstr ""
 
 #. Type: string
@@ -129,14 +128,14 @@ msgstr ""
 #. Description
 #: ../open-infrastructure-container-tools.templates:5002
 msgid ""
-"If unsure, use /etc/container-tools/hooks (default) or /srv/container/hooks "
-"when using shared storage."
+"If unsure, use /etc/open-infrastructure/container/hooks (default) or /srv/"
+"container/hooks when using shared storage."
 msgstr ""
 
 #. Type: string
 #. Default
 #: ../open-infrastructure-container-tools.templates:6001
-msgid "/etc/container-tools/keys"
+msgid "/etc/open-infrastructure/container/keys"
 msgstr ""
 
 #. Type: string
@@ -151,14 +150,14 @@ msgstr ""
 #. Description
 #: ../open-infrastructure-container-tools.templates:6002
 msgid ""
-"If unsure, use /etc/container-tools/keys (default) or /srv/container/keys "
-"when using shared storage."
+"If unsure, use /etc/open-infrastructure/container/keys (default) or /srv/"
+"container/keys when using shared storage."
 msgstr ""
 
 #. Type: string
 #. Default
 #: ../open-infrastructure-container-tools.templates:7001
-msgid "/var/cache/container-tools"
+msgid "/var/cache/open-infrastructure/container"
 msgstr ""
 
 #. Type: string
@@ -179,8 +178,8 @@ msgstr ""
 #. Description
 #: ../open-infrastructure-container-tools.templates:7002
 msgid ""
-"If unsure, use /var/cache/container-tools (default) or /srv/container/cache "
-"when using shared storage."
+"If unsure, use /var/cache/open-infrastructure/container (default) or /srv/"
+"container/cache when using shared storage."
 msgstr ""
 
 #. Type: select
diff --git a/debian/rules b/debian/rules
index 3dce1ba..3bb49f0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,10 +11,10 @@ override_dh_auto_build:
 override_dh_auto_install:
 	dh_auto_install -- DESTDIR=$(CURDIR)/debian/open-infrastructure-$(PACKAGE)
 
-	rm -f debian/open-infrastructure-$(PACKAGE)/usr/share/doc/$(PACKAGE)/CHANGELOG.txt
-	rm -f debian/open-infrastructure-$(PACKAGE)/usr/share/doc/$(PACKAGE)/LICENSE.txt
+	rm -f debian/open-infrastructure-$(PACKAGE)/usr/share/doc/*/CHANGELOG.txt
+	rm -f debian/open-infrastructure-$(PACKAGE)/usr/share/doc/*/LICENSE.txt
 
-	mv debian/open-infrastructure-$(PACKAGE)/usr/share/doc/$(PACKAGE) debian/open-infrastructure-$(PACKAGE)/usr/share/doc/open-infrastructure-$(PACKAGE)
+	mv debian/open-infrastructure-$(PACKAGE)/usr/share/doc/* debian/open-infrastructure-$(PACKAGE)/usr/share/doc/open-infrastructure-$(PACKAGE)
 
 override_dh_installsystemd:
 	dh_installsystemd --no-restart-after-upgrade --no-start --no-stop-on-upgrade