diff --git a/testing/btest/Baseline/scripts.base.protocols.bdat-chunk-size-overflow/out b/testing/btest/Baseline/scripts.base.protocols.smtp.bdat-chunk-size-overflow/out
similarity index 100%
rename from testing/btest/Baseline/scripts.base.protocols.bdat-chunk-size-overflow/out
rename to testing/btest/Baseline/scripts.base.protocols.smtp.bdat-chunk-size-overflow/out
diff --git a/testing/btest/Baseline/scripts.base.protocols.bdat-chunk-size-overflow/smtp.log b/testing/btest/Baseline/scripts.base.protocols.smtp.bdat-chunk-size-overflow/smtp.log
similarity index 100%
rename from testing/btest/Baseline/scripts.base.protocols.bdat-chunk-size-overflow/smtp.log
rename to testing/btest/Baseline/scripts.base.protocols.smtp.bdat-chunk-size-overflow/smtp.log
diff --git a/testing/btest/Baseline/scripts.base.protocols.bdat-chunk-size-overflow/weird.log b/testing/btest/Baseline/scripts.base.protocols.smtp.bdat-chunk-size-overflow/weird.log
similarity index 100%
rename from testing/btest/Baseline/scripts.base.protocols.bdat-chunk-size-overflow/weird.log
rename to testing/btest/Baseline/scripts.base.protocols.smtp.bdat-chunk-size-overflow/weird.log
diff --git a/testing/btest/Baseline/scripts.base.protocols.bdat-chunk-size-overflow2/out b/testing/btest/Baseline/scripts.base.protocols.smtp.bdat-chunk-size-overflow2/out
similarity index 100%
rename from testing/btest/Baseline/scripts.base.protocols.bdat-chunk-size-overflow2/out
rename to testing/btest/Baseline/scripts.base.protocols.smtp.bdat-chunk-size-overflow2/out
diff --git a/testing/btest/Baseline/scripts.base.protocols.bdat-chunk-size-overflow2/smtp.log b/testing/btest/Baseline/scripts.base.protocols.smtp.bdat-chunk-size-overflow2/smtp.log
similarity index 100%
rename from testing/btest/Baseline/scripts.base.protocols.bdat-chunk-size-overflow2/smtp.log
rename to testing/btest/Baseline/scripts.base.protocols.smtp.bdat-chunk-size-overflow2/smtp.log
diff --git a/testing/btest/Baseline/scripts.base.protocols.bdat-chunk-size-overflow2/weird.log b/testing/btest/Baseline/scripts.base.protocols.smtp.bdat-chunk-size-overflow2/weird.log
similarity index 100%
rename from testing/btest/Baseline/scripts.base.protocols.bdat-chunk-size-overflow2/weird.log
rename to testing/btest/Baseline/scripts.base.protocols.smtp.bdat-chunk-size-overflow2/weird.log
diff --git a/testing/btest/Baseline/scripts.base.protocols.bdat-negative-chunk-size/out b/testing/btest/Baseline/scripts.base.protocols.smtp.bdat-negative-chunk-size/out
similarity index 100%
rename from testing/btest/Baseline/scripts.base.protocols.bdat-negative-chunk-size/out
rename to testing/btest/Baseline/scripts.base.protocols.smtp.bdat-negative-chunk-size/out
diff --git a/testing/btest/Baseline/scripts.base.protocols.bdat-negative-chunk-size/smtp.log b/testing/btest/Baseline/scripts.base.protocols.smtp.bdat-negative-chunk-size/smtp.log
similarity index 100%
rename from testing/btest/Baseline/scripts.base.protocols.bdat-negative-chunk-size/smtp.log
rename to testing/btest/Baseline/scripts.base.protocols.smtp.bdat-negative-chunk-size/smtp.log
diff --git a/testing/btest/Baseline/scripts.base.protocols.bdat-negative-chunk-size/weird.log b/testing/btest/Baseline/scripts.base.protocols.smtp.bdat-negative-chunk-size/weird.log
similarity index 100%
rename from testing/btest/Baseline/scripts.base.protocols.bdat-negative-chunk-size/weird.log
rename to testing/btest/Baseline/scripts.base.protocols.smtp.bdat-negative-chunk-size/weird.log
diff --git a/testing/btest/scripts/base/protocols/bdat-chunk-size-overflow.test b/testing/btest/scripts/base/protocols/smtp/bdat-chunk-size-overflow.test
similarity index 100%
rename from testing/btest/scripts/base/protocols/bdat-chunk-size-overflow.test
rename to testing/btest/scripts/base/protocols/smtp/bdat-chunk-size-overflow.test
diff --git a/testing/btest/scripts/base/protocols/bdat-chunk-size-overflow2.test b/testing/btest/scripts/base/protocols/smtp/bdat-chunk-size-overflow2.test
similarity index 100%
rename from testing/btest/scripts/base/protocols/bdat-chunk-size-overflow2.test
rename to testing/btest/scripts/base/protocols/smtp/bdat-chunk-size-overflow2.test
diff --git a/testing/btest/scripts/base/protocols/bdat-negative-chunk-size.test b/testing/btest/scripts/base/protocols/smtp/bdat-negative-chunk-size.test
similarity index 100%
rename from testing/btest/scripts/base/protocols/bdat-negative-chunk-size.test
rename to testing/btest/scripts/base/protocols/smtp/bdat-negative-chunk-size.test