1 files changed, 63 insertions, 63 deletions
diff --git a/util/travis/clang-format-whitelist.txt b/util/travis/clang-format-whitelist.txt
index f86d7ecb3..3ff4142b6 100644
--- a/util/travis/clang-format-whitelist.txt
+++ b/util/travis/clang-format-whitelist.txt
@@ -2,8 +2,8 @@ src/activeobject.h
 src/ban.cpp
 src/camera.cpp
 src/camera.h
-src/cavegen.cpp
-src/cavegen.h
+src/mapgen/cavegen.cpp
+src/mapgen/cavegen.h
 src/chat.cpp
 src/chat.h
 src/chat_interface.h
@@ -51,21 +51,21 @@ src/convert_json.cpp
 src/convert_json.h
 src/craftdef.cpp
 src/craftdef.h
-src/database.cpp
-src/database-dummy.cpp
-src/database-files.cpp
-src/database-leveldb.cpp
-src/database-postgresql.cpp
-src/database-postgresql.h
-src/database-redis.cpp
-src/database-sqlite3.cpp
-src/database-sqlite3.h
+src/database/database.cpp
+src/database/database-dummy.cpp
+src/database/database-files.cpp
+src/database/database-leveldb.cpp
+src/database/database-postgresql.cpp
+src/database/database-postgresql.h
+src/database/database-redis.cpp
+src/database/database-sqlite3.cpp
+src/database/database-sqlite3.h
 src/daynightratio.h
 src/debug.cpp
 src/debug.h
 src/defaultsettings.cpp
-src/dungeongen.cpp
-src/dungeongen.h
+src/mapgen/dungeongen.cpp
+src/mapgen/dungeongen.h
 src/emerge.cpp
 src/emerge.h
 src/environment.cpp
@@ -86,32 +86,32 @@ src/genericobject.cpp
 src/genericobject.h
 src/gettext.cpp
 src/gettext.h
-src/guiChatConsole.cpp
-src/guiChatConsole.h
-src/guiEditBoxWithScrollbar.cpp
-src/guiEditBoxWithScrollbar.h
-src/guiEngine.cpp
-src/guiEngine.h
-src/guiPathSelectMenu.cpp
-src/guiPathSelectMenu.h
-src/guiFormSpecMenu.cpp
-src/guiFormSpecMenu.h
-src/guiKeyChangeMenu.cpp
-src/guiMainMenu.h
-src/guiPasswordChange.cpp
+src/gui/guiChatConsole.cpp
+src/gui/guiChatConsole.h
+src/gui/guiEditBoxWithScrollbar.cpp
+src/gui/guiEditBoxWithScrollbar.h
+src/gui/guiEngine.cpp
+src/gui/guiEngine.h
+src/gui/guiPathSelectMenu.cpp
+src/gui/guiPathSelectMenu.h
+src/gui/guiFormSpecMenu.cpp
+src/gui/guiFormSpecMenu.h
+src/gui/guiKeyChangeMenu.cpp
+src/gui/guiMainMenu.h
+src/gui/guiPasswordChange.cpp
 src/guiscalingfilter.cpp
 src/guiscalingfilter.h
-src/guiTable.cpp
-src/guiTable.h
-src/guiVolumeChange.cpp
-src/guiVolumeChange.h
+src/gui/guiTable.cpp
+src/gui/guiTable.h
+src/gui/guiVolumeChange.cpp
+src/gui/guiVolumeChange.h
 src/httpfetch.cpp
 src/hud.cpp
 src/hud.h
 src/imagefilters.cpp
 src/imagefilters.h
-src/intlGUIEditBox.cpp
-src/intlGUIEditBox.h
+src/gui/intlGUIEditBox.cpp
+src/gui/intlGUIEditBox.h
 src/inventory.cpp
 src/inventory.h
 src/inventorymanager.cpp
@@ -131,31 +131,31 @@ src/localplayer.cpp
 src/log.cpp
 src/log.h
 src/main.cpp
-src/mainmenumanager.h
+src/gui/mainmenumanager.h
 src/mapblock.cpp
 src/mapblock.h
 src/mapblock_mesh.cpp
 src/mapblock_mesh.h
 src/map.cpp
 src/map.h
-src/mapgen.cpp
-src/mapgen.h
-src/mapgen_carpathian.cpp
-src/mapgen_carpathian.h
-src/mapgen_flat.cpp
-src/mapgen_flat.h
-src/mapgen_fractal.cpp
-src/mapgen_fractal.h
-src/mapgen_singlenode.cpp
-src/mapgen_singlenode.h
-src/mapgen_v5.cpp
-src/mapgen_v5.h
-src/mapgen_v6.cpp
-src/mapgen_v6.h
-src/mapgen_v7.cpp
-src/mapgen_v7.h
-src/mapgen_valleys.cpp
-src/mapgen_valleys.h
+src/mapgen/mapgen.cpp
+src/mapgen/mapgen.h
+src/mapgen/mapgen_carpathian.cpp
+src/mapgen/mapgen_carpathian.h
+src/mapgen/mapgen_flat.cpp
+src/mapgen/mapgen_flat.h
+src/mapgen/mapgen_fractal.cpp
+src/mapgen/mapgen_fractal.h
+src/mapgen/mapgen_singlenode.cpp
+src/mapgen/mapgen_singlenode.h
+src/mapgen/mapgen_v5.cpp
+src/mapgen/mapgen_v5.h
+src/mapgen/mapgen_v6.cpp
+src/mapgen/mapgen_v6.h
+src/mapgen/mapgen_v7.cpp
+src/mapgen/mapgen_v7.h
+src/mapgen/mapgen_valleys.cpp
+src/mapgen/mapgen_valleys.h
 src/mapnode.cpp
 src/mapnode.h
 src/mapsector.cpp
@@ -166,17 +166,17 @@ src/mesh.cpp
 src/mesh.h
 src/mesh_generator_thread.cpp
 src/metadata.h
-src/mg_biome.cpp
-src/mg_biome.h
-src/mg_decoration.cpp
-src/mg_decoration.h
-src/mg_ore.cpp
-src/mg_ore.h
-src/mg_schematic.cpp
-src/mg_schematic.h
+src/mapgen/mg_biome.cpp
+src/mapgen/mg_biome.h
+src/mapgen/mg_decoration.cpp
+src/mapgen/mg_decoration.h
+src/mapgen/mg_ore.cpp
+src/mapgen/mg_ore.h
+src/mapgen/mg_schematic.cpp
+src/mapgen/mg_schematic.h
 src/minimap.cpp
 src/minimap.h
-src/modalMenu.h
+src/gui/modalMenu.h
 src/mods.cpp
 src/mods.h
 src/network/clientopcodes.cpp
@@ -341,10 +341,10 @@ src/threads.h
 src/tileanimation.cpp
 src/tool.cpp
 src/tool.h
-src/touchscreengui.cpp
+src/gui/touchscreengui.cpp
 src/translation.cpp
-src/treegen.cpp
-src/treegen.h
+src/mapgen/treegen.cpp
+src/mapgen/treegen.h
 src/unittest/test.cpp
 src/unittest/test.h
 src/unittest/test_areastore.cpp