diff --git a/README.md b/README.md
index facf9fc..5acc9b6 100644
--- a/README.md
+++ b/README.md
@@ -17,5 +17,6 @@
 
 #### Системные требования: min версия PHP-8.2 и выше; MySQL-8.x
 
+### На этапе тестирования, установка CMS и всех ее последующих обновлений, выполняется только после удаления файлов из предыдущей версии. Простое копирование файлов на файлы, может привести к ошибкам.
 ### Вы можете отправить Баг-репорт в случае выявления ошибки: [ave.gitget.ru](https://ave.gitget.ru) 
 ### При отправке Баг-репорта потребуется ввести Антиспам-токен Ave-cms
\ No newline at end of file
diff --git a/fields/code/field.php b/fields/code_large/field.php
similarity index 100%
rename from fields/code/field.php
rename to fields/code_large/field.php
diff --git a/fields/code/lang/bg.txt b/fields/code_large/lang/bg.txt
similarity index 100%
rename from fields/code/lang/bg.txt
rename to fields/code_large/lang/bg.txt
diff --git a/fields/code/lang/cz.txt b/fields/code_large/lang/cz.txt
similarity index 100%
rename from fields/code/lang/cz.txt
rename to fields/code_large/lang/cz.txt
diff --git a/fields/code/lang/pl.txt b/fields/code_large/lang/pl.txt
similarity index 100%
rename from fields/code/lang/pl.txt
rename to fields/code_large/lang/pl.txt
diff --git a/fields/code/lang/ru.txt b/fields/code_large/lang/ru.txt
similarity index 100%
rename from fields/code/lang/ru.txt
rename to fields/code_large/lang/ru.txt
diff --git a/fields/code/lang/ua.txt b/fields/code_large/lang/ua.txt
similarity index 100%
rename from fields/code/lang/ua.txt
rename to fields/code_large/lang/ua.txt
diff --git a/fields/code/tpl/field-doc.tpl b/fields/code_large/tpl/field-doc.tpl
similarity index 100%
rename from fields/code/tpl/field-doc.tpl
rename to fields/code_large/tpl/field-doc.tpl
diff --git a/fields/code/tpl/field-req.tpl b/fields/code_large/tpl/field-req.tpl
similarity index 100%
rename from fields/code/tpl/field-req.tpl
rename to fields/code_large/tpl/field-req.tpl
diff --git a/fields/code/tpl/field.tpl b/fields/code_large/tpl/field.tpl
similarity index 100%
rename from fields/code/tpl/field.tpl
rename to fields/code_large/tpl/field.tpl
diff --git a/fields/code_small/lang/ru.txt b/fields/code_small/lang/ru.txt
index a0a5285..e4b4d4b 100644
--- a/fields/code_small/lang/ru.txt
+++ b/fields/code_small/lang/ru.txt
@@ -1,2 +1,2 @@
 [admin]
-name = "Код (Codemirror) маленькое"
\ No newline at end of file
+name = "Код (Codemirror Маленькое)"
\ No newline at end of file
diff --git a/fields/date/lang/ru.txt b/fields/date/lang/ru.txt
deleted file mode 100644
index 13cc934..0000000
--- a/fields/date/lang/ru.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-[admin]
-name = "Дата (TimeStamp)"
\ No newline at end of file
diff --git a/fields/date/field.php b/fields/date_unix_time/field.php
similarity index 100%
rename from fields/date/field.php
rename to fields/date_unix_time/field.php
diff --git a/fields/date/lang/bg.txt b/fields/date_unix_time/lang/bg.txt
similarity index 100%
rename from fields/date/lang/bg.txt
rename to fields/date_unix_time/lang/bg.txt
diff --git a/fields/date/lang/cz.txt b/fields/date_unix_time/lang/cz.txt
similarity index 100%
rename from fields/date/lang/cz.txt
rename to fields/date_unix_time/lang/cz.txt
diff --git a/fields/date/lang/pl.txt b/fields/date_unix_time/lang/pl.txt
similarity index 100%
rename from fields/date/lang/pl.txt
rename to fields/date_unix_time/lang/pl.txt
diff --git a/fields/date_unix_time/lang/ru.txt b/fields/date_unix_time/lang/ru.txt
new file mode 100644
index 0000000..6ec8c3a
--- /dev/null
+++ b/fields/date_unix_time/lang/ru.txt
@@ -0,0 +1,2 @@
+[admin]
+name = "Дата (Unix Timestamp)"
\ No newline at end of file
diff --git a/fields/date/lang/ua.txt b/fields/date_unix_time/lang/ua.txt
similarity index 100%
rename from fields/date/lang/ua.txt
rename to fields/date_unix_time/lang/ua.txt
diff --git a/fields/date/tpl/field-doc.tpl b/fields/date_unix_time/tpl/field-doc.tpl
similarity index 100%
rename from fields/date/tpl/field-doc.tpl
rename to fields/date_unix_time/tpl/field-doc.tpl
diff --git a/fields/date/tpl/field-req.tpl b/fields/date_unix_time/tpl/field-req.tpl
similarity index 100%
rename from fields/date/tpl/field-req.tpl
rename to fields/date_unix_time/tpl/field-req.tpl
diff --git a/fields/date/tpl/field.tpl b/fields/date_unix_time/tpl/field.tpl
similarity index 100%
rename from fields/date/tpl/field.tpl
rename to fields/date_unix_time/tpl/field.tpl
diff --git a/fields/doc_from_rub/lang/ru.txt b/fields/doc_from_rub/lang/ru.txt
deleted file mode 100644
index 12a8e75..0000000
--- a/fields/doc_from_rub/lang/ru.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-[admin]
-name = "Документ из рубрики"
-error = "Не задана рубрика"
\ No newline at end of file
diff --git a/fields/doc_from_rub_all/lang/ru.txt b/fields/doc_from_rub_all/lang/ru.txt
deleted file mode 100644
index 9176202..0000000
--- a/fields/doc_from_rub_all/lang/ru.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-[admin]
-name = "Документ из рубрики (Все)"
-error = "Не задана рубрика"
\ No newline at end of file
diff --git a/fields/doc_from_rub_check/lang/ru.txt b/fields/doc_from_rub_check/lang/ru.txt
index ea62541..af1471b 100644
--- a/fields/doc_from_rub_check/lang/ru.txt
+++ b/fields/doc_from_rub_check/lang/ru.txt
@@ -1,3 +1,3 @@
 [admin]
-name = "Документ из рубрики (Checkbox)"
+name = "Документы из рубрики (Checkbox)"
 error = "Не задана рубрика"
