diff --git a/CLIENT_DATA/setup32.ins b/CLIENT_DATA/setup32.ins
index b0a65b9..511e9e1 100644
--- a/CLIENT_DATA/setup32.ins
+++ b/CLIENT_DATA/setup32.ins
@@ -86,7 +86,7 @@ REG ADD HKLM\SOFTWARE\Mozilla\MaintenanceService /v Attempted /t REG_DWORD /d 1
 copy "$IniCfgFile$" "$InstallDir$"
 copy "%ScriptPath%\*.cfg" "$InstallDir$"
 copy "%ScriptPath%\local-settings.js" "$InstallDir$\defaults\pref"
-copy -s "%ScriptPath%\X86\Plugins\*.*" "$InstallDir$\distribution\extensions"
+copy -s "%ScriptPath%\X86\Addons\*.*" "$InstallDir$\distribution\extensions"
 del "$InstallDir$\distribution\extensions\tbtestpilot@labs.mozilla.com.xpi"
 
 [Registry_install]
diff --git a/builder-product.cfg b/builder-product.cfg
index abbbe5e..be4b399 100644
--- a/builder-product.cfg
+++ b/builder-product.cfg
@@ -62,7 +62,7 @@ DL_SOURCE[9]="http://www.gargan.org/extensions/synckolab-NIGHTLY.xpi"
 DL_ARCH[9]="X86"
 DL_WINST_NAME[9]=SyncKolab-NIGHTLY
 
-DL_FILE[10]="exquilla-currentrelease-tb-windows.xpi"
+DL_FILE[10]="exquilla@mesquilla.com.xpi"
 DL_SOURCE[10]="http://mesquilla.net/exquilla-currentrelease-tb-windows.xpi"
 DL_ARCH[10]="X86"
 DL_WINST_NAME[10]=Exquilla-Currentrelease
diff --git a/builder-targets-cb.sh b/builder-targets-cb.sh
index 7d14ec0..5b39d05 100644
--- a/builder-targets-cb.sh
+++ b/builder-targets-cb.sh
@@ -27,8 +27,18 @@ function cleanup() {
 function create() {
     echo "Create"
     builder_create
-	mkdir -p $INST_DIR/CLIENT_DATA/X86/Plugins/{{e2fda1a4-762b-4020-b5ad-a41df1933103},exquilla@mesquilla.com}
-	7z x -o$INST_DIR/CLIENT_DATA/X86/Plugins/{e2fda1a4-762b-4020-b5ad-a41df1933103} $INST_DIR/CLIENT_DATA/X86/{e2fda1a4-762b-4020-b5ad-a41df1933103}.xpi
-	7z x -o$INST_DIR/CLIENT_DATA/X86/Plugins/exquilla@mesquilla.com $INST_DIR/CLIENT_DATA/X86/exquilla-currentrelease-tb-windows.xpi
-	mv  $INST_DIR/CLIENT_DATA/X86/*.xpi $INST_DIR/CLIENT_DATA/X86/Plugins
+
+	mkdir -p $INST_DIR/CLIENT_DATA/X86/Addons
+	mv  $INST_DIR/CLIENT_DATA/X86/*.xpi $INST_DIR/CLIENT_DATA/X86/Addons
+
+	pushd $INST_DIR/CLIENT_DATA/X86/Addons
+
+	for file in `ls *.xpi`
+	do
+	    dirname=`echo $file|sed 's/\.xpi$//g'`
+	    mkdir $dirname
+	    7z x -o$INST_DIR/CLIENT_DATA/X86/Addons/$dirname $INST_DIR/CLIENT_DATA/X86/Addons/$file
+	done
+
+	popd
 }
diff --git a/exquilla-currentrelease-tb-windows.xpi.sha1sum b/exquilla-currentrelease-tb-windows.xpi.sha1sum
deleted file mode 100644
index 3e5bc46..0000000
--- a/exquilla-currentrelease-tb-windows.xpi.sha1sum
+++ /dev/null
@@ -1 +0,0 @@
-1563ef80564d2cdc6bdcf862e24994948a310960  /home/opsiproducts/.opsi-dist-cache/mozilla.thunderbird-17.0.5/X86/exquilla-currentrelease-tb-windows.xpi
diff --git a/exquilla@mesquilla.com.xpi.sha1sum b/exquilla@mesquilla.com.xpi.sha1sum
new file mode 100644
index 0000000..1729516
--- /dev/null
+++ b/exquilla@mesquilla.com.xpi.sha1sum
@@ -0,0 +1 @@
+1563ef80564d2cdc6bdcf862e24994948a310960  /home/mario/.opsi-dist-cache/mozilla.thunderbird-17.0.5/X86/exquilla@mesquilla.com.xpi