diff --git a/.gitignore b/.gitignore
index 60c377b0a..1f1415410 100644
--- a/.gitignore
+++ b/.gitignore
@@ -63,7 +63,7 @@ openminer_server
 *.dat
 *.zip
 test_atlas.png
-config.lua
-server_config.lua
+client.lua
+server.lua
 TODO
 
diff --git a/config.example.lua b/config/client.example.lua
similarity index 100%
rename from config.example.lua
rename to config/client.example.lua
diff --git a/server_config.example.lua b/config/server.example.lua
similarity index 100%
rename from server_config.example.lua
rename to config/server.example.lua
diff --git a/source/client/core/ClientApplication.cpp b/source/client/core/ClientApplication.cpp
index 01767d99c..4c4acb2d3 100644
--- a/source/client/core/ClientApplication.cpp
+++ b/source/client/core/ClientApplication.cpp
@@ -75,7 +75,7 @@ void ClientApplication::init() {
 	if (m_argumentParser.getArgument("port").isFound)
 		m_port = std::stoi(m_argumentParser.getArgument("port").parameter);
 
-	Config::loadConfigFromFile("config.lua");
+	Config::loadConfigFromFile("config/client.lua");
 
 	m_keyboardHandler.loadKeysFromFile("resources/config/keys.xml");
 	gk::GamePad::init(m_keyboardHandler);
diff --git a/source/server/core/ServerApplication.cpp b/source/server/core/ServerApplication.cpp
index 08de045cd..bd7958e79 100644
--- a/source/server/core/ServerApplication.cpp
+++ b/source/server/core/ServerApplication.cpp
@@ -59,7 +59,7 @@ void ServerApplication::init() {
 	if (m_argumentParser.getArgument("port").isFound)
 		m_port = std::stoi(m_argumentParser.getArgument("port").parameter);
 
-	ServerConfig::loadConfigFromFile("server_config.lua");
+	ServerConfig::loadConfigFromFile("config/server.lua");
 
 	m_server.init(m_port);
 	m_server.setRunning(true);