diff --git a/graphics/berry_blender/fr/outer.png b/graphics/berry_blender/fr/outer.png
new file mode 100644
index 0000000000..451f5d3c07
Binary files /dev/null and b/graphics/berry_blender/fr/outer.png differ
diff --git a/graphics/berry_blender/fr/start.png b/graphics/berry_blender/fr/start.png
new file mode 100644
index 0000000000..ad9d015d70
Binary files /dev/null and b/graphics/berry_blender/fr/start.png differ
diff --git a/graphics/credits/the_end_copyright_fr.bin b/graphics/credits/fr/the_end_copyright.bin
similarity index 100%
rename from graphics/credits/the_end_copyright_fr.bin
rename to graphics/credits/fr/the_end_copyright.bin
diff --git a/graphics/credits/the_end_copyright_fr.png b/graphics/credits/fr/the_end_copyright.png
similarity index 100%
rename from graphics/credits/the_end_copyright_fr.png
rename to graphics/credits/fr/the_end_copyright.png
diff --git a/src/berry_blender.c b/src/berry_blender.c
index e617015097..23b79df5db 100644
--- a/src/berry_blender.c
+++ b/src/berry_blender.c
@@ -243,9 +243,12 @@ u8 gInGameOpponentsNo;
 
 #if ENGLISH
 static const u16 sBlenderCenter_Pal[] = INCBIN_U16("graphics/berry_blender/center.gbapal");
-#endif
 static const u8 sBlenderCenter_Tilemap[] = INCBIN_U8("graphics/berry_blender/center_map.bin");
 static const u16 sBlenderOuter_Pal[] = INCBIN_U16("graphics/berry_blender/outer.gbapal");
+#elif FRENCH
+static const u8 sBlenderCenter_Tilemap[] = INCBIN_U8("graphics/berry_blender/center_map.bin");
+static const u16 sBlenderOuter_Pal[] = INCBIN_U16("graphics/berry_blender/fr/outer.gbapal");
+#endif
 
 static const u16 sUnused_Pal[] = INCBIN_U16("graphics/berry_blender/unused.gbapal");
 static const u16 sEmpty_Pal[16 * 14] = {0};
diff --git a/src/data/easy_chat/easy_chat_groups.h b/src/data/easy_chat/easy_chat_groups.h
index c79a40bf80..2e544f67a2 100755
--- a/src/data/easy_chat/easy_chat_groups.h
+++ b/src/data/easy_chat/easy_chat_groups.h
@@ -24,28 +24,28 @@
 #include "easy_chat_group_trendy_saying.h"
 #include "easy_chat_group_pokemon2.h"
 #elif FRENCH
