58 files changed, 57 insertions, 57 deletions

diff --git a/sound/direct_sound_data.inc b/sound/direct_sound_data.inc
index d4c39b2f8..9d8f713e0 100644
--- a/sound/direct_sound_data.inc
+++ b/sound/direct_sound_data.inc
@@ -240,27 +240,27 @@ DirectSoundWaveData_84A5F58:: @ 84A5F58
 
 	.align 2
 DirectSoundWaveData_84A7328:: @ 84A7328
-	.incbin "sound/direct_sound_samples/84A7328.bin"
+	.incbin "sound/direct_sound_samples/phonemes/84A7328.bin"
 
 	.align 2
 DirectSoundWaveData_84A7F38:: @ 84A7F38
-	.incbin "sound/direct_sound_samples/84A7F38.bin"
+	.incbin "sound/direct_sound_samples/phonemes/84A7F38.bin"
 
 	.align 2
 DirectSoundWaveData_84A8AC8:: @ 84A8AC8
-	.incbin "sound/direct_sound_samples/84A8AC8.bin"
+	.incbin "sound/direct_sound_samples/phonemes/84A8AC8.bin"
 
 	.align 2
 DirectSoundWaveData_84A9564:: @ 84A9564
-	.incbin "sound/direct_sound_samples/84A9564.bin"
+	.incbin "sound/direct_sound_samples/phonemes/84A9564.bin"
 
 	.align 2
 DirectSoundWaveData_84A9EAC:: @ 84A9EAC
-	.incbin "sound/direct_sound_samples/84A9EAC.bin"
+	.incbin "sound/direct_sound_samples/phonemes/84A9EAC.bin"
 
 	.align 2
 DirectSoundWaveData_84AA8F4:: @ 84AA8F4
-	.incbin "sound/direct_sound_samples/84AA8F4.bin"
+	.incbin "sound/direct_sound_samples/phonemes/84AA8F4.bin"
 
 	.align 2
 Cry_Bulbasaur:: @ 84AB57C
@@ -1816,207 +1816,207 @@ Cry_Chimecho:: @ 8638E88
 
 	.align 2
 DirectSoundWaveData_8639898:: @ 8639898
-	.incbin "sound/direct_sound_samples/8639898.bin"
+	.incbin "sound/direct_sound_samples/phonemes/8639898.bin"
 
 	.align 2
 DirectSoundWaveData_8639EF8:: @ 8639EF8
-	.incbin "sound/direct_sound_samples/8639EF8.bin"
+	.incbin "sound/direct_sound_samples/phonemes/8639EF8.bin"
 
 	.align 2
 DirectSoundWaveData_863A3DC:: @ 863A3DC
-	.incbin "sound/direct_sound_samples/863A3DC.bin"
+	.incbin "sound/direct_sound_samples/phonemes/863A3DC.bin"
 
 	.align 2
 DirectSoundWaveData_863AD2C:: @ 863AD2C
-	.incbin "sound/direct_sound_samples/863AD2C.bin"
+	.incbin "sound/direct_sound_samples/phonemes/863AD2C.bin"
 
 	.align 2
 DirectSoundWaveData_863B79C:: @ 863B79C
-	.incbin "sound/direct_sound_samples/863B79C.bin"
+	.incbin "sound/direct_sound_samples/phonemes/863B79C.bin"
 
 	.align 2
 DirectSoundWaveData_863BABC:: @ 863BABC
-	.incbin "sound/direct_sound_samples/863BABC.bin"
+	.incbin "sound/direct_sound_samples/phonemes/863BABC.bin"
 
 	.align 2
 DirectSoundWaveData_863C744:: @ 863C744
-	.incbin "sound/direct_sound_samples/863C744.bin"
+	.incbin "sound/direct_sound_samples/phonemes/863C744.bin"
 
 	.align 2
 DirectSoundWaveData_863CD64:: @ 863CD64
-	.incbin "sound/direct_sound_samples/863CD64.bin"
+	.incbin "sound/direct_sound_samples/phonemes/863CD64.bin"
 
 	.align 2
 DirectSoundWaveData_863D0EC:: @ 863D0EC