\ No newline at end of file
diff --git a/fields/doc_from_rub_all/field.php b/fields/doc_from_rub_list/field.php
similarity index 100%
rename from fields/doc_from_rub_all/field.php
rename to fields/doc_from_rub_list/field.php
diff --git a/fields/doc_from_rub/lang/bg.txt b/fields/doc_from_rub_list/lang/bg.txt
similarity index 100%
rename from fields/doc_from_rub/lang/bg.txt
rename to fields/doc_from_rub_list/lang/bg.txt
diff --git a/fields/doc_from_rub/lang/cz.txt b/fields/doc_from_rub_list/lang/cz.txt
similarity index 100%
rename from fields/doc_from_rub/lang/cz.txt
rename to fields/doc_from_rub_list/lang/cz.txt
diff --git a/fields/doc_from_rub/lang/en.txt b/fields/doc_from_rub_list/lang/en.txt
similarity index 100%
rename from fields/doc_from_rub/lang/en.txt
rename to fields/doc_from_rub_list/lang/en.txt
diff --git a/fields/doc_from_rub/lang/pl.txt b/fields/doc_from_rub_list/lang/pl.txt
similarity index 100%
rename from fields/doc_from_rub/lang/pl.txt
rename to fields/doc_from_rub_list/lang/pl.txt
diff --git a/fields/doc_from_rub_list/lang/ru.txt b/fields/doc_from_rub_list/lang/ru.txt
new file mode 100644
index 0000000..a9f5f68
--- /dev/null
+++ b/fields/doc_from_rub_list/lang/ru.txt
@@ -0,0 +1,3 @@
+[admin]
+name = "Документы из рубрики (Список)"
+error = "Не задана рубрика"
\ No newline at end of file
diff --git a/fields/doc_from_rub/lang/ua.txt b/fields/doc_from_rub_list/lang/ua.txt
similarity index 100%
rename from fields/doc_from_rub/lang/ua.txt
rename to fields/doc_from_rub_list/lang/ua.txt
diff --git a/fields/doc_from_rub/tpl/field-doc.tpl b/fields/doc_from_rub_list/tpl/field-doc.tpl
similarity index 100%
rename from fields/doc_from_rub/tpl/field-doc.tpl
rename to fields/doc_from_rub_list/tpl/field-doc.tpl
diff --git a/fields/doc_from_rub/tpl/field-req.tpl b/fields/doc_from_rub_list/tpl/field-req.tpl
similarity index 100%
rename from fields/doc_from_rub/tpl/field-req.tpl
rename to fields/doc_from_rub_list/tpl/field-req.tpl
diff --git a/fields/doc_from_rub_all/tpl/field.tpl b/fields/doc_from_rub_list/tpl/field.tpl
similarity index 100%
rename from fields/doc_from_rub_all/tpl/field.tpl
rename to fields/doc_from_rub_list/tpl/field.tpl
diff --git a/fields/doc_from_rub_search/lang/ru.txt b/fields/doc_from_rub_search/lang/ru.txt
index 7e275ff..b62dff7 100644
--- a/fields/doc_from_rub_search/lang/ru.txt
+++ b/fields/doc_from_rub_search/lang/ru.txt
@@ -1,5 +1,5 @@
 [admin]
-name        = "Документы из рубрики (+ Поиск)"
+name        = "Документы из рубрики (Поиск)"
 delete      = "Удалить элемент"
 param       = "Документ"
 value       = "Id"
diff --git a/fields/doc_from_rub/field.php b/fields/doc_from_rub_tree/field.php
similarity index 100%
rename from fields/doc_from_rub/field.php
rename to fields/doc_from_rub_tree/field.php
diff --git a/fields/doc_from_rub_all/lang/bg.txt b/fields/doc_from_rub_tree/lang/bg.txt
similarity index 100%
rename from fields/doc_from_rub_all/lang/bg.txt
rename to fields/doc_from_rub_tree/lang/bg.txt
diff --git a/fields/doc_from_rub_all/lang/cz.txt b/fields/doc_from_rub_tree/lang/cz.txt
similarity index 100%
rename from fields/doc_from_rub_all/lang/cz.txt
rename to fields/doc_from_rub_tree/lang/cz.txt
diff --git a/fields/doc_from_rub_all/lang/en.txt b/fields/doc_from_rub_tree/lang/en.txt
similarity index 100%
rename from fields/doc_from_rub_all/lang/en.txt
rename to fields/doc_from_rub_tree/lang/en.txt
diff --git a/fields/doc_from_rub_all/lang/pl.txt b/fields/doc_from_rub_tree/lang/pl.txt
similarity index 100%
rename from fields/doc_from_rub_all/lang/pl.txt
rename to fields/doc_from_rub_tree/lang/pl.txt
diff --git a/fields/doc_from_rub_tree/lang/ru.txt b/fields/doc_from_rub_tree/lang/ru.txt
new file mode 100644
index 0000000..64ecb53
--- /dev/null
+++ b/fields/doc_from_rub_tree/lang/ru.txt
@@ -0,0 +1,3 @@
+[admin]
+name = "Документы из рубрики (Дерево)"
+error = "Не задана рубрика"
\ No newline at end of file
diff --git a/fields/doc_from_rub_all/lang/ua.txt b/fields/doc_from_rub_tree/lang/ua.txt
similarity index 100%
rename from fields/doc_from_rub_all/lang/ua.txt
rename to fields/doc_from_rub_tree/lang/ua.txt
diff --git a/fields/doc_from_rub_all/tpl/field-doc.tpl b/fields/doc_from_rub_tree/tpl/field-doc.tpl
similarity index 100%
rename from fields/doc_from_rub_all/tpl/field-doc.tpl
rename to fields/doc_from_rub_tree/tpl/field-doc.tpl
diff --git a/fields/doc_from_rub_all/tpl/field-req.tpl b/fields/doc_from_rub_tree/tpl/field-req.tpl
similarity index 100%
rename from fields/doc_from_rub_all/tpl/field-req.tpl
rename to fields/doc_from_rub_tree/tpl/field-req.tpl
diff --git a/fields/doc_from_rub/tpl/field.tpl b/fields/doc_from_rub_tree/tpl/field.tpl
similarity index 100%
rename from fields/doc_from_rub/tpl/field.tpl
rename to fields/doc_from_rub_tree/tpl/field.tpl
diff --git a/fields/doc_from_rub/tpl/list.tpl b/fields/doc_from_rub_tree/tpl/list.tpl
similarity index 100%
rename from fields/doc_from_rub/tpl/list.tpl
rename to fields/doc_from_rub_tree/tpl/list.tpl
diff --git a/fields/link/field.php b/fields/doc_link/field.php
similarity index 100%
rename from fields/link/field.php
rename to fields/doc_link/field.php
diff --git a/fields/link/lang/bg.txt b/fields/doc_link/lang/bg.txt
similarity index 100%
rename from fields/link/lang/bg.txt
rename to fields/doc_link/lang/bg.txt
diff --git a/fields/link/lang/cz.txt b/fields/doc_link/lang/cz.txt
similarity index 100%
rename from fields/link/lang/cz.txt
rename to fields/doc_link/lang/cz.txt
diff --git a/fields/link/lang/pl.txt b/fields/doc_link/lang/pl.txt
similarity index 100%
rename from fields/link/lang/pl.txt
rename to fields/doc_link/lang/pl.txt
diff --git a/fields/doc_link/lang/ru.txt b/fields/doc_link/lang/ru.txt
new file mode 100644
index 0000000..047927c
--- /dev/null
+++ b/fields/doc_link/lang/ru.txt
@@ -0,0 +1,2 @@
+[admin]
+name = "Ссылка на документ"
\ No newline at end of file
diff --git a/fields/link/lang/ua.txt b/fields/doc_link/lang/ua.txt
similarity index 100%
rename from fields/link/lang/ua.txt
rename to fields/doc_link/lang/ua.txt
diff --git a/fields/link/tpl/field.tpl b/fields/doc_link/tpl/field.tpl
similarity index 100%
rename from fields/link/tpl/field.tpl
rename to fields/doc_link/tpl/field.tpl
diff --git a/fields/multi_links/css/field.css b/fields/docrubtizer/css/field.css
similarity index 100%
rename from fields/multi_links/css/field.css
rename to fields/docrubtizer/css/field.css
diff --git a/fields/teasers/field.php b/fields/docrubtizer/field.php
similarity index 100%
rename from fields/teasers/field.php
rename to fields/docrubtizer/field.php
diff --git a/fields/teasers/js/field.js b/fields/docrubtizer/js/field.js
similarity index 100%
rename from fields/teasers/js/field.js
rename to fields/docrubtizer/js/field.js
diff --git a/fields/teasers/lang/bg.txt b/fields/docrubtizer/lang/bg.txt
similarity index 100%
rename from fields/teasers/lang/bg.txt
rename to fields/docrubtizer/lang/bg.txt
diff --git a/fields/teasers/lang/cz.txt b/fields/docrubtizer/lang/cz.txt
similarity index 100%
rename from fields/teasers/lang/cz.txt
rename to fields/docrubtizer/lang/cz.txt
diff --git a/fields/teasers/lang/pl.txt b/fields/docrubtizer/lang/pl.txt
similarity index 100%
rename from fields/teasers/lang/pl.txt
rename to fields/docrubtizer/lang/pl.txt
diff --git a/fields/teasers/lang/ru.txt b/fields/docrubtizer/lang/ru.txt
similarity index 87%
rename from fields/teasers/lang/ru.txt
rename to fields/docrubtizer/lang/ru.txt
index c6c544b..3fe478a 100644
--- a/fields/teasers/lang/ru.txt
+++ b/fields/docrubtizer/lang/ru.txt
@@ -1,5 +1,5 @@
 [admin]
