diff --git a/data/game.cfg b/data/game.cfg
index 559f8d59660..2f0e429cab6 100644
--- a/data/game.cfg
+++ b/data/game.cfg
@@ -2,12 +2,12 @@
 {utils/}
 {misc/}		# Note: misc/tips.cfg is wired into the C++.
 
+# These locations are wired into the C++
 {fonts.cfg}
 {english.cfg}
-{terrain.cfg}
-{terrain-graphics.cfg}
-{units.cfg}
 
+{terrain-graphics/}
+{units.cfg}
 {campaigns/}
 
 [advanced_preference]
diff --git a/data/terrain-graphics.cfg b/data/terrain-graphics/%final.cfg
similarity index 99%
rename from data/terrain-graphics.cfg
rename to data/terrain-graphics/%final.cfg
index 511271b3dcb..dd1c2fe7522 100644
--- a/data/terrain-graphics.cfg
+++ b/data/terrain-graphics/%final.cfg
@@ -12,8 +12,7 @@
 # the proper way to calculate the propabilities is described here
 # http://www.wesnoth.org/wiki/Terrain_Graphics_Probability
 
-# The following should be kept on top of the file
-{terrain-graphics}
+# This file needs to be evaluated after everything else in this directory.
 
 #-----------------------------------------------------------------
 # forest/pine<->Castle|Encampment special cases, also used by some other
diff --git a/src/filesystem.cpp b/src/filesystem.cpp
index 543d9862853..23700a875c4 100644
--- a/src/filesystem.cpp
+++ b/src/filesystem.cpp
@@ -180,7 +180,7 @@ void get_files_in_dir(const std::string& directory,
 		if(!directory.empty() && directory[0] != '/' && !game_config::path.empty()){
 			const std::string& dir = game_config::path + "/" + directory;
 			if(is_directory(dir)) {
-				get_files_in_dir(dir,files,dirs,mode);
+				get_files_in_dir(dir,files,dirs,mode,reorder);
 				return;
 			}
 		}
diff --git a/src/serialization/preprocessor.cpp b/src/serialization/preprocessor.cpp
index 2c7b737ab45..868bb4b728a 100644
--- a/src/serialization/preprocessor.cpp
+++ b/src/serialization/preprocessor.cpp
@@ -198,7 +198,7 @@ preprocessor_file::preprocessor_file(preprocessor_streambuf &t, std::string cons
 	: preprocessor(t)
 {
 	if (is_directory(name))
-		get_files_in_dir(name, &files_, NULL, ENTIRE_FILE_PATH);
+		get_files_in_dir(name, &files_, NULL, ENTIRE_FILE_PATH, DO_REORDER);
 	else
 		new preprocessor_data(t, istream_file(name), "", name, 1, directory_name(name), t.textdomain_);
 	pos_ = files_.begin();