-	.incbin "sound/direct_sound_samples/863D0EC.bin"
+	.incbin "sound/direct_sound_samples/phonemes/863D0EC.bin"
 
 	.align 2
 DirectSoundWaveData_863DED0:: @ 863DED0
-	.incbin "sound/direct_sound_samples/863DED0.bin"
+	.incbin "sound/direct_sound_samples/phonemes/863DED0.bin"
 
 	.align 2
 DirectSoundWaveData_863E840:: @ 863E840
-	.incbin "sound/direct_sound_samples/863E840.bin"
+	.incbin "sound/direct_sound_samples/phonemes/863E840.bin"
 
 	.align 2
 DirectSoundWaveData_863EBDC:: @ 863EBDC
-	.incbin "sound/direct_sound_samples/863EBDC.bin"
+	.incbin "sound/direct_sound_samples/phonemes/863EBDC.bin"
 
 	.align 2
 DirectSoundWaveData_863F390:: @ 863F390
-	.incbin "sound/direct_sound_samples/863F390.bin"
+	.incbin "sound/direct_sound_samples/phonemes/863F390.bin"
 
 	.align 2
 DirectSoundWaveData_86400EC:: @ 86400EC
-	.incbin "sound/direct_sound_samples/86400EC.bin"
+	.incbin "sound/direct_sound_samples/phonemes/86400EC.bin"
 
 	.align 2
 DirectSoundWaveData_8640330:: @ 8640330
-	.incbin "sound/direct_sound_samples/8640330.bin"
+	.incbin "sound/direct_sound_samples/phonemes/8640330.bin"
 
 	.align 2
 DirectSoundWaveData_8641170:: @ 8641170
-	.incbin "sound/direct_sound_samples/8641170.bin"
+	.incbin "sound/direct_sound_samples/phonemes/8641170.bin"
 
 	.align 2
 DirectSoundWaveData_8641AC4:: @ 8641AC4
-	.incbin "sound/direct_sound_samples/8641AC4.bin"
+	.incbin "sound/direct_sound_samples/phonemes/8641AC4.bin"
 
 	.align 2
 DirectSoundWaveData_8641E18:: @ 8641E18
-	.incbin "sound/direct_sound_samples/8641E18.bin"
+	.incbin "sound/direct_sound_samples/phonemes/8641E18.bin"
 
 	.align 2
 DirectSoundWaveData_864244C:: @ 864244C
-	.incbin "sound/direct_sound_samples/864244C.bin"
+	.incbin "sound/direct_sound_samples/phonemes/864244C.bin"
 
 	.align 2
 DirectSoundWaveData_86430B8:: @ 86430B8
-	.incbin "sound/direct_sound_samples/86430B8.bin"
+	.incbin "sound/direct_sound_samples/phonemes/86430B8.bin"
 
 	.align 2
 DirectSoundWaveData_8643650:: @ 8643650
-	.incbin "sound/direct_sound_samples/8643650.bin"
+	.incbin "sound/direct_sound_samples/phonemes/8643650.bin"
 
 	.align 2
 DirectSoundWaveData_8644154:: @ 8644154
-	.incbin "sound/direct_sound_samples/8644154.bin"
+	.incbin "sound/direct_sound_samples/phonemes/8644154.bin"
 
 	.align 2
 DirectSoundWaveData_8644758:: @ 8644758
-	.incbin "sound/direct_sound_samples/8644758.bin"
+	.incbin "sound/direct_sound_samples/phonemes/8644758.bin"
 
 	.align 2
 DirectSoundWaveData_8644950:: @ 8644950
-	.incbin "sound/direct_sound_samples/8644950.bin"
+	.incbin "sound/direct_sound_samples/phonemes/8644950.bin"
 
 	.align 2
 DirectSoundWaveData_86452B4:: @ 86452B4
-	.incbin "sound/direct_sound_samples/86452B4.bin"
+	.incbin "sound/direct_sound_samples/phonemes/86452B4.bin"
 
 	.align 2
 DirectSoundWaveData_8646240:: @ 8646240