-name = "Тизеры"
+name = "Тизеры документов"
 delete      = "Удалить элемент"
 param       = "Документ"
 value       = "Id"
diff --git a/fields/teasers/lang/ua.txt b/fields/docrubtizer/lang/ua.txt
similarity index 100%
rename from fields/teasers/lang/ua.txt
rename to fields/docrubtizer/lang/ua.txt
diff --git a/fields/teasers/tpl/field.tpl b/fields/docrubtizer/tpl/field.tpl
similarity index 100%
rename from fields/teasers/tpl/field.tpl
rename to fields/docrubtizer/tpl/field.tpl
diff --git a/fields/download/lang/ru.txt b/fields/download/lang/ru.txt
deleted file mode 100644
index 91e422e..0000000
--- a/fields/download/lang/ru.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-[admin]
-name = "Загрузить файл"
diff --git a/fields/download/field.php b/fields/download_file_button/field.php
similarity index 100%
rename from fields/download/field.php
rename to fields/download_file_button/field.php
diff --git a/fields/download/lang/bg.txt b/fields/download_file_button/lang/bg.txt
similarity index 100%
rename from fields/download/lang/bg.txt
rename to fields/download_file_button/lang/bg.txt
diff --git a/fields/download/lang/cz.txt b/fields/download_file_button/lang/cz.txt
similarity index 100%
rename from fields/download/lang/cz.txt
rename to fields/download_file_button/lang/cz.txt
diff --git a/fields/download/lang/en.txt b/fields/download_file_button/lang/en.txt
similarity index 100%
rename from fields/download/lang/en.txt
rename to fields/download_file_button/lang/en.txt
diff --git a/fields/download/lang/pl.txt b/fields/download_file_button/lang/pl.txt
similarity index 100%
rename from fields/download/lang/pl.txt
rename to fields/download_file_button/lang/pl.txt
diff --git a/fields/download_file_button/lang/ru.txt b/fields/download_file_button/lang/ru.txt
new file mode 100644
index 0000000..2e74186
--- /dev/null
+++ b/fields/download_file_button/lang/ru.txt
@@ -0,0 +1,2 @@
+[admin]
+name = "Кнопка Скачать файл"
diff --git a/fields/download/lang/ua.txt b/fields/download_file_button/lang/ua.txt
similarity index 100%
rename from fields/download/lang/ua.txt
rename to fields/download_file_button/lang/ua.txt
diff --git a/fields/download/tpl/field.tpl b/fields/download_file_button/tpl/field.tpl
similarity index 100%
rename from fields/download/tpl/field.tpl
rename to fields/download_file_button/tpl/field.tpl
diff --git a/fields/drop_down/field.php b/fields/drop_down/field.php
index 0917498..27dd796 100644
--- a/fields/drop_down/field.php
+++ b/fields/drop_down/field.php
@@ -16,8 +16,8 @@
 	{
 		global $AVE_Template;
 
-		$fld_dir  = dirname(__FILE__) . '/';
-		$tpl_dir  = $fld_dir . 'tpl/';
+		$fld_dir = dirname(__FILE__) . '/';
+		$tpl_dir = $fld_dir . 'tpl/';
 
 		$lang_file = $fld_dir . 'lang/' . (defined('ACP') ? $_SESSION['admin_language'] : $_SESSION['user_language']) . '.txt';
 
@@ -52,7 +52,13 @@
 						'/\[tag:parametr:(\d+)\]/i',
 						function($data) use($field_param)
 						{
-							return $field_param[(int)$data[1]];
+							if (isset($data[1])) {
+								$index = (int)$data[1];
+								if (isset($field_param[$index])) {
+									return $field_param[$index];
+								}
+							}
+							return '';
 						},
 						$tpl
 					);
@@ -69,7 +75,13 @@
 						'/\[tag:parametr:(\d+)\]/i',
 						function($data) use($field_param)
 						{
-							return $field_param[(int)$data[1]];
+							if (isset($data[1])) {
+								$index = (int)$data[1];
+								if (isset($field_param[$index])) {
+									return $field_param[$index];
+								}
+							}
+							return '';
 						},
 						$tpl
 					);
@@ -88,4 +100,4 @@
 		}
 		return ($res ? $res : $field_value);
 	}
-?>
+?>
\ No newline at end of file
diff --git a/fields/drop_down_key/field.php b/fields/drop_down_key/field.php
index 9d442d5..c6a9f95 100644
--- a/fields/drop_down_key/field.php
+++ b/fields/drop_down_key/field.php
@@ -16,8 +16,8 @@
 	{
 		global $AVE_Template;
 
-		$fld_dir  = dirname(__FILE__) . '/';
-		$tpl_dir  = $fld_dir . 'tpl/';
+		$fld_dir = dirname(__FILE__) . '/';
+		$tpl_dir = $fld_dir . 'tpl/';
 
 		$lang_file = $fld_dir . 'lang/' . (defined('ACP') ? $_SESSION['admin_language'] : $_SESSION['user_language']) . '.txt';
 
@@ -59,7 +59,13 @@
 							'/\[tag:parametr:(\d+)\]/i',
 							function($data) use($field_param)
 							{
-								return $field_param[(int)$data[1]];
+								if (isset($data[1])) {
+									$index = (int)$data[1];
+									if (isset($field_param[$index])) {
+										return $field_param[$index];
+									}
+								}
+								return '';
 							},
 							$tpl
 						);
@@ -96,7 +102,13 @@
 							'/\[tag:parametr:(\d+)\]/i',
 							function($data) use($field_param)
 							{
-								return $field_param[(int)$data[1]];
+								if (isset($data[1])) {
+									$index = (int)$data[1];
+									if (isset($field_param[$index])) {
+										return $field_param[$index];
+									}
+								}
+								return '';
 							},
 							$tpl
 						);
@@ -127,4 +139,4 @@
 		}
 		return ($res ? $res : $field_value);
 	}