-#include "easy_chat_group_pokemon_fr.h"
-#include "easy_chat_group_trainer_fr.h"
-#include "easy_chat_group_status_fr.h"
-#include "easy_chat_group_battle_fr.h"
-#include "easy_chat_group_greetings_fr.h"
-#include "easy_chat_group_people_fr.h"
-#include "easy_chat_group_voices_fr.h"
-#include "easy_chat_group_speech_fr.h"
-#include "easy_chat_group_endings_fr.h"
-#include "easy_chat_group_feelings_fr.h"
-#include "easy_chat_group_conditions_fr.h"
-#include "easy_chat_group_actions_fr.h"
-#include "easy_chat_group_lifestyle_fr.h"
-#include "easy_chat_group_hobbies_fr.h"
-#include "easy_chat_group_time_fr.h"
-#include "easy_chat_group_misc_fr.h"
-#include "easy_chat_group_adjectives_fr.h"
-#include "easy_chat_group_events_fr.h"
-#include "easy_chat_group_move_1_fr.h"
-#include "easy_chat_group_move_2_fr.h"
-#include "easy_chat_group_trendy_saying_fr.h"
-#include "easy_chat_group_pokemon2_fr.h"
+#include "fr/easy_chat_group_pokemon.h"
+#include "fr/easy_chat_group_trainer.h"
+#include "fr/easy_chat_group_status.h"
+#include "fr/easy_chat_group_battle.h"
+#include "fr/easy_chat_group_greetings.h"
+#include "fr/easy_chat_group_people.h"
+#include "fr/easy_chat_group_voices.h"
+#include "fr/easy_chat_group_speech.h"
+#include "fr/easy_chat_group_endings.h"
+#include "fr/easy_chat_group_feelings.h"
+#include "fr/easy_chat_group_conditions.h"
+#include "fr/easy_chat_group_actions.h"
+#include "fr/easy_chat_group_lifestyle.h"
+#include "fr/easy_chat_group_hobbies.h"
+#include "fr/easy_chat_group_time.h"
+#include "fr/easy_chat_group_misc.h"
+#include "fr/easy_chat_group_adjectives.h"
+#include "fr/easy_chat_group_events.h"
+#include "fr/easy_chat_group_move_1.h"
+#include "fr/easy_chat_group_move_2.h"
+#include "fr/easy_chat_group_trendy_saying.h"
+#include "fr/easy_chat_group_pokemon2.h"
 #endif
 
 const struct EasyChatGroup gEasyChatGroups[] = {
diff --git a/src/data/easy_chat/easy_chat_group_actions_fr.h b/src/data/easy_chat/fr/easy_chat_group_actions.h
similarity index 100%
rename from src/data/easy_chat/easy_chat_group_actions_fr.h
rename to src/data/easy_chat/fr/easy_chat_group_actions.h
diff --git a/src/data/easy_chat/easy_chat_group_adjectives_fr.h b/src/data/easy_chat/fr/easy_chat_group_adjectives.h
similarity index 100%
rename from src/data/easy_chat/easy_chat_group_adjectives_fr.h
rename to src/data/easy_chat/fr/easy_chat_group_adjectives.h
diff --git a/src/data/easy_chat/easy_chat_group_battle_fr.h b/src/data/easy_chat/fr/easy_chat_group_battle.h
similarity index 100%
rename from src/data/easy_chat/easy_chat_group_battle_fr.h
rename to src/data/easy_chat/fr/easy_chat_group_battle.h
diff --git a/src/data/easy_chat/easy_chat_group_conditions_fr.h b/src/data/easy_chat/fr/easy_chat_group_conditions.h
similarity index 100%
rename from src/data/easy_chat/easy_chat_group_conditions_fr.h
rename to src/data/easy_chat/fr/easy_chat_group_conditions.h
diff --git a/src/data/easy_chat/easy_chat_group_endings_fr.h b/src/data/easy_chat/fr/easy_chat_group_endings.h
similarity index 100%
rename from src/data/easy_chat/easy_chat_group_endings_fr.h
rename to src/data/easy_chat/fr/easy_chat_group_endings.h
diff --git a/src/data/easy_chat/easy_chat_group_events_fr.h b/src/data/easy_chat/fr/easy_chat_group_events.h
similarity index 100%
rename from src/data/easy_chat/easy_chat_group_events_fr.h
rename to src/data/easy_chat/fr/easy_chat_group_events.h
diff --git a/src/data/easy_chat/easy_chat_group_feelings_fr.h b/src/data/easy_chat/fr/easy_chat_group_feelings.h
similarity index 100%
rename from src/data/easy_chat/easy_chat_group_feelings_fr.h
rename to src/data/easy_chat/fr/easy_chat_group_feelings.h
diff --git a/src/data/easy_chat/easy_chat_group_greetings_fr.h b/src/data/easy_chat/fr/easy_chat_group_greetings.h
similarity index 100%
rename from src/data/easy_chat/easy_chat_group_greetings_fr.h
rename to src/data/easy_chat/fr/easy_chat_group_greetings.h
diff --git a/src/data/easy_chat/easy_chat_group_hobbies_fr.h b/src/data/easy_chat/fr/easy_chat_group_hobbies.h
similarity index 100%
rename from src/data/easy_chat/easy_chat_group_hobbies_fr.h
rename to src/data/easy_chat/fr/easy_chat_group_hobbies.h
diff --git a/src/data/easy_chat/easy_chat_group_lifestyle_fr.h b/src/data/easy_chat/fr/easy_chat_group_lifestyle.h
similarity index 100%
rename from src/data/easy_chat/easy_chat_group_lifestyle_fr.h
rename to src/data/easy_chat/fr/easy_chat_group_lifestyle.h
diff --git a/src/data/easy_chat/easy_chat_group_misc_fr.h b/src/data/easy_chat/fr/easy_chat_group_misc.h
similarity index 100%
rename from src/data/easy_chat/easy_chat_group_misc_fr.h
rename to src/data/easy_chat/fr/easy_chat_group_misc.h
diff --git a/src/data/easy_chat/easy_chat_group_move_1_fr.h b/src/data/easy_chat/fr/easy_chat_group_move_1.h
similarity index 100%
rename from src/data/easy_chat/easy_chat_group_move_1_fr.h
rename to src/data/easy_chat/fr/easy_chat_group_move_1.h
diff --git a/src/data/easy_chat/easy_chat_group_move_2_fr.h b/src/data/easy_chat/fr/easy_chat_group_move_2.h
similarity index 100%
rename from src/data/easy_chat/easy_chat_group_move_2_fr.h
rename to src/data/easy_chat/fr/easy_chat_group_move_2.h
diff --git a/src/data/easy_chat/easy_chat_group_people_fr.h b/src/data/easy_chat/fr/easy_chat_group_people.h
similarity index 100%
rename from src/data/easy_chat/easy_chat_group_people_fr.h
rename to src/data/easy_chat/fr/easy_chat_group_people.h
diff --git a/src/data/easy_chat/easy_chat_group_pokemon_fr.h b/src/data/easy_chat/fr/easy_chat_group_pokemon.h
similarity index 100%
rename from src/data/easy_chat/easy_chat_group_pokemon_fr.h
rename to src/data/easy_chat/fr/easy_chat_group_pokemon.h
diff --git a/src/data/easy_chat/easy_chat_group_pokemon2_fr.h b/src/data/easy_chat/fr/easy_chat_group_pokemon2.h
similarity index 100%
rename from src/data/easy_chat/easy_chat_group_pokemon2_fr.h
rename to src/data/easy_chat/fr/easy_chat_group_pokemon2.h
diff --git a/src/data/easy_chat/easy_chat_group_speech_fr.h b/src/data/easy_chat/fr/easy_chat_group_speech.h
similarity index 100%
rename from src/data/easy_chat/easy_chat_group_speech_fr.h
rename to src/data/easy_chat/fr/easy_chat_group_speech.h
diff --git a/src/data/easy_chat/easy_chat_group_status_fr.h b/src/data/easy_chat/fr/easy_chat_group_status.h
similarity index 100%
rename from src/data/easy_chat/easy_chat_group_status_fr.h
rename to src/data/easy_chat/fr/easy_chat_group_status.h
diff --git a/src/data/easy_chat/easy_chat_group_time_fr.h b/src/data/easy_chat/fr/easy_chat_group_time.h
similarity index 100%
rename from src/data/easy_chat/easy_chat_group_time_fr.h
rename to src/data/easy_chat/fr/easy_chat_group_time.h
diff --git a/src/data/easy_chat/easy_chat_group_trainer_fr.h b/src/data/easy_chat/fr/easy_chat_group_trainer.h
similarity index 100%
rename from src/data/easy_chat/easy_chat_group_trainer_fr.h
rename to src/data/easy_chat/fr/easy_chat_group_trainer.h
diff --git a/src/data/easy_chat/easy_chat_group_trendy_saying_fr.h b/src/data/easy_chat/fr/easy_chat_group_trendy_saying.h
similarity index 100%
rename from src/data/easy_chat/easy_chat_group_trendy_saying_fr.h
rename to src/data/easy_chat/fr/easy_chat_group_trendy_saying.h
diff --git a/src/data/easy_chat/easy_chat_group_voices_fr.h b/src/data/easy_chat/fr/easy_chat_group_voices.h
similarity index 100%
rename from src/data/easy_chat/easy_chat_group_voices_fr.h
rename to src/data/easy_chat/fr/easy_chat_group_voices.h
diff --git a/src/data/easy_chat/easy_chat_words_by_letter_fr.h b/src/data/easy_chat/fr/easy_chat_words_by_letter.h
similarity index 100%
rename from src/data/easy_chat/easy_chat_words_by_letter_fr.h
rename to src/data/easy_chat/fr/easy_chat_words_by_letter.h
diff --git a/src/easy_chat.c b/src/easy_chat.c
index 7be1dc42f0..82462a8080 100644
--- a/src/easy_chat.c
+++ b/src/easy_chat.c
@@ -1218,7 +1218,7 @@ static const u8 *const sFooterTextOptions[NUM_FOOTER_TYPES][4] = {
 #if ENGLISH
 #include "data/easy_chat/easy_chat_words_by_letter.h"
 #elif FRENCH
-#include "data/easy_chat/easy_chat_words_by_letter_fr.h"
+#include "data/easy_chat/fr/easy_chat_words_by_letter.h"
 #endif
 
 static const u8 *const sEasyChatGroupNamePointers[EC_NUM_GROUPS] = {
diff --git a/src/graphics.c b/src/graphics.c
index 877805c1e8..048aafd591 100644
--- a/src/graphics.c
+++ b/src/graphics.c
@@ -1343,7 +1343,11 @@ const u8 gBerryBlenderScoreSymbols_Gfx[] = INCBIN_U8("graphics/berry_blender/sco
 const u8 gBerryBlenderParticles_Gfx[] = INCBIN_U8("graphics/berry_blender/particles.4bpp");
 static const u8 sEmpty0[0x120] = {0};
 const u8 gBerryBlenderCountdownNumbers_Gfx[] = INCBIN_U8("graphics/berry_blender/countdown_numbers.4bpp");
+#if ENGLISH
 const u8 gBerryBlenderStart_Gfx[] = INCBIN_U8("graphics/berry_blender/start.4bpp");
+#elif FRENCH
+const u8 gBerryBlenderStart_Gfx[] = INCBIN_U8("graphics/berry_blender/fr/start.4bpp");
+#endif
 static const u8 sEmpty1[0x200] = {0};
 const u8 gBerryBlenderPlayerArrow_Gfx[] = INCBIN_U8("graphics/berry_blender/arrow.4bpp");
 static const u8 sEmpty2[0x2C0] = {0};
@@ -1531,8 +1535,8 @@ const u32 gBerryCrush_TextWindows_Tilemap[] = INCBIN_U32("graphics/berry_crush/t
 // Moved from other files in the french version.
 
 // credits
-const u32 gCreditsCopyrightEnd_Gfx[] = INCBIN_U32("graphics/credits/the_end_copyright_fr.4bpp.lz");
-const u32 gCreditsCopyrightEnd_Tilemap[] = INCBIN_U32("graphics/credits/the_end_copyright_fr.bin.lz");
+const u32 gCreditsCopyrightEnd_Gfx[] = INCBIN_U32("graphics/credits/fr/the_end_copyright.4bpp.lz");
+const u32 gCreditsCopyrightEnd_Tilemap[] = INCBIN_U32("graphics/credits/fr/the_end_copyright.bin.lz");
 
 const u16 g321Start_Pal[] = INCBIN_U16("graphics/link/321start.gbapal");
 const u32 g321Start_Gfx[] = INCBIN_U32("graphics/link/321start.4bpp.lz");