-	.incbin "sound/direct_sound_samples/8646240.bin"
+	.incbin "sound/direct_sound_samples/phonemes/8646240.bin"
 
 	.align 2
 DirectSoundWaveData_8646878:: @ 8646878
-	.incbin "sound/direct_sound_samples/8646878.bin"
+	.incbin "sound/direct_sound_samples/phonemes/8646878.bin"
 
 	.align 2
 DirectSoundWaveData_864734C:: @ 864734C
-	.incbin "sound/direct_sound_samples/864734C.bin"
+	.incbin "sound/direct_sound_samples/phonemes/864734C.bin"
 
 	.align 2
 DirectSoundWaveData_8648290:: @ 8648290
-	.incbin "sound/direct_sound_samples/8648290.bin"
+	.incbin "sound/direct_sound_samples/phonemes/8648290.bin"
 
 	.align 2
 DirectSoundWaveData_8648808:: @ 8648808
-	.incbin "sound/direct_sound_samples/8648808.bin"
+	.incbin "sound/direct_sound_samples/phonemes/8648808.bin"
 
 	.align 2
 DirectSoundWaveData_8649654:: @ 8649654
-	.incbin "sound/direct_sound_samples/8649654.bin"
+	.incbin "sound/direct_sound_samples/phonemes/8649654.bin"
 
 	.align 2
 DirectSoundWaveData_864A55C:: @ 864A55C
-	.incbin "sound/direct_sound_samples/864A55C.bin"
+	.incbin "sound/direct_sound_samples/phonemes/864A55C.bin"
 
 	.align 2
 DirectSoundWaveData_864B030:: @ 864B030
-	.incbin "sound/direct_sound_samples/864B030.bin"
+	.incbin "sound/direct_sound_samples/phonemes/864B030.bin"
 
 	.align 2
 DirectSoundWaveData_864BBC4:: @ 864BBC4
-	.incbin "sound/direct_sound_samples/864BBC4.bin"
+	.incbin "sound/direct_sound_samples/phonemes/864BBC4.bin"
 
 	.align 2
 DirectSoundWaveData_864C59C:: @ 864C59C
-	.incbin "sound/direct_sound_samples/864C59C.bin"
+	.incbin "sound/direct_sound_samples/phonemes/864C59C.bin"
 
 	.align 2
 DirectSoundWaveData_864CBDC:: @ 864CBDC
-	.incbin "sound/direct_sound_samples/864CBDC.bin"
+	.incbin "sound/direct_sound_samples/phonemes/864CBDC.bin"
 
 	.align 2
 DirectSoundWaveData_864D6BC:: @ 864D6BC
-	.incbin "sound/direct_sound_samples/864D6BC.bin"
+	.incbin "sound/direct_sound_samples/phonemes/864D6BC.bin"
 
 	.align 2
 DirectSoundWaveData_864DCF8:: @ 864DCF8
-	.incbin "sound/direct_sound_samples/864DCF8.bin"
+	.incbin "sound/direct_sound_samples/phonemes/864DCF8.bin"
 
 	.align 2
 DirectSoundWaveData_864E410:: @ 864E410
-	.incbin "sound/direct_sound_samples/864E410.bin"
+	.incbin "sound/direct_sound_samples/phonemes/864E410.bin"
 
 	.align 2
 DirectSoundWaveData_864ED4C:: @ 864ED4C
-	.incbin "sound/direct_sound_samples/864ED4C.bin"
+	.incbin "sound/direct_sound_samples/phonemes/864ED4C.bin"
 
 	.align 2
 DirectSoundWaveData_864F508:: @ 864F508
-	.incbin "sound/direct_sound_samples/864F508.bin"
+	.incbin "sound/direct_sound_samples/phonemes/864F508.bin"
 
 	.align 2
 DirectSoundWaveData_864FA6C:: @ 864FA6C