-?>
+?>
\ No newline at end of file
diff --git a/fields/image_multi/css/field.css b/fields/image_cascade/css/field.css
similarity index 100%
rename from fields/image_multi/css/field.css
rename to fields/image_cascade/css/field.css
diff --git a/fields/image_multi/field.php b/fields/image_cascade/field.php
similarity index 100%
rename from fields/image_multi/field.php
rename to fields/image_cascade/field.php
diff --git a/fields/image_multi/js/field.js b/fields/image_cascade/js/field.js
similarity index 100%
rename from fields/image_multi/js/field.js
rename to fields/image_cascade/js/field.js
diff --git a/fields/image_multi/lang/bg.txt b/fields/image_cascade/lang/bg.txt
similarity index 100%
rename from fields/image_multi/lang/bg.txt
rename to fields/image_cascade/lang/bg.txt
diff --git a/fields/image_multi/lang/cz.txt b/fields/image_cascade/lang/cz.txt
similarity index 100%
rename from fields/image_multi/lang/cz.txt
rename to fields/image_cascade/lang/cz.txt
diff --git a/fields/image_multi/lang/en.txt b/fields/image_cascade/lang/en.txt
similarity index 100%
rename from fields/image_multi/lang/en.txt
rename to fields/image_cascade/lang/en.txt
diff --git a/fields/image_multi/lang/pl.txt b/fields/image_cascade/lang/pl.txt
similarity index 100%
rename from fields/image_multi/lang/pl.txt
rename to fields/image_cascade/lang/pl.txt
diff --git a/fields/image_multi/lang/ru.txt b/fields/image_cascade/lang/ru.txt
similarity index 100%
rename from fields/image_multi/lang/ru.txt
rename to fields/image_cascade/lang/ru.txt
diff --git a/fields/image_multi/lang/ua.txt b/fields/image_cascade/lang/ua.txt
similarity index 100%
rename from fields/image_multi/lang/ua.txt
rename to fields/image_cascade/lang/ua.txt
diff --git a/fields/image_multi/tpl/field-doc.tpl b/fields/image_cascade/tpl/field-doc.tpl
similarity index 100%
rename from fields/image_multi/tpl/field-doc.tpl
rename to fields/image_cascade/tpl/field-doc.tpl
diff --git a/fields/image_multi/tpl/field-req.tpl b/fields/image_cascade/tpl/field-req.tpl
similarity index 100%
rename from fields/image_multi/tpl/field-req.tpl
rename to fields/image_cascade/tpl/field-req.tpl
diff --git a/fields/image_multi/tpl/field.tpl b/fields/image_cascade/tpl/field.tpl
similarity index 100%
rename from fields/image_multi/tpl/field.tpl
rename to fields/image_cascade/tpl/field.tpl
diff --git a/fields/link/lang/ru.txt b/fields/link/lang/ru.txt
deleted file mode 100644
index 6797df8..0000000
--- a/fields/link/lang/ru.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-[admin]
-name = "Ссылка"
\ No newline at end of file
diff --git a/fields/multi_line/field.php b/fields/multi_line_large/field.php
similarity index 100%
rename from fields/multi_line/field.php
rename to fields/multi_line_large/field.php
diff --git a/fields/multi_line/lang/bg.txt b/fields/multi_line_large/lang/bg.txt
similarity index 100%
rename from fields/multi_line/lang/bg.txt
rename to fields/multi_line_large/lang/bg.txt
diff --git a/fields/multi_line/lang/cz.txt b/fields/multi_line_large/lang/cz.txt
similarity index 100%
rename from fields/multi_line/lang/cz.txt
rename to fields/multi_line_large/lang/cz.txt
diff --git a/fields/multi_line/lang/en.txt b/fields/multi_line_large/lang/en.txt
similarity index 100%
rename from fields/multi_line/lang/en.txt
rename to fields/multi_line_large/lang/en.txt
diff --git a/fields/multi_line/lang/pl.txt b/fields/multi_line_large/lang/pl.txt
similarity index 100%
rename from fields/multi_line/lang/pl.txt
rename to fields/multi_line_large/lang/pl.txt
diff --git a/fields/multi_line/lang/ru.txt b/fields/multi_line_large/lang/ru.txt
similarity index 100%
rename from fields/multi_line/lang/ru.txt
rename to fields/multi_line_large/lang/ru.txt
diff --git a/fields/multi_line/lang/ua.txt b/fields/multi_line_large/lang/ua.txt
similarity index 100%
rename from fields/multi_line/lang/ua.txt
rename to fields/multi_line_large/lang/ua.txt
diff --git a/fields/multi_line_simple/field.php b/fields/multi_line_medium/field.php
similarity index 100%
rename from fields/multi_line_simple/field.php
rename to fields/multi_line_medium/field.php
diff --git a/fields/multi_line_simple/lang/bg.txt b/fields/multi_line_medium/lang/bg.txt
similarity index 100%
rename from fields/multi_line_simple/lang/bg.txt
rename to fields/multi_line_medium/lang/bg.txt
diff --git a/fields/multi_line_simple/lang/cz.txt b/fields/multi_line_medium/lang/cz.txt
similarity index 100%
rename from fields/multi_line_simple/lang/cz.txt
rename to fields/multi_line_medium/lang/cz.txt
diff --git a/fields/multi_line_simple/lang/en.txt b/fields/multi_line_medium/lang/en.txt
similarity index 100%
rename from fields/multi_line_simple/lang/en.txt
rename to fields/multi_line_medium/lang/en.txt
diff --git a/fields/multi_line_simple/lang/pl.txt b/fields/multi_line_medium/lang/pl.txt
similarity index 100%
rename from fields/multi_line_simple/lang/pl.txt
rename to fields/multi_line_medium/lang/pl.txt
diff --git a/fields/multi_line_simple/lang/ru.txt b/fields/multi_line_medium/lang/ru.txt
similarity index 100%
rename from fields/multi_line_simple/lang/ru.txt
rename to fields/multi_line_medium/lang/ru.txt
diff --git a/fields/multi_line_simple/lang/ua.txt b/fields/multi_line_medium/lang/ua.txt
similarity index 100%
rename from fields/multi_line_simple/lang/ua.txt
rename to fields/multi_line_medium/lang/ua.txt
diff --git a/fields/multi_line_slim/field.php b/fields/multi_line_small/field.php
similarity index 100%
rename from fields/multi_line_slim/field.php
rename to fields/multi_line_small/field.php
diff --git a/fields/multi_line_slim/lang/bg.txt b/fields/multi_line_small/lang/bg.txt
similarity index 100%
rename from fields/multi_line_slim/lang/bg.txt
rename to fields/multi_line_small/lang/bg.txt
diff --git a/fields/multi_line_slim/lang/cz.txt b/fields/multi_line_small/lang/cz.txt
similarity index 100%
rename from fields/multi_line_slim/lang/cz.txt
rename to fields/multi_line_small/lang/cz.txt
diff --git a/fields/multi_line_slim/lang/en.txt b/fields/multi_line_small/lang/en.txt
similarity index 100%
rename from fields/multi_line_slim/lang/en.txt
rename to fields/multi_line_small/lang/en.txt
diff --git a/fields/multi_line_slim/lang/pl.txt b/fields/multi_line_small/lang/pl.txt
similarity index 100%
rename from fields/multi_line_slim/lang/pl.txt
rename to fields/multi_line_small/lang/pl.txt
diff --git a/fields/multi_line_slim/lang/ru.txt b/fields/multi_line_small/lang/ru.txt
similarity index 100%
rename from fields/multi_line_slim/lang/ru.txt
rename to fields/multi_line_small/lang/ru.txt
diff --git a/fields/multi_line_slim/lang/ua.txt b/fields/multi_line_small/lang/ua.txt
similarity index 100%
rename from fields/multi_line_slim/lang/ua.txt
rename to fields/multi_line_small/lang/ua.txt
diff --git a/fields/doc_files/css/field.css b/fields/multi_links_three_parameter/css/field.css
similarity index 100%
rename from fields/doc_files/css/field.css
rename to fields/multi_links_three_parameter/css/field.css
diff --git a/fields/doc_files/field.php b/fields/multi_links_three_parameter/field.php
similarity index 100%
rename from fields/doc_files/field.php
rename to fields/multi_links_three_parameter/field.php
diff --git a/fields/doc_files/js/field.js b/fields/multi_links_three_parameter/js/field.js
similarity index 100%
rename from fields/doc_files/js/field.js
rename to fields/multi_links_three_parameter/js/field.js
diff --git a/fields/doc_files/lang/ru.txt b/fields/multi_links_three_parameter/lang/ru.txt
similarity index 83%
rename from fields/doc_files/lang/ru.txt
rename to fields/multi_links_three_parameter/lang/ru.txt
index 9e45350..090f2d1 100644
--- a/fields/doc_files/lang/ru.txt
+++ b/fields/multi_links_three_parameter/lang/ru.txt
@@ -1,5 +1,5 @@
 [admin]
