diff --git a/docs/software/ubuntu/add-disk.md b/docs/ubuntu/add-disk.md
similarity index 99%
rename from docs/software/ubuntu/add-disk.md
rename to docs/ubuntu/add-disk.md
index 4b83489..601cea2 100755
--- a/docs/software/ubuntu/add-disk.md
+++ b/docs/ubuntu/add-disk.md
@@ -8,7 +8,7 @@
 fdisk -l
 ```
 
-![](../../images/ubuntu/add-disk.png)
+![](../images/ubuntu/add-disk.png)
 
 ## Создаем GPT
 
diff --git a/docs/software/ubuntu/add-s3.md b/docs/ubuntu/add-s3.md
similarity index 100%
rename from docs/software/ubuntu/add-s3.md
rename to docs/ubuntu/add-s3.md
diff --git a/docs/software/ubuntu/backup/db.md b/docs/ubuntu/backup/db.md
similarity index 100%
rename from docs/software/ubuntu/backup/db.md
rename to docs/ubuntu/backup/db.md
diff --git a/docs/software/ubuntu/backup/google.md b/docs/ubuntu/backup/google.md
similarity index 100%
rename from docs/software/ubuntu/backup/google.md
rename to docs/ubuntu/backup/google.md
diff --git a/docs/software/ubuntu/backup/yandex.md b/docs/ubuntu/backup/yandex.md
similarity index 100%
rename from docs/software/ubuntu/backup/yandex.md
rename to docs/ubuntu/backup/yandex.md
diff --git a/docs/software/ubuntu/bash-aliases.md b/docs/ubuntu/bash-aliases.md
similarity index 100%
rename from docs/software/ubuntu/bash-aliases.md
rename to docs/ubuntu/bash-aliases.md
diff --git a/docs/software/ubuntu/commands.md b/docs/ubuntu/commands.md
similarity index 100%
rename from docs/software/ubuntu/commands.md
rename to docs/ubuntu/commands.md
diff --git a/docs/software/ubuntu/docker-ufw.md b/docs/ubuntu/docker-ufw.md
similarity index 99%
rename from docs/software/ubuntu/docker-ufw.md
rename to docs/ubuntu/docker-ufw.md
index 0abfdef..57d6ed9 100755
--- a/docs/software/ubuntu/docker-ufw.md
+++ b/docs/ubuntu/docker-ufw.md
@@ -1,6 +1,6 @@
 # Как использовать Docker с UFW одновременно
 
-![](../../images/ubuntu/docker-and-ufw.jpg)
+![](../images/ubuntu/docker-and-ufw.jpg)
 
 Удивительно, но Docker не работает из коробки с “Universal Firewall” Linux, или UFW.
 ## Почему Docker не работает с UFW?
diff --git a/docs/software/ubuntu/errors.md b/docs/ubuntu/errors.md
similarity index 100%
rename from docs/software/ubuntu/errors.md
rename to docs/ubuntu/errors.md
diff --git a/docs/software/ubuntu/hpe/hpe-mcp.md b/docs/ubuntu/hpe/hpe-mcp.md
similarity index 100%
rename from docs/software/ubuntu/hpe/hpe-mcp.md
rename to docs/ubuntu/hpe/hpe-mcp.md
diff --git a/docs/software/ubuntu/index.md b/docs/ubuntu/index.md
similarity index 100%
rename from docs/software/ubuntu/index.md
rename to docs/ubuntu/index.md
diff --git a/docs/software/ubuntu/lvm.md b/docs/ubuntu/lvm.md
similarity index 100%
rename from docs/software/ubuntu/lvm.md
rename to docs/ubuntu/lvm.md
diff --git a/docs/software/ubuntu/mariadb.md b/docs/ubuntu/mariadb.md
similarity index 100%
rename from docs/software/ubuntu/mariadb.md
rename to docs/ubuntu/mariadb.md
diff --git a/docs/software/ubuntu/mount-cifs.md b/docs/ubuntu/mount-cifs.md
similarity index 100%
rename from docs/software/ubuntu/mount-cifs.md
rename to docs/ubuntu/mount-cifs.md
diff --git a/docs/software/ubuntu/proxy-system.md b/docs/ubuntu/proxy-system.md
similarity index 100%
rename from docs/software/ubuntu/proxy-system.md
rename to docs/ubuntu/proxy-system.md
diff --git a/docs/software/ubuntu/telegraf.md b/docs/ubuntu/telegraf.md
similarity index 100%
rename from docs/software/ubuntu/telegraf.md
rename to docs/ubuntu/telegraf.md
diff --git a/docs/software/ubuntu/watchdog.md b/docs/ubuntu/watchdog.md
similarity index 100%
rename from docs/software/ubuntu/watchdog.md
rename to docs/ubuntu/watchdog.md
diff --git a/docs/software/ubuntu/webdav/google.md b/docs/ubuntu/webdav/google.md
similarity index 100%
rename from docs/software/ubuntu/webdav/google.md
rename to docs/ubuntu/webdav/google.md
diff --git a/docs/software/ubuntu/webdav/yandex.md b/docs/ubuntu/webdav/yandex.md
similarity index 100%
rename from docs/software/ubuntu/webdav/yandex.md
rename to docs/ubuntu/webdav/yandex.md
diff --git a/docs/software/ubuntu/xrdp.md b/docs/ubuntu/xrdp.md
similarity index 100%
rename from docs/software/ubuntu/xrdp.md
rename to docs/ubuntu/xrdp.md
diff --git a/mkdocs.yml b/mkdocs.yml
index 1b4f04a..7cf6c9f 100755
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -29,31 +29,33 @@ nav:
       - Игровые сервера:
         - Valheim: docker/games/valheim.md
       - WikiJS: docker/wikijs.md
+  - Ubuntu Server:
+    - ubuntu/index.md
+    - Команды: ubuntu/commands.md
+    - Ошибки консоли: ubuntu/errors.md
+    - Добавление диска: ubuntu/add-disk.md
+    - Добавление S3: ubuntu/add-s3.md
+    - LVM: ubuntu/lvm.md
+    - HPE:
+      - Management Component Pack: ubuntu/hpe/hpe-mcp.md
+    - Docker+UFW: ubuntu/docker-ufw.md
+    - Монтирование CIFS: ubuntu/mount-cifs.md
+    - Ubuntu bash aliases: ubuntu/bash-aliases.md
+    - Установка xRDP: ubuntu/xrdp.md
+    - Использование Proxy: ubuntu/proxy-system.md
+    - Watchdog: ubuntu/watchdog.md
+    - Backup:
+      - Google Диск: ubuntu/backup/google.md
+      - Yandex: ubuntu/backup/yandex.md
+      - Базы данных: ubuntu/backup/db.md
+    - WebDAV:
+      - Google Диск: ubuntu/webdav/google.md
+      - Yandex: ubuntu/webdav/yandex.md
+    - Софт:
+      - MariaDB: ubuntu/mariadb.md
+      - Telegraf: ubuntu/telegraf.md
+      - Redis: ubuntu/redis.md
   - Software:
-    - Ubuntu 22:
-      - software/ubuntu/index.md
-      - Команды: software/ubuntu/commands.md
-      - Ошибки консоли: software/ubuntu/errors.md
-      - Добавление диска: software/ubuntu/add-disk.md
-      - Добавление S3: software/ubuntu/add-s3.md
-      - LVM: software/ubuntu/lvm.md
-      - HPE:
-          - Management Component Pack: software/ubuntu/hpe/hpe-mcp.md
-      - MariaDB: software/ubuntu/mariadb.md
-      - Telegraf: software/ubuntu/telegraf.md
-      - Docker+UFW: software/ubuntu/docker-ufw.md
-      - Монтирование CIFS: software/ubuntu/mount-cifs.md
-      - Ubuntu bash aliases: software/ubuntu/bash-aliases.md
-      - Установка xRDP: software/ubuntu/xrdp.md
-      - Использование Proxy: software/ubuntu/proxy-system.md
-      - Watchdog: software/ubuntu/watchdog.md
-      - Backup:
-        - Google Диск: software/ubuntu/backup/google.md
-        - Yandex: software/ubuntu/backup/yandex.md
-        - Базы данных: software/ubuntu/backup/db.md
-      - WebDAV:
-        - Google Диск: software/ubuntu/webdav/google.md
-        - Yandex: software/ubuntu/webdav/yandex.md
     - Powershell:
       - software/powershell/index.md
       - Active Directiry: software/powershell/ad.md