diff --git a/application/language/german/auth_lang.php b/application/language/de_DE/auth_lang.php
similarity index 100%
rename from application/language/german/auth_lang.php
rename to application/language/de_DE/auth_lang.php
diff --git a/application/language/german/datamapper_lang.php b/application/language/de_DE/datamapper_lang.php
similarity index 100%
rename from application/language/german/datamapper_lang.php
rename to application/language/de_DE/datamapper_lang.php
diff --git a/application/language/german/form_validation_lang.php b/application/language/de_DE/form_validation_lang.php
similarity index 100%
rename from application/language/german/form_validation_lang.php
rename to application/language/de_DE/form_validation_lang.php
diff --git a/application/language/english/index.html b/application/language/de_DE/index.html
similarity index 100%
rename from application/language/english/index.html
rename to application/language/de_DE/index.html
diff --git a/application/language/german/jobs_lang.php b/application/language/de_DE/jobs_lang.php
similarity index 100%
rename from application/language/german/jobs_lang.php
rename to application/language/de_DE/jobs_lang.php
diff --git a/application/language/german/projects_lang.php b/application/language/de_DE/projects_lang.php
similarity index 100%
rename from application/language/german/projects_lang.php
rename to application/language/de_DE/projects_lang.php
diff --git a/application/language/german/settings_lang.php b/application/language/de_DE/settings_lang.php
similarity index 100%
rename from application/language/german/settings_lang.php
rename to application/language/de_DE/settings_lang.php
diff --git a/application/language/english/auth_lang.php b/application/language/en_EN/auth_lang.php
similarity index 100%
rename from application/language/english/auth_lang.php
rename to application/language/en_EN/auth_lang.php
diff --git a/application/language/english/datamapper_lang.php b/application/language/en_EN/datamapper_lang.php
similarity index 100%
rename from application/language/english/datamapper_lang.php
rename to application/language/en_EN/datamapper_lang.php
diff --git a/application/language/english/form_validation_lang.php b/application/language/en_EN/form_validation_lang.php
similarity index 100%
rename from application/language/english/form_validation_lang.php
rename to application/language/en_EN/form_validation_lang.php
diff --git a/application/language/german/index.html b/application/language/en_EN/index.html
similarity index 100%
rename from application/language/german/index.html
rename to application/language/en_EN/index.html
diff --git a/application/language/english/jobs_lang.php b/application/language/en_EN/jobs_lang.php
similarity index 100%
rename from application/language/english/jobs_lang.php
rename to application/language/en_EN/jobs_lang.php
diff --git a/application/language/english/projects_lang.php b/application/language/en_EN/projects_lang.php
similarity index 100%
rename from application/language/english/projects_lang.php
rename to application/language/en_EN/projects_lang.php
diff --git a/application/language/english/settings_lang.php b/application/language/en_EN/settings_lang.php
similarity index 100%
rename from application/language/english/settings_lang.php
rename to application/language/en_EN/settings_lang.php
diff --git a/application/language/english/admin/servers_lang.php b/application/language/english/admin/servers_lang.php
deleted file mode 100644
index a470790..0000000
--- a/application/language/english/admin/servers_lang.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-
-/* 
- * Copyright (c) 2011 Karsten Heiken <karsten@disposed.de>
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is 
- * furnished to do so, subject to the following conditions:
- * 
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-/*
- * Headings
- */
-$lang['location'] = 'Location';
-$lang['owner'] = 'Owner';
-$lang['actions'] = 'Actions';
-$lang['technical_info'] = 'Technical information';
-$lang['hardware_os'] = 'Hardware &amp; OS';
-$lang['scattport_stats'] = 'ScattPort statistics';
-
-/*
- * server status
- */
-$lang['busy'] = 'busy';
-$lang['offline'] = 'offline';
-$lang['available'] = 'available';
-
-$lang['workload'] = 'Workload';
-$lang['completed_jobs'] = 'Completed jobs';
\ No newline at end of file