-name		= "Мультизагрузка файлов"
+name		= "Мульти ссылки (Три параметра)"
 delete		= "Удалить элемент"
 param_name	= "Наименование"
 param_desc	= "Описание"
diff --git a/fields/doc_files/tpl/field-doc.tpl b/fields/multi_links_three_parameter/tpl/field-doc.tpl
similarity index 100%
rename from fields/doc_files/tpl/field-doc.tpl
rename to fields/multi_links_three_parameter/tpl/field-doc.tpl
diff --git a/fields/doc_files/tpl/field-req.tpl b/fields/multi_links_three_parameter/tpl/field-req.tpl
similarity index 100%
rename from fields/doc_files/tpl/field-req.tpl
rename to fields/multi_links_three_parameter/tpl/field-req.tpl
diff --git a/fields/doc_files/tpl/field.tpl b/fields/multi_links_three_parameter/tpl/field.tpl
similarity index 100%
rename from fields/doc_files/tpl/field.tpl
rename to fields/multi_links_three_parameter/tpl/field.tpl
diff --git a/fields/multi_list/css/field.css b/fields/multi_links_two_parameter/css/field.css
similarity index 100%
rename from fields/multi_list/css/field.css
rename to fields/multi_links_two_parameter/css/field.css
diff --git a/fields/multi_links/field.php b/fields/multi_links_two_parameter/field.php
similarity index 100%
rename from fields/multi_links/field.php
rename to fields/multi_links_two_parameter/field.php
diff --git a/fields/multi_links/js/field.js b/fields/multi_links_two_parameter/js/field.js
similarity index 100%
rename from fields/multi_links/js/field.js
rename to fields/multi_links_two_parameter/js/field.js
diff --git a/fields/multi_links/js/outside.js b/fields/multi_links_two_parameter/js/outside.js
similarity index 100%
rename from fields/multi_links/js/outside.js
rename to fields/multi_links_two_parameter/js/outside.js
diff --git a/fields/multi_links/lang/ru.txt b/fields/multi_links_two_parameter/lang/ru.txt
similarity index 81%
rename from fields/multi_links/lang/ru.txt
rename to fields/multi_links_two_parameter/lang/ru.txt
index 261b752..9672713 100644
--- a/fields/multi_links/lang/ru.txt
+++ b/fields/multi_links_two_parameter/lang/ru.txt
@@ -1,5 +1,5 @@
 [admin]
-name		= "Мульти ссылки"
+name		= "Мульти ссылки (Два параметра)"
 delete		= "Удалить элемент"
 param       = "Наименование"
 value   	= "Ссылка"
diff --git a/fields/multi_links/tpl/field-doc.tpl b/fields/multi_links_two_parameter/tpl/field-doc.tpl
similarity index 100%
rename from fields/multi_links/tpl/field-doc.tpl
rename to fields/multi_links_two_parameter/tpl/field-doc.tpl
diff --git a/fields/multi_links/tpl/field-req.tpl b/fields/multi_links_two_parameter/tpl/field-req.tpl
similarity index 100%
rename from fields/multi_links/tpl/field-req.tpl
rename to fields/multi_links_two_parameter/tpl/field-req.tpl
diff --git a/fields/multi_links/tpl/field.tpl b/fields/multi_links_two_parameter/tpl/field.tpl
similarity index 83%
rename from fields/multi_links/tpl/field.tpl
rename to fields/multi_links_two_parameter/tpl/field.tpl
index 3d10930..eff19ab 100644
--- a/fields/multi_links/tpl/field.tpl
+++ b/fields/multi_links_two_parameter/tpl/field.tpl
@@ -21,7 +21,7 @@
 {foreach from=$items key=key item=item}
 
 	<div class="multi_link fix mb10" id="link_{$field_id}_{$key}" data-id="{$key}">
-		<input type="text" class="mousetrap" value="{$item.param|escape}" name="feld[{$field_id}][{$key}][param]" placeholder="{#param#}" style="width: 200px;"/>&nbsp;&nbsp;<input type="text" class="mousetrap" value="{$item.value|escape}" name="feld[{$field_id}][{$key}][value]" id="links_{$field_id}_{$key}" placeholder="{#value#}" style="width: 300px;" />&nbsp;&nbsp;<a class="btn greyishBtn" onclick="openFileWindow('links_{$field_id}_{$key}','links_{$field_id}_{$key}','links_{$field_id}_{$key}');">PDF</a>&nbsp;&nbsp;{if $key == 0}<a href="javascript:void(0);" class="button basicBtn topDir AddButton" title="{#add#}">+</a>{else}<a href="javascript:void(0);" data-id="{$field_id}_{$key}" class="button redBtn topDir DelButton" title="{#delete#}">&times;</a>{/if}
+		<input type="text" class="mousetrap" value="{$item.param|escape}" name="feld[{$field_id}][{$key}][param]" placeholder="{#param#}" style="width: 200px;"/>&nbsp;&nbsp;<input type="text" class="mousetrap" value="{$item.value|escape}" name="feld[{$field_id}][{$key}][value]" id="links_{$field_id}_{$key}" placeholder="{#value#}" style="width: 300px;" />&nbsp;&nbsp;<a class="btn greyishBtn" onclick="openFileWindow('links_{$field_id}_{$key}','links_{$field_id}_{$key}','links_{$field_id}_{$key}');">FILE</a>&nbsp;&nbsp;{if $key == 0}<a href="javascript:void(0);" class="button basicBtn topDir AddButton" title="{#add#}">+</a>{else}<a href="javascript:void(0);" data-id="{$field_id}_{$key}" class="button redBtn topDir DelButton" title="{#delete#}">&times;</a>{/if}
 		<div class="handle" style="float: left; display: inline-block; margin: 4px 7px; cursor: move;"><span class="icon_sprite ico_move"></span></div>
 	</div>
 
