# Available add-ons
-addon.card-viewer-extended.path = card-viewer-extended
-addon.check-recipients.path = check-recipients
-addon.crl-over-ldap.path = crl-over-ldap
-addon.directoryContactTabsEngine.path = directoryContactTabsEngine
-addon.directoryContactTabsData-template.path = directoryContactTabsData-template
-addon.directoryContactTabsData-sample.path = directoryContactTabsData-sample
-addon.dsn-settings.path = dsn-settings
-addon.mailXFormsEngine.path = mailXFormsEngine
-addon.mailXFormsData-template.path = mailXFormsData-template
-addon.mailXFormsData-sample.path = mailXFormsData-sample
-addon.mdn-extended.path = mdn-extended
-addon.mrs.path = message-remote-services
-addon.multi-ldap.path = multi-ldap
-addon.notification-viewer.path = notification-viewer
-addon.out-of-office.path = out-of-office
-addon.send-format-ldap.path = send-format-ldap
+addon.card-viewer-extended.path = addons/card-viewer-extended
+addon.check-recipients.path = addons/check-recipients
+addon.crl-over-ldap.path = addons/crl-over-ldap
+addon.directoryContactTabsEngine.path = addons/directoryContactTabsEngine
+addon.directoryContactTabsData-template.path = addons/directoryContactTabsData-template
+addon.directoryContactTabsData-sample.path = addons/directoryContactTabsData-sample
+addon.dsn-settings.path = addons/dsn-settings
+addon.mailXFormsEngine.path = addons/mailXFormsEngine
+addon.mailXFormsData-template.path = addons/mailXFormsData-template
+addon.mailXFormsData-sample.path = addons/mailXFormsData-sample
+addon.mdn-extended.path = addons/mdn-extended
+addon.mrs.path = addons/message-remote-services
+addon.multi-ldap.path = addons/multi-ldap
+addon.notification-viewer.path = addons/notification-viewer
+addon.out-of-office.path = addons/out-of-office
+addon.send-format-ldap.path = addons/send-format-ldap
addon.trustedbird2-l10n-fr.path = l10n/fr-2
addon.trustedbird3.1-l10n-fr.path = l10n/fr-3.1
-addon.ximfmail.path = ximfmail
-addon.ximfmail-company.path = ximfmail-company
-addon.xsmtp.path = xsmtp
+addon.ximfmail.path = addons/ximfmail
+addon.ximfmail-company.path = addons/ximfmail-company
+addon.xsmtp.path = addons/xsmtp
# Meta-packages
-addon.all-addons-tb2.path = all-addons-tb2
+addon.all-addons-tb2.path = addons/all-addons-tb2
addon.all-addons-tb2.includes = card-viewer-extended*xpi check-recipients*xpi crl-over-ldap*xpi mdn-extended*xpi multi-ldap*xpi notification-viewer*xpi out-of-office*xpi send-format-ldap*xpi
-addon.all-addons-tb30.path = all-addons-tb30
+addon.all-addons-tb30.path = addons/all-addons-tb30
addon.all-addons-tb30.includes = crl-over-ldap*xpi directoryContactTabs*xpi dsn-settings*xpi mailXForms*xpi mdn-extended*xpi multi-ldap*xpi notification-viewer*xpi out-of-office*xpi
addon.all-addons-tb30.excludes = directoryContactTabsData-template*xpi mailXFormsData-template*xpi