diff --git a/scenarios/incoming_peer_stir/0003_test.yml.tt2 b/disabled/incoming_peer_stir/0003_test.yml.tt2
similarity index 100%
rename from scenarios/incoming_peer_stir/0003_test.yml.tt2
rename to disabled/incoming_peer_stir/0003_test.yml.tt2
diff --git a/scenarios/incoming_peer_stir/0005_test.yml.tt2 b/disabled/incoming_peer_stir/0005_test.yml.tt2
similarity index 100%
rename from scenarios/incoming_peer_stir/0005_test.yml.tt2
rename to disabled/incoming_peer_stir/0005_test.yml.tt2
diff --git a/scenarios/incoming_peer_stir/0008_test.yml.tt2 b/disabled/incoming_peer_stir/0008_test.yml.tt2
similarity index 100%
rename from scenarios/incoming_peer_stir/0008_test.yml.tt2
rename to disabled/incoming_peer_stir/0008_test.yml.tt2
diff --git a/scenarios/incoming_peer_stir/0010_test.yml.tt2 b/disabled/incoming_peer_stir/0010_test.yml.tt2
similarity index 100%
rename from scenarios/incoming_peer_stir/0010_test.yml.tt2
rename to disabled/incoming_peer_stir/0010_test.yml.tt2
diff --git a/scenarios/incoming_peer_stir/0011_test.yml.tt2 b/disabled/incoming_peer_stir/0011_test.yml.tt2
similarity index 100%
rename from scenarios/incoming_peer_stir/0011_test.yml.tt2
rename to disabled/incoming_peer_stir/0011_test.yml.tt2
diff --git a/scenarios/incoming_peer_stir/0013_test.yml.tt2 b/disabled/incoming_peer_stir/0013_test.yml.tt2
similarity index 100%
rename from scenarios/incoming_peer_stir/0013_test.yml.tt2
rename to disabled/incoming_peer_stir/0013_test.yml.tt2
diff --git a/scenarios/incoming_peer_stir/0016_test.yml.tt2 b/disabled/incoming_peer_stir/0016_test.yml.tt2
similarity index 100%
rename from scenarios/incoming_peer_stir/0016_test.yml.tt2
rename to disabled/incoming_peer_stir/0016_test.yml.tt2
diff --git a/scenarios/incoming_peer_stir/0017_test.yml.tt2 b/disabled/incoming_peer_stir/0017_test.yml.tt2
similarity index 100%
rename from scenarios/incoming_peer_stir/0017_test.yml.tt2
rename to disabled/incoming_peer_stir/0017_test.yml.tt2
diff --git a/scenarios/incoming_peer_stir/0018_test.yml.tt2 b/disabled/incoming_peer_stir/0018_test.yml.tt2
similarity index 100%
rename from scenarios/incoming_peer_stir/0018_test.yml.tt2
rename to disabled/incoming_peer_stir/0018_test.yml.tt2
diff --git a/scenarios/incoming_peer_stir/0019_test.yml.tt2 b/disabled/incoming_peer_stir/0019_test.yml.tt2
similarity index 100%
rename from scenarios/incoming_peer_stir/0019_test.yml.tt2
rename to disabled/incoming_peer_stir/0019_test.yml.tt2
diff --git a/scenarios/incoming_peer_stir/0020_test.yml.tt2 b/disabled/incoming_peer_stir/0020_test.yml.tt2
similarity index 100%
rename from scenarios/incoming_peer_stir/0020_test.yml.tt2
rename to disabled/incoming_peer_stir/0020_test.yml.tt2
diff --git a/scenarios/incoming_peer_stir/0021_test.yml.tt2 b/disabled/incoming_peer_stir/0021_test.yml.tt2
similarity index 100%
rename from scenarios/incoming_peer_stir/0021_test.yml.tt2
rename to disabled/incoming_peer_stir/0021_test.yml.tt2
diff --git a/scenarios/incoming_peer_stir/0022_test.yml.tt2 b/disabled/incoming_peer_stir/0022_test.yml.tt2
similarity index 100%
rename from scenarios/incoming_peer_stir/0022_test.yml.tt2
rename to disabled/incoming_peer_stir/0022_test.yml.tt2
diff --git a/scenarios/incoming_peer_stir/0023_test.yml.tt2 b/disabled/incoming_peer_stir/0023_test.yml.tt2
similarity index 100%
rename from scenarios/incoming_peer_stir/0023_test.yml.tt2
rename to disabled/incoming_peer_stir/0023_test.yml.tt2
diff --git a/scenarios/incoming_peer_stir/0024_test.yml.tt2 b/disabled/incoming_peer_stir/0024_test.yml.tt2
similarity index 100%
rename from scenarios/incoming_peer_stir/0024_test.yml.tt2
rename to disabled/incoming_peer_stir/0024_test.yml.tt2
diff --git a/scenarios/incoming_peer_stir/cdr_test.yml.tt2 b/disabled/incoming_peer_stir/cdr_test.yml.tt2
similarity index 100%
rename from scenarios/incoming_peer_stir/cdr_test.yml.tt2
rename to disabled/incoming_peer_stir/cdr_test.yml.tt2
diff --git a/scenarios/incoming_peer_stir/media181sec.pcap b/disabled/incoming_peer_stir/media181sec.pcap
similarity index 100%
rename from scenarios/incoming_peer_stir/media181sec.pcap
rename to disabled/incoming_peer_stir/media181sec.pcap
diff --git a/scenarios/incoming_peer_stir/peer.yml b/disabled/incoming_peer_stir/peer.yml
similarity index 100%
rename from scenarios/incoming_peer_stir/peer.yml
rename to disabled/incoming_peer_stir/peer.yml
diff --git a/scenarios/incoming_peer_stir/prefs.json.tt2 b/disabled/incoming_peer_stir/prefs.json.tt2
similarity index 100%
rename from scenarios/incoming_peer_stir/prefs.json.tt2
rename to disabled/incoming_peer_stir/prefs.json.tt2
diff --git a/scenarios/incoming_peer_stir/scenario.yml b/disabled/incoming_peer_stir/scenario.yml
similarity index 100%
rename from scenarios/incoming_peer_stir/scenario.yml
rename to disabled/incoming_peer_stir/scenario.yml
diff --git a/scenarios/incoming_peer_stir/sipp_scenario00.xml b/disabled/incoming_peer_stir/sipp_scenario00.xml
similarity index 100%
rename from scenarios/incoming_peer_stir/sipp_scenario00.xml
rename to disabled/incoming_peer_stir/sipp_scenario00.xml
diff --git a/scenarios/incoming_peer_stir/sipp_scenario00_test.yml.tt2 b/disabled/incoming_peer_stir/sipp_scenario00_test.yml.tt2
similarity index 100%
rename from scenarios/incoming_peer_stir/sipp_scenario00_test.yml.tt2
rename to disabled/incoming_peer_stir/sipp_scenario00_test.yml.tt2
diff --git a/scenarios/incoming_peer_stir/sipp_scenario01.xml b/disabled/incoming_peer_stir/sipp_scenario01.xml
similarity index 100%
rename from scenarios/incoming_peer_stir/sipp_scenario01.xml
rename to disabled/incoming_peer_stir/sipp_scenario01.xml
diff --git a/scenarios/incoming_peer_stir/sipp_scenario01_test.yml.tt2 b/disabled/incoming_peer_stir/sipp_scenario01_test.yml.tt2
similarity index 100%
rename from scenarios/incoming_peer_stir/sipp_scenario01_test.yml.tt2
rename to disabled/incoming_peer_stir/sipp_scenario01_test.yml.tt2
diff --git a/scenarios/incoming_peer_stir/sipp_scenario02.xml b/disabled/incoming_peer_stir/sipp_scenario02.xml
similarity index 100%
rename from scenarios/incoming_peer_stir/sipp_scenario02.xml
rename to disabled/incoming_peer_stir/sipp_scenario02.xml
diff --git a/scenarios/incoming_peer_stir/sipp_scenario02_test.yml.tt2 b/disabled/incoming_peer_stir/sipp_scenario02_test.yml.tt2
similarity index 100%
rename from scenarios/incoming_peer_stir/sipp_scenario02_test.yml.tt2
rename to disabled/incoming_peer_stir/sipp_scenario02_test.yml.tt2
diff --git a/scenarios/incoming_peer_stir/sipp_scenario03.xml b/disabled/incoming_peer_stir/sipp_scenario03.xml
similarity index 100%
rename from scenarios/incoming_peer_stir/sipp_scenario03.xml
rename to disabled/incoming_peer_stir/sipp_scenario03.xml
diff --git a/scenarios/incoming_peer_stir/sipp_scenario03_test.yml.tt2 b/disabled/incoming_peer_stir/sipp_scenario03_test.yml.tt2
similarity index 100%
rename from scenarios/incoming_peer_stir/sipp_scenario03_test.yml.tt2
rename to disabled/incoming_peer_stir/sipp_scenario03_test.yml.tt2
diff --git a/scenarios/incoming_peer_stir/sipp_scenario04.xml b/disabled/incoming_peer_stir/sipp_scenario04.xml
similarity index 100%
rename from scenarios/incoming_peer_stir/sipp_scenario04.xml
rename to disabled/incoming_peer_stir/sipp_scenario04.xml
diff --git a/scenarios/incoming_peer_stir/sipp_scenario04_test.yml.tt2 b/disabled/incoming_peer_stir/sipp_scenario04_test.yml.tt2
similarity index 100%
rename from scenarios/incoming_peer_stir/sipp_scenario04_test.yml.tt2
rename to disabled/incoming_peer_stir/sipp_scenario04_test.yml.tt2
diff --git a/scenarios/incoming_peer_stir/sipp_scenario_responder00.xml b/disabled/incoming_peer_stir/sipp_scenario_responder00.xml
similarity index 100%
rename from scenarios/incoming_peer_stir/sipp_scenario_responder00.xml
rename to disabled/incoming_peer_stir/sipp_scenario_responder00.xml
diff --git a/scenarios/incoming_peer_stir/sipp_scenario_responder00_test.yml.tt2 b/disabled/incoming_peer_stir/sipp_scenario_responder00_test.yml.tt2
similarity index 100%
rename from scenarios/incoming_peer_stir/sipp_scenario_responder00_test.yml.tt2
rename to disabled/incoming_peer_stir/sipp_scenario_responder00_test.yml.tt2
diff --git a/scenarios/invite_concurrent_max_out_per_account/0001_test.yml.tt2 b/disabled/invite_concurrent_max_out_per_account/0001_test.yml.tt2
similarity index 100%
rename from scenarios/invite_concurrent_max_out_per_account/0001_test.yml.tt2
rename to disabled/invite_concurrent_max_out_per_account/0001_test.yml.tt2
diff --git a/scenarios/invite_concurrent_max_out_per_account/0003_test.yml.tt2 b/disabled/invite_concurrent_max_out_per_account/0003_test.yml.tt2
similarity index 100%
rename from scenarios/invite_concurrent_max_out_per_account/0003_test.yml.tt2
rename to disabled/invite_concurrent_max_out_per_account/0003_test.yml.tt2
diff --git a/scenarios/invite_concurrent_max_out_per_account/0005_test.yml.tt2 b/disabled/invite_concurrent_max_out_per_account/0005_test.yml.tt2
similarity index 100%
rename from scenarios/invite_concurrent_max_out_per_account/0005_test.yml.tt2
rename to disabled/invite_concurrent_max_out_per_account/0005_test.yml.tt2
diff --git a/scenarios/invite_concurrent_max_out_per_account/0008_test.yml.tt2 b/disabled/invite_concurrent_max_out_per_account/0008_test.yml.tt2
similarity index 100%
rename from scenarios/invite_concurrent_max_out_per_account/0008_test.yml.tt2
rename to disabled/invite_concurrent_max_out_per_account/0008_test.yml.tt2
diff --git a/scenarios/invite_concurrent_max_out_per_account/0010_test.yml.tt2 b/disabled/invite_concurrent_max_out_per_account/0010_test.yml.tt2
similarity index 100%
rename from scenarios/invite_concurrent_max_out_per_account/0010_test.yml.tt2
rename to disabled/invite_concurrent_max_out_per_account/0010_test.yml.tt2
diff --git a/scenarios/invite_concurrent_max_out_per_account/0013_test.yml.tt2 b/disabled/invite_concurrent_max_out_per_account/0013_test.yml.tt2
similarity index 100%
rename from scenarios/invite_concurrent_max_out_per_account/0013_test.yml.tt2
rename to disabled/invite_concurrent_max_out_per_account/0013_test.yml.tt2
diff --git a/scenarios/invite_concurrent_max_out_per_account/0018_test.yml.tt2 b/disabled/invite_concurrent_max_out_per_account/0018_test.yml.tt2
similarity index 100%
rename from scenarios/invite_concurrent_max_out_per_account/0018_test.yml.tt2
rename to disabled/invite_concurrent_max_out_per_account/0018_test.yml.tt2
diff --git a/scenarios/invite_concurrent_max_out_per_account/0021_test.yml.tt2 b/disabled/invite_concurrent_max_out_per_account/0021_test.yml.tt2
similarity index 100%
rename from scenarios/invite_concurrent_max_out_per_account/0021_test.yml.tt2
rename to disabled/invite_concurrent_max_out_per_account/0021_test.yml.tt2
diff --git a/scenarios/invite_concurrent_max_out_per_account/0023_test.yml.tt2 b/disabled/invite_concurrent_max_out_per_account/0023_test.yml.tt2
similarity index 100%
rename from scenarios/invite_concurrent_max_out_per_account/0023_test.yml.tt2
rename to disabled/invite_concurrent_max_out_per_account/0023_test.yml.tt2
diff --git a/scenarios/invite_concurrent_max_out_per_account/0025_test.yml.tt2 b/disabled/invite_concurrent_max_out_per_account/0025_test.yml.tt2
similarity index 100%
rename from scenarios/invite_concurrent_max_out_per_account/0025_test.yml.tt2
rename to disabled/invite_concurrent_max_out_per_account/0025_test.yml.tt2
diff --git a/scenarios/invite_concurrent_max_out_per_account/0028_test.yml.tt2 b/disabled/invite_concurrent_max_out_per_account/0028_test.yml.tt2
similarity index 100%
rename from scenarios/invite_concurrent_max_out_per_account/0028_test.yml.tt2
rename to disabled/invite_concurrent_max_out_per_account/0028_test.yml.tt2
diff --git a/scenarios/invite_concurrent_max_out_per_account/cdr_test.yml.tt2 b/disabled/invite_concurrent_max_out_per_account/cdr_test.yml.tt2
similarity index 100%
rename from scenarios/invite_concurrent_max_out_per_account/cdr_test.yml.tt2
rename to disabled/invite_concurrent_max_out_per_account/cdr_test.yml.tt2
diff --git a/scenarios/invite_concurrent_max_out_per_account/peer.yml b/disabled/invite_concurrent_max_out_per_account/peer.yml
similarity index 100%
rename from scenarios/invite_concurrent_max_out_per_account/peer.yml
rename to disabled/invite_concurrent_max_out_per_account/peer.yml
diff --git a/scenarios/invite_concurrent_max_out_per_account/prefs.json.tt2 b/disabled/invite_concurrent_max_out_per_account/prefs.json.tt2
similarity index 100%
rename from scenarios/invite_concurrent_max_out_per_account/prefs.json.tt2
rename to disabled/invite_concurrent_max_out_per_account/prefs.json.tt2
diff --git a/scenarios/invite_concurrent_max_out_per_account/scenario.yml b/disabled/invite_concurrent_max_out_per_account/scenario.yml
similarity index 100%
rename from scenarios/invite_concurrent_max_out_per_account/scenario.yml
rename to disabled/invite_concurrent_max_out_per_account/scenario.yml
diff --git a/scenarios/invite_concurrent_max_out_per_account/sipp_scenario00.xml b/disabled/invite_concurrent_max_out_per_account/sipp_scenario00.xml
similarity index 100%
rename from scenarios/invite_concurrent_max_out_per_account/sipp_scenario00.xml
rename to disabled/invite_concurrent_max_out_per_account/sipp_scenario00.xml
diff --git a/scenarios/invite_concurrent_max_out_per_account/sipp_scenario00_test.yml.tt2 b/disabled/invite_concurrent_max_out_per_account/sipp_scenario00_test.yml.tt2
similarity index 100%
rename from scenarios/invite_concurrent_max_out_per_account/sipp_scenario00_test.yml.tt2
rename to disabled/invite_concurrent_max_out_per_account/sipp_scenario00_test.yml.tt2
diff --git a/scenarios/invite_concurrent_max_out_per_account/sipp_scenario_responder00.xml b/disabled/invite_concurrent_max_out_per_account/sipp_scenario_responder00.xml
similarity index 100%
rename from scenarios/invite_concurrent_max_out_per_account/sipp_scenario_responder00.xml
rename to disabled/invite_concurrent_max_out_per_account/sipp_scenario_responder00.xml
diff --git a/scenarios/invite_concurrent_max_out_per_account/sipp_scenario_responder00_test.yml.tt2 b/disabled/invite_concurrent_max_out_per_account/sipp_scenario_responder00_test.yml.tt2
similarity index 100%
rename from scenarios/invite_concurrent_max_out_per_account/sipp_scenario_responder00_test.yml.tt2
rename to disabled/invite_concurrent_max_out_per_account/sipp_scenario_responder00_test.yml.tt2
diff --git a/scenarios/invite_concurrent_max_per_account/0005_test.yml.tt2 b/disabled/invite_concurrent_max_per_account/0005_test.yml.tt2
similarity index 100%
rename from scenarios/invite_concurrent_max_per_account/0005_test.yml.tt2
rename to disabled/invite_concurrent_max_per_account/0005_test.yml.tt2
diff --git a/scenarios/invite_concurrent_max_per_account/0007_test.yml.tt2 b/disabled/invite_concurrent_max_per_account/0007_test.yml.tt2
similarity index 100%
rename from scenarios/invite_concurrent_max_per_account/0007_test.yml.tt2
rename to disabled/invite_concurrent_max_per_account/0007_test.yml.tt2
diff --git a/scenarios/invite_concurrent_max_per_account/0009_test.yml.tt2 b/disabled/invite_concurrent_max_per_account/0009_test.yml.tt2
similarity index 100%
rename from scenarios/invite_concurrent_max_per_account/0009_test.yml.tt2
rename to disabled/invite_concurrent_max_per_account/0009_test.yml.tt2
diff --git a/scenarios/invite_concurrent_max_per_account/0012_test.yml.tt2 b/disabled/invite_concurrent_max_per_account/0012_test.yml.tt2
similarity index 100%
rename from scenarios/invite_concurrent_max_per_account/0012_test.yml.tt2
rename to disabled/invite_concurrent_max_per_account/0012_test.yml.tt2
diff --git a/scenarios/invite_concurrent_max_per_account/0014_test.yml.tt2 b/disabled/invite_concurrent_max_per_account/0014_test.yml.tt2
similarity index 100%
rename from scenarios/invite_concurrent_max_per_account/0014_test.yml.tt2
rename to disabled/invite_concurrent_max_per_account/0014_test.yml.tt2
diff --git a/scenarios/invite_concurrent_max_per_account/0017_test.yml.tt2 b/disabled/invite_concurrent_max_per_account/0017_test.yml.tt2
similarity index 100%
rename from scenarios/invite_concurrent_max_per_account/0017_test.yml.tt2
rename to disabled/invite_concurrent_max_per_account/0017_test.yml.tt2
diff --git a/scenarios/invite_concurrent_max_per_account/0019_test.yml.tt2 b/disabled/invite_concurrent_max_per_account/0019_test.yml.tt2
similarity index 100%
rename from scenarios/invite_concurrent_max_per_account/0019_test.yml.tt2
rename to disabled/invite_concurrent_max_per_account/0019_test.yml.tt2
diff --git a/scenarios/invite_concurrent_max_per_account/0021_test.yml.tt2 b/disabled/invite_concurrent_max_per_account/0021_test.yml.tt2
similarity index 100%
rename from scenarios/invite_concurrent_max_per_account/0021_test.yml.tt2
rename to disabled/invite_concurrent_max_per_account/0021_test.yml.tt2
diff --git a/scenarios/invite_concurrent_max_per_account/0024_test.yml.tt2 b/disabled/invite_concurrent_max_per_account/0024_test.yml.tt2
similarity index 100%
rename from scenarios/invite_concurrent_max_per_account/0024_test.yml.tt2
rename to disabled/invite_concurrent_max_per_account/0024_test.yml.tt2
diff --git a/scenarios/invite_concurrent_max_per_account/cdr_test.yml.tt2 b/disabled/invite_concurrent_max_per_account/cdr_test.yml.tt2
similarity index 100%
rename from scenarios/invite_concurrent_max_per_account/cdr_test.yml.tt2
rename to disabled/invite_concurrent_max_per_account/cdr_test.yml.tt2
diff --git a/scenarios/invite_concurrent_max_per_account/media181sec.pcap b/disabled/invite_concurrent_max_per_account/media181sec.pcap
similarity index 100%
rename from scenarios/invite_concurrent_max_per_account/media181sec.pcap
rename to disabled/invite_concurrent_max_per_account/media181sec.pcap
diff --git a/scenarios/invite_concurrent_max_per_account/prefs.json.tt2 b/disabled/invite_concurrent_max_per_account/prefs.json.tt2
similarity index 100%
rename from scenarios/invite_concurrent_max_per_account/prefs.json.tt2
rename to disabled/invite_concurrent_max_per_account/prefs.json.tt2
diff --git a/scenarios/invite_concurrent_max_per_account/scenario.yml b/disabled/invite_concurrent_max_per_account/scenario.yml
similarity index 100%
rename from scenarios/invite_concurrent_max_per_account/scenario.yml
rename to disabled/invite_concurrent_max_per_account/scenario.yml
diff --git a/scenarios/invite_concurrent_max_per_account/sipp_scenario00.xml b/disabled/invite_concurrent_max_per_account/sipp_scenario00.xml
similarity index 100%
rename from scenarios/invite_concurrent_max_per_account/sipp_scenario00.xml
rename to disabled/invite_concurrent_max_per_account/sipp_scenario00.xml
diff --git a/scenarios/invite_concurrent_max_per_account/sipp_scenario00_test.yml.tt2 b/disabled/invite_concurrent_max_per_account/sipp_scenario00_test.yml.tt2
similarity index 100%
rename from scenarios/invite_concurrent_max_per_account/sipp_scenario00_test.yml.tt2
rename to disabled/invite_concurrent_max_per_account/sipp_scenario00_test.yml.tt2
diff --git a/scenarios/invite_concurrent_max_per_account/sipp_scenario_responder00.xml b/disabled/invite_concurrent_max_per_account/sipp_scenario_responder00.xml
similarity index 100%
rename from scenarios/invite_concurrent_max_per_account/sipp_scenario_responder00.xml
rename to disabled/invite_concurrent_max_per_account/sipp_scenario_responder00.xml
diff --git a/scenarios/invite_concurrent_max_per_account/sipp_scenario_responder00_test.yml.tt2 b/disabled/invite_concurrent_max_per_account/sipp_scenario_responder00_test.yml.tt2
similarity index 100%
rename from scenarios/invite_concurrent_max_per_account/sipp_scenario_responder00_test.yml.tt2
rename to disabled/invite_concurrent_max_per_account/sipp_scenario_responder00_test.yml.tt2
diff --git a/scenarios/invite_concurrent_max_per_account/sipp_scenario_responder01.xml b/disabled/invite_concurrent_max_per_account/sipp_scenario_responder01.xml
similarity index 100%
rename from scenarios/invite_concurrent_max_per_account/sipp_scenario_responder01.xml
rename to disabled/invite_concurrent_max_per_account/sipp_scenario_responder01.xml
diff --git a/scenarios/invite_concurrent_max_per_account/sipp_scenario_responder01_test.yml.tt2 b/disabled/invite_concurrent_max_per_account/sipp_scenario_responder01_test.yml.tt2
similarity index 100%
rename from scenarios/invite_concurrent_max_per_account/sipp_scenario_responder01_test.yml.tt2
rename to disabled/invite_concurrent_max_per_account/sipp_scenario_responder01_test.yml.tt2