-	.incbin "sound/direct_sound_samples/864FA6C.bin"
+	.incbin "sound/direct_sound_samples/phonemes/864FA6C.bin"
 
 	.align 2
 DirectSoundWaveData_86507E0:: @ 86507E0
-	.incbin "sound/direct_sound_samples/86507E0.bin"
+	.incbin "sound/direct_sound_samples/phonemes/86507E0.bin"
 
 	.align 2
 DirectSoundWaveData_8650C5C:: @ 8650C5C
-	.incbin "sound/direct_sound_samples/8650C5C.bin"
+	.incbin "sound/direct_sound_samples/phonemes/8650C5C.bin"
 
 	.align 2
 DirectSoundWaveData_8651148:: @ 8651148
-	.incbin "sound/direct_sound_samples/8651148.bin"
+	.incbin "sound/direct_sound_samples/phonemes/8651148.bin"
 
 	.align 2
 DirectSoundWaveData_8651910:: @ 8651910
-	.incbin "sound/direct_sound_samples/8651910.bin"
+	.incbin "sound/direct_sound_samples/phonemes/8651910.bin"
 
 	.align 2
 DirectSoundWaveData_865250C:: @ 865250C
-	.incbin "sound/direct_sound_samples/865250C.bin"
+	.incbin "sound/direct_sound_samples/phonemes/865250C.bin"
 
 	.align 2
 DirectSoundWaveData_8652884:: @ 8652884
-	.incbin "sound/direct_sound_samples/8652884.bin"
+	.incbin "sound/direct_sound_samples/phonemes/8652884.bin"
 
 	.align 2
 DirectSoundWaveData_8653040:: @ 8653040
-	.incbin "sound/direct_sound_samples/8653040.bin"
+	.incbin "sound/direct_sound_samples/phonemes/8653040.bin"
 
 	.align 2
 DirectSoundWaveData_8653CA4:: @ 8653CA4
-	.incbin "sound/direct_sound_samples/8653CA4.bin"
+	.incbin "sound/direct_sound_samples/phonemes/8653CA4.bin"
 
 	.align 2
 DirectSoundWaveData_8654170:: @ 8654170
-	.incbin "sound/direct_sound_samples/8654170.bin"
+	.incbin "sound/direct_sound_samples/phonemes/8654170.bin"
 
 	.align 2
 DirectSoundWaveData_8654C20:: @ 8654C20