diff --git a/fields/multi_list_single/css/field.css b/fields/multi_list_one_parameter/css/field.css
similarity index 100%
rename from fields/multi_list_single/css/field.css
rename to fields/multi_list_one_parameter/css/field.css
diff --git a/fields/multi_list_single/field.php b/fields/multi_list_one_parameter/field.php
similarity index 100%
rename from fields/multi_list_single/field.php
rename to fields/multi_list_one_parameter/field.php
diff --git a/fields/multi_list_single/js/field.js b/fields/multi_list_one_parameter/js/field.js
similarity index 100%
rename from fields/multi_list_single/js/field.js
rename to fields/multi_list_one_parameter/js/field.js
diff --git a/fields/multi_list_single/lang/bg.txt b/fields/multi_list_one_parameter/lang/bg.txt
similarity index 100%
rename from fields/multi_list_single/lang/bg.txt
rename to fields/multi_list_one_parameter/lang/bg.txt
diff --git a/fields/multi_list_single/lang/cz.txt b/fields/multi_list_one_parameter/lang/cz.txt
similarity index 100%
rename from fields/multi_list_single/lang/cz.txt
rename to fields/multi_list_one_parameter/lang/cz.txt
diff --git a/fields/multi_list_single/lang/en.txt b/fields/multi_list_one_parameter/lang/en.txt
similarity index 100%
rename from fields/multi_list_single/lang/en.txt
rename to fields/multi_list_one_parameter/lang/en.txt
diff --git a/fields/multi_list_single/lang/pl.txt b/fields/multi_list_one_parameter/lang/pl.txt
similarity index 100%
rename from fields/multi_list_single/lang/pl.txt
rename to fields/multi_list_one_parameter/lang/pl.txt
diff --git a/fields/multi_list/lang/ru.txt b/fields/multi_list_one_parameter/lang/ru.txt
similarity index 82%
rename from fields/multi_list/lang/ru.txt
rename to fields/multi_list_one_parameter/lang/ru.txt
index a6682b0..0b952a8 100644
--- a/fields/multi_list/lang/ru.txt
+++ b/fields/multi_list_one_parameter/lang/ru.txt
@@ -1,5 +1,5 @@
 [admin]
-name		= "Мульти лист (Двойное)"
+name		= "Мульти лист (Один параметр)"
 delete		= "Удалить элемент"
 param       = "Параметр"
 value   	= "Значение"
diff --git a/fields/multi_list_single/lang/ua.txt b/fields/multi_list_one_parameter/lang/ua.txt
similarity index 100%
rename from fields/multi_list_single/lang/ua.txt
rename to fields/multi_list_one_parameter/lang/ua.txt
diff --git a/fields/multi_list_single/tpl/field-doc.tpl b/fields/multi_list_one_parameter/tpl/field-doc.tpl
similarity index 100%
rename from fields/multi_list_single/tpl/field-doc.tpl
rename to fields/multi_list_one_parameter/tpl/field-doc.tpl
diff --git a/fields/multi_list_single/tpl/field-req.tpl b/fields/multi_list_one_parameter/tpl/field-req.tpl
similarity index 100%
rename from fields/multi_list_single/tpl/field-req.tpl
rename to fields/multi_list_one_parameter/tpl/field-req.tpl
diff --git a/fields/multi_list_single/tpl/field.tpl b/fields/multi_list_one_parameter/tpl/field.tpl
similarity index 100%
rename from fields/multi_list_single/tpl/field.tpl
rename to fields/multi_list_one_parameter/tpl/field.tpl
diff --git a/fields/multi_list_triple/css/field.css b/fields/multi_list_three_parameter/css/field.css
similarity index 100%
rename from fields/multi_list_triple/css/field.css
rename to fields/multi_list_three_parameter/css/field.css
diff --git a/fields/multi_list_triple/field.php b/fields/multi_list_three_parameter/field.php
similarity index 100%
rename from fields/multi_list_triple/field.php
rename to fields/multi_list_three_parameter/field.php
diff --git a/fields/multi_list_triple/js/field.js b/fields/multi_list_three_parameter/js/field.js
similarity index 100%
rename from fields/multi_list_triple/js/field.js
rename to fields/multi_list_three_parameter/js/field.js
diff --git a/fields/multi_list_triple/lang/bg.txt b/fields/multi_list_three_parameter/lang/bg.txt
similarity index 100%
rename from fields/multi_list_triple/lang/bg.txt
rename to fields/multi_list_three_parameter/lang/bg.txt
diff --git a/fields/multi_list_triple/lang/cz.txt b/fields/multi_list_three_parameter/lang/cz.txt
similarity index 100%
rename from fields/multi_list_triple/lang/cz.txt
rename to fields/multi_list_three_parameter/lang/cz.txt
diff --git a/fields/multi_list_triple/lang/pl.txt b/fields/multi_list_three_parameter/lang/pl.txt
similarity index 100%
rename from fields/multi_list_triple/lang/pl.txt
rename to fields/multi_list_three_parameter/lang/pl.txt
diff --git a/fields/multi_list_triple/lang/ru.txt b/fields/multi_list_three_parameter/lang/ru.txt
similarity index 84%
rename from fields/multi_list_triple/lang/ru.txt
rename to fields/multi_list_three_parameter/lang/ru.txt
index 4d406a4..ad2fa3e 100644
--- a/fields/multi_list_triple/lang/ru.txt
+++ b/fields/multi_list_three_parameter/lang/ru.txt
@@ -1,5 +1,5 @@
 [admin]
-name		= "Мульти лист (Тройное)"
+name		= "Мульти лист (Три параметра)"
 delete		= "Удалить элемент"
 param       = "Параметр"
 value   	= "Значение"
diff --git a/fields/multi_list_triple/lang/ua.txt b/fields/multi_list_three_parameter/lang/ua.txt
similarity index 100%
rename from fields/multi_list_triple/lang/ua.txt
rename to fields/multi_list_three_parameter/lang/ua.txt
diff --git a/fields/multi_list_triple/tpl/field-doc.tpl b/fields/multi_list_three_parameter/tpl/field-doc.tpl
similarity index 100%
rename from fields/multi_list_triple/tpl/field-doc.tpl
rename to fields/multi_list_three_parameter/tpl/field-doc.tpl
diff --git a/fields/multi_list_triple/tpl/field-req.tpl b/fields/multi_list_three_parameter/tpl/field-req.tpl
similarity index 100%
rename from fields/multi_list_triple/tpl/field-req.tpl
rename to fields/multi_list_three_parameter/tpl/field-req.tpl
diff --git a/fields/multi_list_triple/tpl/field.tpl b/fields/multi_list_three_parameter/tpl/field.tpl
similarity index 100%
rename from fields/multi_list_triple/tpl/field.tpl
rename to fields/multi_list_three_parameter/tpl/field.tpl
diff --git a/fields/teasers/css/field.css b/fields/multi_list_two_parameter/css/field.css
similarity index 100%
rename from fields/teasers/css/field.css
rename to fields/multi_list_two_parameter/css/field.css
diff --git a/fields/multi_list/field.php b/fields/multi_list_two_parameter/field.php
similarity index 100%
rename from fields/multi_list/field.php
rename to fields/multi_list_two_parameter/field.php
diff --git a/fields/multi_list/js/field.js b/fields/multi_list_two_parameter/js/field.js
similarity index 100%
rename from fields/multi_list/js/field.js
rename to fields/multi_list_two_parameter/js/field.js
diff --git a/fields/multi_list/lang/bg.txt b/fields/multi_list_two_parameter/lang/bg.txt
similarity index 100%
rename from fields/multi_list/lang/bg.txt
rename to fields/multi_list_two_parameter/lang/bg.txt
diff --git a/fields/multi_list/lang/cz.txt b/fields/multi_list_two_parameter/lang/cz.txt
similarity index 100%
rename from fields/multi_list/lang/cz.txt
rename to fields/multi_list_two_parameter/lang/cz.txt
diff --git a/fields/multi_list/lang/en.txt b/fields/multi_list_two_parameter/lang/en.txt
similarity index 100%
rename from fields/multi_list/lang/en.txt
rename to fields/multi_list_two_parameter/lang/en.txt
diff --git a/fields/multi_list/lang/pl.txt b/fields/multi_list_two_parameter/lang/pl.txt
similarity index 100%
rename from fields/multi_list/lang/pl.txt
rename to fields/multi_list_two_parameter/lang/pl.txt
diff --git a/fields/multi_list_single/lang/ru.txt b/fields/multi_list_two_parameter/lang/ru.txt
similarity index 82%
rename from fields/multi_list_single/lang/ru.txt
rename to fields/multi_list_two_parameter/lang/ru.txt
index 8bccc75..345abb0 100644
--- a/fields/multi_list_single/lang/ru.txt
+++ b/fields/multi_list_two_parameter/lang/ru.txt
@@ -1,5 +1,5 @@
 [admin]
