diff --git a/e107_admin/users_extended.php b/e107_admin/users_extended.php
index ef148c275..4f5cf33b0 100755
--- a/e107_admin/users_extended.php
+++ b/e107_admin/users_extended.php
@@ -1154,13 +1154,13 @@ class users_ext
 
 				if ($tmp[$f]['type']=="db field")
 				{
-					if (is_readable(e_ADMIN.'sql/extended_'.$f.'.php'))
+					if (is_readable(e_CORE.'sql/extended_'.$f.'.php'))
 					{
 	             	$ret .= ($this->process_sql($f)) ? LAN_CREATED." user_extended_{$f}<br />" : LAN_CREATED_FAILED." user_extended_{$f}<br />";
 				}
 					else
 					{
-						$ret .= str_replace('--FILE--',e_ADMIN.'sql/extended_'.$f.'.php',EXTLAN_78);
+						$ret .= str_replace('--FILE--',e_CORE.'sql/extended_'.$f.'.php',EXTLAN_78);
 					}
 				}
 			}
diff --git a/e107_admin/sql/db_field_defs.php b/e107_core/sql/db_field_defs.php
similarity index 100%
rename from e107_admin/sql/db_field_defs.php
rename to e107_core/sql/db_field_defs.php
diff --git a/e107_admin/sql/extended_country.php b/e107_core/sql/extended_country.php
similarity index 100%
rename from e107_admin/sql/extended_country.php
rename to e107_core/sql/extended_country.php
diff --git a/e107_admin/sql/extended_timezones.php b/e107_core/sql/extended_timezones.php
similarity index 100%
rename from e107_admin/sql/extended_timezones.php
rename to e107_core/sql/extended_timezones.php
diff --git a/e107_handlers/mysql_class.php b/e107_handlers/mysql_class.php
index 17d91d4c5..1ce153a5a 100644
--- a/e107_handlers/mysql_class.php
+++ b/e107_handlers/mysql_class.php
@@ -1857,7 +1857,7 @@ class e_db_mysql
 			}
 			else
 			{		// Need to try and find a table definition
-				$searchArray = array(e_ADMIN.'sql/db_field_defs.php');
+				$searchArray = array(e_CORE.'sql/db_field_defs.php');
 				// e107::getPref() shouldn't be used inside db handler! See db_IsLang() comments
 				$sqlFiles = (array) $this->getConfig()->get('e_sql_list', array()); // kill any PHP notices
 				foreach ($sqlFiles as $p => $f)
diff --git a/e107_handlers/plugin_class.php b/e107_handlers/plugin_class.php
index dd3f40708..3e23bbaee 100644
--- a/e107_handlers/plugin_class.php
+++ b/e107_handlers/plugin_class.php
@@ -705,7 +705,7 @@ class e107plugin
 
 	function manage_extended_field_sql($action, $field_name)
 	{
-		$f = e_ADMIN.'sql/extended_'.preg_replace('/[^\w]/', '', $field_name).'.php'; // quick security, always good idea
+		$f = e_CORE.'sql/extended_'.preg_replace('/[^\w]/', '', $field_name).'.php'; // quick security, always good idea
 		
 		if(!is_readable($f)) return false;