diff --git a/binaries/data/mods/public/gui/common/functions_civinfo.js b/binaries/data/mods/public/gui/common/functions_civinfo.js
index c5b4ef2345..f199ecec48 100644
--- a/binaries/data/mods/public/gui/common/functions_civinfo.js
+++ b/binaries/data/mods/public/gui/common/functions_civinfo.js
@@ -7,7 +7,7 @@ function loadCivData(playableOnly = false)
 {
 	// Load all JSON files containing civ data
 	var civData = {};
-	var civFiles = Engine.BuildDirEntList("civs/", "*.json", false);
+	var civFiles = Engine.BuildDirEntList("simulation/data/civs/", "*.json", false);
 
 	for each (var filename in civFiles)
 	{
diff --git a/binaries/data/mods/public/l10n/messages.json b/binaries/data/mods/public/l10n/messages.json
index 755521c1b4..0fd2035315 100644
--- a/binaries/data/mods/public/l10n/messages.json
+++ b/binaries/data/mods/public/l10n/messages.json
@@ -8,7 +8,7 @@
             {
                 "extractor": "json",
                 "filemasks": [
-                    "civs/**.json"
+                    "simulation/data/civs/**.json"
                 ],
                 "options": {
                     "keywords": [
diff --git a/binaries/data/mods/public/civs/athen.json b/binaries/data/mods/public/simulation/data/civs/athen.json
similarity index 100%
rename from binaries/data/mods/public/civs/athen.json
rename to binaries/data/mods/public/simulation/data/civs/athen.json
diff --git a/binaries/data/mods/public/civs/brit.json b/binaries/data/mods/public/simulation/data/civs/brit.json
similarity index 100%
rename from binaries/data/mods/public/civs/brit.json
rename to binaries/data/mods/public/simulation/data/civs/brit.json
diff --git a/binaries/data/mods/public/civs/cart.json b/binaries/data/mods/public/simulation/data/civs/cart.json
similarity index 100%
rename from binaries/data/mods/public/civs/cart.json
rename to binaries/data/mods/public/simulation/data/civs/cart.json
diff --git a/binaries/data/mods/public/civs/gaul.json b/binaries/data/mods/public/simulation/data/civs/gaul.json
similarity index 100%
rename from binaries/data/mods/public/civs/gaul.json
rename to binaries/data/mods/public/simulation/data/civs/gaul.json
diff --git a/binaries/data/mods/public/civs/iber.json b/binaries/data/mods/public/simulation/data/civs/iber.json
similarity index 100%
rename from binaries/data/mods/public/civs/iber.json
rename to binaries/data/mods/public/simulation/data/civs/iber.json
diff --git a/binaries/data/mods/public/civs/mace.json b/binaries/data/mods/public/simulation/data/civs/mace.json
similarity index 100%
rename from binaries/data/mods/public/civs/mace.json
rename to binaries/data/mods/public/simulation/data/civs/mace.json
diff --git a/binaries/data/mods/public/civs/maur.json b/binaries/data/mods/public/simulation/data/civs/maur.json
similarity index 100%
rename from binaries/data/mods/public/civs/maur.json
rename to binaries/data/mods/public/simulation/data/civs/maur.json
diff --git a/binaries/data/mods/public/civs/pers.json b/binaries/data/mods/public/simulation/data/civs/pers.json
similarity index 100%
rename from binaries/data/mods/public/civs/pers.json
rename to binaries/data/mods/public/simulation/data/civs/pers.json
diff --git a/binaries/data/mods/public/civs/ptol.json b/binaries/data/mods/public/simulation/data/civs/ptol.json
similarity index 100%
rename from binaries/data/mods/public/civs/ptol.json
rename to binaries/data/mods/public/simulation/data/civs/ptol.json
diff --git a/binaries/data/mods/public/civs/rome.json b/binaries/data/mods/public/simulation/data/civs/rome.json
similarity index 100%
rename from binaries/data/mods/public/civs/rome.json
rename to binaries/data/mods/public/simulation/data/civs/rome.json
diff --git a/binaries/data/mods/public/civs/sele.json b/binaries/data/mods/public/simulation/data/civs/sele.json
similarity index 100%
rename from binaries/data/mods/public/civs/sele.json
rename to binaries/data/mods/public/simulation/data/civs/sele.json
diff --git a/binaries/data/mods/public/civs/spart.json b/binaries/data/mods/public/simulation/data/civs/spart.json
similarity index 100%
rename from binaries/data/mods/public/civs/spart.json
rename to binaries/data/mods/public/simulation/data/civs/spart.json
diff --git a/source/graphics/MapGenerator.cpp b/source/graphics/MapGenerator.cpp
index fef6b7597e..825e963d1e 100644
--- a/source/graphics/MapGenerator.cpp
+++ b/source/graphics/MapGenerator.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2014 Wildfire Games.
+/* Copyright (C) 2015 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -189,7 +189,7 @@ void CMapGeneratorWorker::MaybeGC(ScriptInterface::CxPrivate* pCxPrivate)
 
 std::vector<std::string> CMapGeneratorWorker::GetCivData(ScriptInterface::CxPrivate* UNUSED(pCxPrivate))
 {
-	VfsPath path(L"civs/");
+	VfsPath path(L"simulation/data/civs/");
 	VfsPaths pathnames;
 
 	std::vector<std::string> data;
diff --git a/source/simulation2/Simulation2.cpp b/source/simulation2/Simulation2.cpp
index 4f8c325d2b..4e1e5313de 100644
--- a/source/simulation2/Simulation2.cpp
+++ b/source/simulation2/Simulation2.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2014 Wildfire Games.
+/* Copyright (C) 2015 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -847,7 +847,7 @@ std::vector<std::string> CSimulation2::GetRMSData()
 
 std::vector<std::string> CSimulation2::GetCivData()
 {
-	return GetJSONData(L"civs/");
+	return GetJSONData(L"simulation/data/civs/");
 }
 
 static std::string ReadJSON(const VfsPath& path)
diff --git a/source/simulation2/system/ComponentManager.cpp b/source/simulation2/system/ComponentManager.cpp
index 67441335e9..dae9617f5d 100644
--- a/source/simulation2/system/ComponentManager.cpp
+++ b/source/simulation2/system/ComponentManager.cpp
@@ -1167,7 +1167,7 @@ JS::Value CComponentManager::Script_ReadJSONFile(ScriptInterface::CxPrivate* pCx
 
 JS::Value CComponentManager::Script_ReadCivJSONFile(ScriptInterface::CxPrivate* pCxPrivate, std::wstring fileName)
 {
-	return ReadJSONFile(pCxPrivate, L"civs", fileName);
+	return ReadJSONFile(pCxPrivate, L"simulation/data/civs", fileName);
 }
 
 JS::Value CComponentManager::ReadJSONFile(ScriptInterface::CxPrivate* pCxPrivate, std::wstring filePath, std::wstring fileName)