-name		= "Мульти лист (Одиночное)"
+name		= "Мульти лист (Два параметра)"
 delete		= "Удалить элемент"
 param       = "Параметр"
 value   	= "Значение"
diff --git a/fields/multi_list/lang/ua.txt b/fields/multi_list_two_parameter/lang/ua.txt
similarity index 100%
rename from fields/multi_list/lang/ua.txt
rename to fields/multi_list_two_parameter/lang/ua.txt
diff --git a/fields/multi_list/tpl/field-doc.tpl b/fields/multi_list_two_parameter/tpl/field-doc.tpl
similarity index 100%
rename from fields/multi_list/tpl/field-doc.tpl
rename to fields/multi_list_two_parameter/tpl/field-doc.tpl
diff --git a/fields/multi_list/tpl/field-req.tpl b/fields/multi_list_two_parameter/tpl/field-req.tpl
similarity index 100%
rename from fields/multi_list/tpl/field-req.tpl
rename to fields/multi_list_two_parameter/tpl/field-req.tpl
diff --git a/fields/multi_list/tpl/field.tpl b/fields/multi_list_two_parameter/tpl/field.tpl
similarity index 100%
rename from fields/multi_list/tpl/field.tpl
rename to fields/multi_list_two_parameter/tpl/field.tpl
diff --git a/fields/rubrics/field.php b/fields/rubrics_templates_id/field.php
similarity index 80%
rename from fields/rubrics/field.php
rename to fields/rubrics_templates_id/field.php
index 6d66bbe..55f8939 100644
--- a/fields/rubrics/field.php
+++ b/fields/rubrics_templates_id/field.php
@@ -1,15 +1,15 @@
 <?php
 
 /**
- * AVE.cms
- *
- * @package AVE.cms
- * @version 3.x
- * @filesource
- * @copyright © 2007-2015 AVE.cms, http://www.ave-cms.ru
- *
- * @license GPL v.2
- */
+* AVE.cms
+*
+* @package AVE.cms
+* @version 3.x
+* @filesource
+* @copyright © 2007-2015 AVE.cms, http://www.ave-cms.ru
+*
+* @license GPL v.2
+*/
 
 // Шаблоны рубрик
 function get_field_rubrics($field_value, $action, $field_id = 0, $tpl = '', $tpl_empty = 0, &$maxlength = null, $document_fields = array(), $rubric_id = 0, $default = null)