diff --git a/sound/direct_sound_samples/84A7328.aif b/sound/direct_sound_samples/phonemes/84A7328.aif
index 9521d0b6e..9521d0b6e 100644
--- a/sound/direct_sound_samples/84A7328.aif
+++ b/sound/direct_sound_samples/phonemes/84A7328.aif
diff --git a/sound/direct_sound_samples/84A7F38.aif b/sound/direct_sound_samples/phonemes/84A7F38.aif
index 2519572e2..2519572e2 100644
--- a/sound/direct_sound_samples/84A7F38.aif
+++ b/sound/direct_sound_samples/phonemes/84A7F38.aif
diff --git a/sound/direct_sound_samples/84A8AC8.aif b/sound/direct_sound_samples/phonemes/84A8AC8.aif
index d411e6612..d411e6612 100644
--- a/sound/direct_sound_samples/84A8AC8.aif
+++ b/sound/direct_sound_samples/phonemes/84A8AC8.aif
diff --git a/sound/direct_sound_samples/84A9564.aif b/sound/direct_sound_samples/phonemes/84A9564.aif
index 3bc1aa839..3bc1aa839 100644
--- a/sound/direct_sound_samples/84A9564.aif
+++ b/sound/direct_sound_samples/phonemes/84A9564.aif
diff --git a/sound/direct_sound_samples/84A9EAC.aif b/sound/direct_sound_samples/phonemes/84A9EAC.aif
index 3bacf3676..3bacf3676 100644
--- a/sound/direct_sound_samples/84A9EAC.aif
+++ b/sound/direct_sound_samples/phonemes/84A9EAC.aif
diff --git a/sound/direct_sound_samples/84AA8F4.aif b/sound/direct_sound_samples/phonemes/84AA8F4.aif
index 5ddaa153d..5ddaa153d 100644
--- a/sound/direct_sound_samples/84AA8F4.aif
+++ b/sound/direct_sound_samples/phonemes/84AA8F4.aif
diff --git a/sound/direct_sound_samples/8639898.aif b/sound/direct_sound_samples/phonemes/8639898.aif
index 4b15a94b7..4b15a94b7 100644
--- a/sound/direct_sound_samples/8639898.aif
+++ b/sound/direct_sound_samples/phonemes/8639898.aif
diff --git a/sound/direct_sound_samples/8639EF8.aif b/sound/direct_sound_samples/phonemes/8639EF8.aif
index 74c129073..74c129073 100644
--- a/sound/direct_sound_samples/8639EF8.aif
+++ b/sound/direct_sound_samples/phonemes/8639EF8.aif
diff --git a/sound/direct_sound_samples/863A3DC.aif b/sound/direct_sound_samples/phonemes/863A3DC.aif
index 359972c16..359972c16 100644
--- a/sound/direct_sound_samples/863A3DC.aif
+++ b/sound/direct_sound_samples/phonemes/863A3DC.aif
diff --git a/sound/direct_sound_samples/863AD2C.aif b/sound/direct_sound_samples/phonemes/863AD2C.aif
index 3b136fa43..3b136fa43 100644
--- a/sound/direct_sound_samples/863AD2C.aif
+++ b/sound/direct_sound_samples/phonemes/863AD2C.aif
diff --git a/sound/direct_sound_samples/863B79C.aif b/sound/direct_sound_samples/phonemes/863B79C.aif
index fd72512cf..fd72512cf 100644
--- a/sound/direct_sound_samples/863B79C.aif
+++ b/sound/direct_sound_samples/phonemes/863B79C.aif
diff --git a/sound/direct_sound_samples/863BABC.aif b/sound/direct_sound_samples/phonemes/863BABC.aif
index 6f7794bec..6f7794bec 100644
--- a/sound/direct_sound_samples/863BABC.aif
+++ b/sound/direct_sound_samples/phonemes/863BABC.aif
diff --git a/sound/direct_sound_samples/863C744.aif b/sound/direct_sound_samples/phonemes/863C744.aif
index 89b845f21..89b845f21 100644
--- a/sound/direct_sound_samples/863C744.aif
+++ b/sound/direct_sound_samples/phonemes/863C744.aif
diff --git a/sound/direct_sound_samples/863CD64.aif b/sound/direct_sound_samples/phonemes/863CD64.aif
index 1d99a3a93..1d99a3a93 100644
--- a/sound/direct_sound_samples/863CD64.aif
+++ b/sound/direct_sound_samples/phonemes/863CD64.aif
diff --git a/sound/direct_sound_samples/863D0EC.aif b/sound/direct_sound_samples/phonemes/863D0EC.aif
index 883398129..883398129 100644
--- a/sound/direct_sound_samples/863D0EC.aif
+++ b/sound/direct_sound_samples/phonemes/863D0EC.aif
diff --git a/sound/direct_sound_samples/863DED0.aif b/sound/direct_sound_samples/phonemes/863DED0.aif
index 776815e63..776815e63 100644
--- a/sound/direct_sound_samples/863DED0.aif
+++ b/sound/direct_sound_samples/phonemes/863DED0.aif
diff --git a/sound/direct_sound_samples/863E840.aif b/sound/direct_sound_samples/phonemes/863E840.aif
index 545bd1292..545bd1292 100644
--- a/sound/direct_sound_samples/863E840.aif
+++ b/sound/direct_sound_samples/phonemes/863E840.aif
diff --git a/sound/direct_sound_samples/863EBDC.aif b/sound/direct_sound_samples/phonemes/863EBDC.aif
index c0a3be10d..c0a3be10d 100644
--- a/sound/direct_sound_samples/863EBDC.aif
+++ b/sound/direct_sound_samples/phonemes/863EBDC.aif
diff --git a/sound/direct_sound_samples/863F390.aif b/sound/direct_sound_samples/phonemes/863F390.aif
index d26ecdd6d..d26ecdd6d 100644
--- a/sound/direct_sound_samples/863F390.aif
+++ b/sound/direct_sound_samples/phonemes/863F390.aif
diff --git a/sound/direct_sound_samples/86400EC.aif b/sound/direct_sound_samples/phonemes/86400EC.aif
index 2b51201a4..2b51201a4 100644
--- a/sound/direct_sound_samples/86400EC.aif
+++ b/sound/direct_sound_samples/phonemes/86400EC.aif
diff --git a/sound/direct_sound_samples/8640330.aif b/sound/direct_sound_samples/phonemes/8640330.aif
index cf5ac4e03..cf5ac4e03 100644
--- a/sound/direct_sound_samples/8640330.aif
+++ b/sound/direct_sound_samples/phonemes/8640330.aif
diff --git a/sound/direct_sound_samples/8641170.aif b/sound/direct_sound_samples/phonemes/8641170.aif
index 606742e60..606742e60 100644
--- a/sound/direct_sound_samples/8641170.aif
+++ b/sound/direct_sound_samples/phonemes/8641170.aif
diff --git a/sound/direct_sound_samples/8641AC4.aif b/sound/direct_sound_samples/phonemes/8641AC4.aif
index 71d4987d6..71d4987d6 100644
--- a/sound/direct_sound_samples/8641AC4.aif
+++ b/sound/direct_sound_samples/phonemes/8641AC4.aif
diff --git a/sound/direct_sound_samples/8641E18.aif b/sound/direct_sound_samples/phonemes/8641E18.aif
index 070c44a37..070c44a37 100644
--- a/sound/direct_sound_samples/8641E18.aif
+++ b/sound/direct_sound_samples/phonemes/8641E18.aif
diff --git a/sound/direct_sound_samples/864244C.aif b/sound/direct_sound_samples/phonemes/864244C.aif
index b0ca84a38..b0ca84a38 100644
--- a/sound/direct_sound_samples/864244C.aif
+++ b/sound/direct_sound_samples/phonemes/864244C.aif
diff --git a/sound/direct_sound_samples/86430B8.aif b/sound/direct_sound_samples/phonemes/86430B8.aif
index f44101b23..f44101b23 100644
--- a/sound/direct_sound_samples/86430B8.aif
+++ b/sound/direct_sound_samples/phonemes/86430B8.aif
diff --git a/sound/direct_sound_samples/8643650.aif b/sound/direct_sound_samples/phonemes/8643650.aif
index a33809d42..a33809d42 100644
--- a/sound/direct_sound_samples/8643650.aif
+++ b/sound/direct_sound_samples/phonemes/8643650.aif
diff --git a/sound/direct_sound_samples/8644154.aif b/sound/direct_sound_samples/phonemes/8644154.aif
index 6a005efcc..6a005efcc 100644
--- a/sound/direct_sound_samples/8644154.aif
+++ b/sound/direct_sound_samples/phonemes/8644154.aif
diff --git a/sound/direct_sound_samples/8644758.aif b/sound/direct_sound_samples/phonemes/8644758.aif
index 62f9493fd..62f9493fd 100644
--- a/sound/direct_sound_samples/8644758.aif
+++ b/sound/direct_sound_samples/phonemes/8644758.aif
diff --git a/sound/direct_sound_samples/8644950.aif b/sound/direct_sound_samples/phonemes/8644950.aif
index 5767bd6d9..5767bd6d9 100644
--- a/sound/direct_sound_samples/8644950.aif
+++ b/sound/direct_sound_samples/phonemes/8644950.aif
diff --git a/sound/direct_sound_samples/86452B4.aif b/sound/direct_sound_samples/phonemes/86452B4.aif
index 33e328a82..33e328a82 100644
--- a/sound/direct_sound_samples/86452B4.aif
+++ b/sound/direct_sound_samples/phonemes/86452B4.aif
diff --git a/sound/direct_sound_samples/8646240.aif b/sound/direct_sound_samples/phonemes/8646240.aif
index 548e740c8..548e740c8 100644
--- a/sound/direct_sound_samples/8646240.aif
+++ b/sound/direct_sound_samples/phonemes/8646240.aif
diff --git a/sound/direct_sound_samples/8646878.aif b/sound/direct_sound_samples/phonemes/8646878.aif
index cbbe09266..cbbe09266 100644
--- a/sound/direct_sound_samples/8646878.aif
+++ b/sound/direct_sound_samples/phonemes/8646878.aif
diff --git a/sound/direct_sound_samples/864734C.aif b/sound/direct_sound_samples/phonemes/864734C.aif
index 8bdf7faaa..8bdf7faaa 100644
--- a/sound/direct_sound_samples/864734C.aif
+++ b/sound/direct_sound_samples/phonemes/864734C.aif
diff --git a/sound/direct_sound_samples/8648290.aif b/sound/direct_sound_samples/phonemes/8648290.aif
index f96f8853b..f96f8853b 100644
--- a/sound/direct_sound_samples/8648290.aif
+++ b/sound/direct_sound_samples/phonemes/8648290.aif
diff --git a/sound/direct_sound_samples/8648808.aif b/sound/direct_sound_samples/phonemes/8648808.aif
index ab9abbf79..ab9abbf79 100644
--- a/sound/direct_sound_samples/8648808.aif
+++ b/sound/direct_sound_samples/phonemes/8648808.aif
diff --git a/sound/direct_sound_samples/8649654.aif b/sound/direct_sound_samples/phonemes/8649654.aif
index 9d21d0ab4..9d21d0ab4 100644
--- a/sound/direct_sound_samples/8649654.aif
+++ b/sound/direct_sound_samples/phonemes/8649654.aif
diff --git a/sound/direct_sound_samples/864A55C.aif b/sound/direct_sound_samples/phonemes/864A55C.aif
index c037ed4af..c037ed4af 100644
--- a/sound/direct_sound_samples/864A55C.aif
+++ b/sound/direct_sound_samples/phonemes/864A55C.aif
diff --git a/sound/direct_sound_samples/864B030.aif b/sound/direct_sound_samples/phonemes/864B030.aif
index ac1f8b66f..ac1f8b66f 100644
--- a/sound/direct_sound_samples/864B030.aif
+++ b/sound/direct_sound_samples/phonemes/864B030.aif
diff --git a/sound/direct_sound_samples/864BBC4.aif b/sound/direct_sound_samples/phonemes/864BBC4.aif
index 1fd9111c8..1fd9111c8 100644
--- a/sound/direct_sound_samples/864BBC4.aif
+++ b/sound/direct_sound_samples/phonemes/864BBC4.aif
diff --git a/sound/direct_sound_samples/864C59C.aif b/sound/direct_sound_samples/phonemes/864C59C.aif
index 5d6ae2282..5d6ae2282 100644
--- a/sound/direct_sound_samples/864C59C.aif
+++ b/sound/direct_sound_samples/phonemes/864C59C.aif
diff --git a/sound/direct_sound_samples/864CBDC.aif b/sound/direct_sound_samples/phonemes/864CBDC.aif
index f26700690..f26700690 100644
--- a/sound/direct_sound_samples/864CBDC.aif
+++ b/sound/direct_sound_samples/phonemes/864CBDC.aif
diff --git a/sound/direct_sound_samples/864D6BC.aif b/sound/direct_sound_samples/phonemes/864D6BC.aif
index 3ba97a9fc..3ba97a9fc 100644
--- a/sound/direct_sound_samples/864D6BC.aif
+++ b/sound/direct_sound_samples/phonemes/864D6BC.aif
diff --git a/sound/direct_sound_samples/864DCF8.aif b/sound/direct_sound_samples/phonemes/864DCF8.aif
index 37f1be4b1..37f1be4b1 100644
--- a/sound/direct_sound_samples/864DCF8.aif
+++ b/sound/direct_sound_samples/phonemes/864DCF8.aif
diff --git a/sound/direct_sound_samples/864E410.aif b/sound/direct_sound_samples/phonemes/864E410.aif
index 4b3facb99..4b3facb99 100644
--- a/sound/direct_sound_samples/864E410.aif
+++ b/sound/direct_sound_samples/phonemes/864E410.aif
diff --git a/sound/direct_sound_samples/864ED4C.aif b/sound/direct_sound_samples/phonemes/864ED4C.aif
index 8a4d7653b..8a4d7653b 100644
--- a/sound/direct_sound_samples/864ED4C.aif
+++ b/sound/direct_sound_samples/phonemes/864ED4C.aif
diff --git a/sound/direct_sound_samples/864F508.aif b/sound/direct_sound_samples/phonemes/864F508.aif
index db5bae244..db5bae244 100644
--- a/sound/direct_sound_samples/864F508.aif
+++ b/sound/direct_sound_samples/phonemes/864F508.aif
diff --git a/sound/direct_sound_samples/864FA6C.aif b/sound/direct_sound_samples/phonemes/864FA6C.aif
index 6612dd54d..6612dd54d 100644
--- a/sound/direct_sound_samples/864FA6C.aif
+++ b/sound/direct_sound_samples/phonemes/864FA6C.aif
diff --git a/sound/direct_sound_samples/86507E0.aif b/sound/direct_sound_samples/phonemes/86507E0.aif
index 441eecfcd..441eecfcd 100644
--- a/sound/direct_sound_samples/86507E0.aif
+++ b/sound/direct_sound_samples/phonemes/86507E0.aif
diff --git a/sound/direct_sound_samples/8650C5C.aif b/sound/direct_sound_samples/phonemes/8650C5C.aif
index 95670cf0a..95670cf0a 100644
--- a/sound/direct_sound_samples/8650C5C.aif
+++ b/sound/direct_sound_samples/phonemes/8650C5C.aif
diff --git a/sound/direct_sound_samples/8651148.aif b/sound/direct_sound_samples/phonemes/8651148.aif
index 0fadcba8e..0fadcba8e 100644
--- a/sound/direct_sound_samples/8651148.aif
+++ b/sound/direct_sound_samples/phonemes/8651148.aif
diff --git a/sound/direct_sound_samples/8651910.aif b/sound/direct_sound_samples/phonemes/8651910.aif
index 6017c55b4..6017c55b4 100644
--- a/sound/direct_sound_samples/8651910.aif
+++ b/sound/direct_sound_samples/phonemes/8651910.aif
diff --git a/sound/direct_sound_samples/865250C.aif b/sound/direct_sound_samples/phonemes/865250C.aif
index 2327b6d65..2327b6d65 100644
--- a/sound/direct_sound_samples/865250C.aif
+++ b/sound/direct_sound_samples/phonemes/865250C.aif
diff --git a/sound/direct_sound_samples/8652884.aif b/sound/direct_sound_samples/phonemes/8652884.aif
index 19ceca0d0..19ceca0d0 100644
--- a/sound/direct_sound_samples/8652884.aif
+++ b/sound/direct_sound_samples/phonemes/8652884.aif
diff --git a/sound/direct_sound_samples/8653040.aif b/sound/direct_sound_samples/phonemes/8653040.aif
index 8438d301a..8438d301a 100644
--- a/sound/direct_sound_samples/8653040.aif
+++ b/sound/direct_sound_samples/phonemes/8653040.aif
diff --git a/sound/direct_sound_samples/8653CA4.aif b/sound/direct_sound_samples/phonemes/8653CA4.aif
index 74d4bcf4a..74d4bcf4a 100644
--- a/sound/direct_sound_samples/8653CA4.aif
+++ b/sound/direct_sound_samples/phonemes/8653CA4.aif
diff --git a/sound/direct_sound_samples/8654170.aif b/sound/direct_sound_samples/phonemes/8654170.aif
index dfef8a82b..dfef8a82b 100644
--- a/sound/direct_sound_samples/8654170.aif
+++ b/sound/direct_sound_samples/phonemes/8654170.aif