@@ -48,6 +48,8 @@ function get_field_rubrics($field_value, $action, $field_id = 0, $tpl = '', $tpl
 				$rubrics = array();
 
 				while($row = $sql->FetchAssocArray())
+					// ✅ ИСПРАВЛЕНИЕ: Гарантируем, что элемент массива - это ассоциативный массив (id и title)
+					// Этот код сохраняет массив ['id' => X, 'title' => Y] в массив $rubrics с числовыми ключами (0, 1, 2...)
 					array_push($rubrics, $row);
 
 				$AVE_Template->assign('default', $default);
diff --git a/fields/rubrics/lang/ru.txt b/fields/rubrics_templates_id/lang/ru.txt
similarity index 53%
rename from fields/rubrics/lang/ru.txt
rename to fields/rubrics_templates_id/lang/ru.txt
index 99e94be..b225681 100644
--- a/fields/rubrics/lang/ru.txt
+++ b/fields/rubrics_templates_id/lang/ru.txt
@@ -1,3 +1,3 @@
 [admin]
-name = "Шаблоны рубрики"
+name = "Шаблоны рубрики (Id)"
 error = "Не задана рубрика"
\ No newline at end of file
diff --git a/fields/rubrics/tpl/field.tpl b/fields/rubrics_templates_id/tpl/field.tpl
similarity index 100%
rename from fields/rubrics/tpl/field.tpl
rename to fields/rubrics_templates_id/tpl/field.tpl
diff --git a/fields/single_line/lang/ru.txt b/fields/single_line/lang/ru.txt
deleted file mode 100644
index 6b9c6ca..0000000
--- a/fields/single_line/lang/ru.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-[admin]
-name = "Однострочное"
\ No newline at end of file
diff --git a/fields/single_line_numeric/lang/ru.txt b/fields/single_line_numeric/lang/ru.txt
deleted file mode 100644
index b159408..0000000
--- a/fields/single_line_numeric/lang/ru.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-[admin]
-name = "Однострочное (Числовое)"
\ No newline at end of file
diff --git a/fields/single_line_numeric/field.php b/fields/single_line_numeric_one/field.php
similarity index 100%
rename from fields/single_line_numeric/field.php
rename to fields/single_line_numeric_one/field.php
diff --git a/fields/single_line_numeric/js/field.js b/fields/single_line_numeric_one/js/field.js
similarity index 100%
rename from fields/single_line_numeric/js/field.js
rename to fields/single_line_numeric_one/js/field.js
diff --git a/fields/single_line_numeric/lang/bg.txt b/fields/single_line_numeric_one/lang/bg.txt
similarity index 100%
rename from fields/single_line_numeric/lang/bg.txt
rename to fields/single_line_numeric_one/lang/bg.txt
diff --git a/fields/single_line_numeric/lang/cz.txt b/fields/single_line_numeric_one/lang/cz.txt
similarity index 100%
rename from fields/single_line_numeric/lang/cz.txt
rename to fields/single_line_numeric_one/lang/cz.txt
diff --git a/fields/single_line_numeric/lang/en.txt b/fields/single_line_numeric_one/lang/en.txt
similarity index 100%
rename from fields/single_line_numeric/lang/en.txt
rename to fields/single_line_numeric_one/lang/en.txt
diff --git a/fields/single_line_numeric/lang/pl.txt b/fields/single_line_numeric_one/lang/pl.txt
similarity index 100%
rename from fields/single_line_numeric/lang/pl.txt
rename to fields/single_line_numeric_one/lang/pl.txt
diff --git a/fields/single_line_numeric_one/lang/ru.txt b/fields/single_line_numeric_one/lang/ru.txt
new file mode 100644
index 0000000..4e2a288
--- /dev/null
+++ b/fields/single_line_numeric_one/lang/ru.txt
@@ -0,0 +1,2 @@
+[admin]
+name = "Однострочное (Число)"
\ No newline at end of file
diff --git a/fields/single_line_numeric/lang/ua.txt b/fields/single_line_numeric_one/lang/ua.txt
similarity index 100%
rename from fields/single_line_numeric/lang/ua.txt
rename to fields/single_line_numeric_one/lang/ua.txt
diff --git a/fields/single_line_numeric/tpl/field-doc.tpl b/fields/single_line_numeric_one/tpl/field-doc.tpl
similarity index 100%
rename from fields/single_line_numeric/tpl/field-doc.tpl
rename to fields/single_line_numeric_one/tpl/field-doc.tpl
diff --git a/fields/single_line_numeric/tpl/field-req.tpl b/fields/single_line_numeric_one/tpl/field-req.tpl
similarity index 100%
rename from fields/single_line_numeric/tpl/field-req.tpl
rename to fields/single_line_numeric_one/tpl/field-req.tpl
diff --git a/fields/single_line_numeric/tpl/field.tpl b/fields/single_line_numeric_one/tpl/field.tpl
similarity index 100%
rename from fields/single_line_numeric/tpl/field.tpl
rename to fields/single_line_numeric_one/tpl/field.tpl
diff --git a/fields/single_line_numeric_three/lang/ru.txt b/fields/single_line_numeric_three/lang/ru.txt
index 1cba424..2db1cd2 100644
--- a/fields/single_line_numeric_three/lang/ru.txt
+++ b/fields/single_line_numeric_three/lang/ru.txt
@@ -1,2 +1,2 @@
 [admin]
-name = "Однострочное (Числовое тройное)"
\ No newline at end of file
+name = "Однострочное (Три числа)"
\ No newline at end of file
diff --git a/fields/single_line_numeric_two/lang/ru.txt b/fields/single_line_numeric_two/lang/ru.txt
index 0ce29ac..98f1752 100644
--- a/fields/single_line_numeric_two/lang/ru.txt
+++ b/fields/single_line_numeric_two/lang/ru.txt
@@ -1,2 +1,2 @@
 [admin]
-name = "Однострочное (Числовое двойное)"
\ No newline at end of file
+name = "Однострочное (Два числа)"
\ No newline at end of file
diff --git a/fields/single_line/field.php b/fields/single_line_string/field.php
similarity index 100%
rename from fields/single_line/field.php
rename to fields/single_line_string/field.php
diff --git a/fields/single_line/lang/bg.txt b/fields/single_line_string/lang/bg.txt
similarity index 100%
rename from fields/single_line/lang/bg.txt
rename to fields/single_line_string/lang/bg.txt
diff --git a/fields/single_line/lang/cz.txt b/fields/single_line_string/lang/cz.txt
similarity index 100%
rename from fields/single_line/lang/cz.txt
rename to fields/single_line_string/lang/cz.txt
diff --git a/fields/single_line/lang/en.txt b/fields/single_line_string/lang/en.txt
similarity index 100%
rename from fields/single_line/lang/en.txt
rename to fields/single_line_string/lang/en.txt
diff --git a/fields/single_line/lang/pl.txt b/fields/single_line_string/lang/pl.txt
similarity index 100%
rename from fields/single_line/lang/pl.txt
rename to fields/single_line_string/lang/pl.txt
diff --git a/fields/single_line_string/lang/ru.txt b/fields/single_line_string/lang/ru.txt
new file mode 100644
index 0000000..82d8b34
--- /dev/null
+++ b/fields/single_line_string/lang/ru.txt
@@ -0,0 +1,2 @@
+[admin]
+name = "Однострочное (Строка)"
\ No newline at end of file
diff --git a/fields/single_line/lang/ua.txt b/fields/single_line_string/lang/ua.txt
similarity index 100%
rename from fields/single_line/lang/ua.txt
rename to fields/single_line_string/lang/ua.txt
diff --git a/fields/single_line/tpl/field-doc.tpl b/fields/single_line_string/tpl/field-doc.tpl
similarity index 100%
rename from fields/single_line/tpl/field-doc.tpl
rename to fields/single_line_string/tpl/field-doc.tpl
diff --git a/fields/single_line/tpl/field-req.tpl b/fields/single_line_string/tpl/field-req.tpl
similarity index 100%
rename from fields/single_line/tpl/field-req.tpl
rename to fields/single_line_string/tpl/field-req.tpl
diff --git a/fields/single_line/tpl/field.tpl b/fields/single_line_string/tpl/field.tpl
similarity index 100%
rename from fields/single_line/tpl/field.tpl
rename to fields/single_line_string/tpl/field.tpl
diff --git a/fields/youtube/field.php b/fields/youtube_video/field.php
similarity index 100%
rename from fields/youtube/field.php
rename to fields/youtube_video/field.php
diff --git a/fields/youtube/lang/bg.txt b/fields/youtube_video/lang/bg.txt
similarity index 100%
rename from fields/youtube/lang/bg.txt
rename to fields/youtube_video/lang/bg.txt
diff --git a/fields/youtube/lang/cz.txt b/fields/youtube_video/lang/cz.txt
similarity index 100%
rename from fields/youtube/lang/cz.txt
rename to fields/youtube_video/lang/cz.txt
diff --git a/fields/youtube/lang/en.txt b/fields/youtube_video/lang/en.txt
similarity index 100%
rename from fields/youtube/lang/en.txt
rename to fields/youtube_video/lang/en.txt
diff --git a/fields/youtube/lang/pl.txt b/fields/youtube_video/lang/pl.txt
similarity index 100%
rename from fields/youtube/lang/pl.txt
rename to fields/youtube_video/lang/pl.txt
diff --git a/fields/youtube/lang/ru.txt b/fields/youtube_video/lang/ru.txt
similarity index 88%
rename from fields/youtube/lang/ru.txt
rename to fields/youtube_video/lang/ru.txt
index 8bc8292..d118a62 100644
--- a/fields/youtube/lang/ru.txt
+++ b/fields/youtube_video/lang/ru.txt
@@ -1,5 +1,5 @@
 [admin]
-name = "YouTube"
+name = "Видео с YouTube"
 f_url = "Ссылка"
 f_width = "Ширина"
 f_height = "Высота"
diff --git a/fields/youtube/lang/ua.txt b/fields/youtube_video/lang/ua.txt
similarity index 100%
rename from fields/youtube/lang/ua.txt
rename to fields/youtube_video/lang/ua.txt
diff --git a/fields/youtube/tpl/field-doc.tpl b/fields/youtube_video/tpl/field-doc.tpl
similarity index 100%
rename from fields/youtube/tpl/field-doc.tpl
rename to fields/youtube_video/tpl/field-doc.tpl
diff --git a/fields/youtube/tpl/field-req.tpl b/fields/youtube_video/tpl/field-req.tpl
similarity index 100%
rename from fields/youtube/tpl/field-req.tpl
rename to fields/youtube_video/tpl/field-req.tpl
diff --git a/fields/youtube/tpl/field.tpl b/fields/youtube_video/tpl/field.tpl
similarity index 100%
rename from fields/youtube/tpl/field.tpl
rename to fields/youtube_video/tpl/field.tpl