diff --git a/logs_collector/apps/__init__.py b/logs_collector/account/__init__.py
similarity index 100%
rename from logs_collector/apps/__init__.py
rename to logs_collector/account/__init__.py
diff --git a/logs_collector/apps/account/admin.py b/logs_collector/account/admin.py
similarity index 100%
rename from logs_collector/apps/account/admin.py
rename to logs_collector/account/admin.py
diff --git a/logs_collector/apps/account/apps.py b/logs_collector/account/apps.py
similarity index 87%
rename from logs_collector/apps/account/apps.py
rename to logs_collector/account/apps.py
index 7b95a04..0440b20 100644
--- a/logs_collector/apps/account/apps.py
+++ b/logs_collector/account/apps.py
@@ -3,5 +3,5 @@ from django.apps import AppConfig
 
 class AccountConfig(AppConfig):
     default_auto_field = 'django.db.models.BigAutoField'
-    name = 'apps.account'
+    name = 'account'
     verbose_name = 'Auth and account management'
diff --git a/logs_collector/apps/account/__init__.py b/logs_collector/account/migrations/__init__.py
similarity index 100%
rename from logs_collector/apps/account/__init__.py
rename to logs_collector/account/migrations/__init__.py
diff --git a/logs_collector/apps/account/models.py b/logs_collector/account/models.py
similarity index 100%
rename from logs_collector/apps/account/models.py
rename to logs_collector/account/models.py
diff --git a/logs_collector/apps/account/tests.py b/logs_collector/account/tests.py
similarity index 100%
rename from logs_collector/apps/account/tests.py
rename to logs_collector/account/tests.py
diff --git a/logs_collector/apps/account/urls.py b/logs_collector/account/urls.py
similarity index 100%
rename from logs_collector/apps/account/urls.py
rename to logs_collector/account/urls.py
diff --git a/logs_collector/apps/account/utils.py b/logs_collector/account/utils.py
similarity index 100%
rename from logs_collector/apps/account/utils.py
rename to logs_collector/account/utils.py
diff --git a/logs_collector/apps/account/views.py b/logs_collector/account/views.py
similarity index 100%
rename from logs_collector/apps/account/views.py
rename to logs_collector/account/views.py
diff --git a/logs_collector/apps/collector/templatetags/__init__.py b/logs_collector/apps/collector/templatetags/__init__.py
deleted file mode 100644
index e69de29..0000000
diff --git a/logs_collector/apps/account/migrations/__init__.py b/logs_collector/collector/__init__.py
similarity index 100%
rename from logs_collector/apps/account/migrations/__init__.py
rename to logs_collector/collector/__init__.py
diff --git a/logs_collector/apps/collector/admin.py b/logs_collector/collector/admin.py
similarity index 100%
rename from logs_collector/apps/collector/admin.py
rename to logs_collector/collector/admin.py
diff --git a/logs_collector/apps/collector/__init__.py b/logs_collector/collector/api/__init__.py
similarity index 100%
rename from logs_collector/apps/collector/__init__.py
rename to logs_collector/collector/api/__init__.py
diff --git a/logs_collector/apps/collector/api/filters.py b/logs_collector/collector/api/filters.py
similarity index 94%
rename from logs_collector/apps/collector/api/filters.py
rename to logs_collector/collector/api/filters.py
index be4e913..bfa635b 100644
--- a/logs_collector/apps/collector/api/filters.py
+++ b/logs_collector/collector/api/filters.py
@@ -5,7 +5,7 @@ from django_filters.rest_framework import (
 )
 from django_filters import widgets
 
-from apps.collector.models import Archive, Ticket
+from collector.models import Archive, Ticket
 from .utils import DateTimeFilterMixin
 
 
diff --git a/logs_collector/apps/collector/api/permissions.py b/logs_collector/collector/api/permissions.py
similarity index 100%
rename from logs_collector/apps/collector/api/permissions.py
rename to logs_collector/collector/api/permissions.py
diff --git a/logs_collector/apps/collector/api/serializers.py b/logs_collector/collector/api/serializers.py
similarity index 96%
rename from logs_collector/apps/collector/api/serializers.py
rename to logs_collector/collector/api/serializers.py
index affc8d8..064bb83 100644
--- a/logs_collector/apps/collector/api/serializers.py
+++ b/logs_collector/collector/api/serializers.py
@@ -3,7 +3,7 @@ from rest_framework import serializers
 from drf_spectacular.utils import extend_schema_field
 from drf_spectacular.openapi import OpenApiTypes
 
-from apps.collector.models import Archive, Platform, Ticket
+from collector.models import Archive, Platform, Ticket
 
 
 @extend_schema_field(OpenApiTypes.NUMBER)
diff --git a/logs_collector/apps/collector/api/urls.py b/logs_collector/collector/api/urls.py
similarity index 100%
rename from logs_collector/apps/collector/api/urls.py
rename to logs_collector/collector/api/urls.py
diff --git a/logs_collector/apps/collector/api/utils.py b/logs_collector/collector/api/utils.py
similarity index 100%
rename from logs_collector/apps/collector/api/utils.py
rename to logs_collector/collector/api/utils.py
diff --git a/logs_collector/apps/collector/api/views.py b/logs_collector/collector/api/views.py
similarity index 98%
rename from logs_collector/apps/collector/api/views.py
rename to logs_collector/collector/api/views.py
index 1b26aa5..bd78c74 100644
--- a/logs_collector/apps/collector/api/views.py
+++ b/logs_collector/collector/api/views.py
@@ -10,7 +10,7 @@ from rest_framework import filters
 
 from django_filters.rest_framework import DjangoFilterBackend
 
-from apps.collector.models import Archive, Ticket, Platform  # ???????
+from collector.models import Archive, Ticket, Platform
 
 from .filters import ArchiveFilter, TicketFilter
 from .permissions import IsGuestUpload
diff --git a/logs_collector/apps/collector/apps.py b/logs_collector/collector/apps.py
similarity index 86%
rename from logs_collector/apps/collector/apps.py
rename to logs_collector/collector/apps.py
index 0db3de5..9ee5f0b 100644
--- a/logs_collector/apps/collector/apps.py
+++ b/logs_collector/collector/apps.py
@@ -3,5 +3,5 @@ from django.apps import AppConfig
 
 class CollectorConfig(AppConfig):
     default_auto_field = 'django.db.models.BigAutoField'
-    name = 'apps.collector'
+    name = 'collector'
     verbose_name = 'Collector archives for analyse'
diff --git a/logs_collector/apps/collector/forms.py b/logs_collector/collector/forms.py
similarity index 100%
rename from logs_collector/apps/collector/forms.py
rename to logs_collector/collector/forms.py
diff --git a/logs_collector/apps/collector/migrations/0001_initial.py b/logs_collector/collector/migrations/0001_initial.py
similarity index 95%
rename from logs_collector/apps/collector/migrations/0001_initial.py
rename to logs_collector/collector/migrations/0001_initial.py
index 4fd914f..4607b91 100644
--- a/logs_collector/apps/collector/migrations/0001_initial.py
+++ b/logs_collector/collector/migrations/0001_initial.py
@@ -1,6 +1,6 @@
-# Generated by Django 4.2 on 2023-08-14 09:07
+# Generated by Django 4.2 on 2023-08-15 03:58
 
-import apps.collector.utils
+import collector.utils
 from django.conf import settings
 import django.core.files.storage
 import django.core.validators
@@ -49,7 +49,7 @@ class Migration(migrations.Migration):
             name='Archive',
             fields=[
                 ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('file', models.FileField(blank=True, null=True, storage=django.core.files.storage.FileSystemStorage(base_url='/archives/', location=pathlib.PurePosixPath('/home/stepan/Documents/Dev/ISPsystem/logs-collector/logs_collector/archives')), upload_to=apps.collector.utils.logs_dir_path)),
+                ('file', models.FileField(blank=True, null=True, storage=django.core.files.storage.FileSystemStorage(base_url='/archives/', location=pathlib.PurePosixPath('/home/stepan/Documents/Dev/ISPsystem/logs-collector/logs_collector/archives')), upload_to=collector.utils.logs_dir_path)),
                 ('md5', models.CharField(editable=False, max_length=1024)),
                 ('time_create', models.DateTimeField(auto_now_add=True)),
                 ('time_update', models.DateTimeField(auto_now=True)),
diff --git a/logs_collector/apps/collector/api/__init__.py b/logs_collector/collector/migrations/__init__.py
similarity index 100%
rename from logs_collector/apps/collector/api/__init__.py
rename to logs_collector/collector/migrations/__init__.py
diff --git a/logs_collector/apps/collector/models.py b/logs_collector/collector/models.py
similarity index 100%
rename from logs_collector/apps/collector/models.py
rename to logs_collector/collector/models.py
diff --git a/logs_collector/apps/collector/static/collector/css/bootstrap.min.css b/logs_collector/collector/static/collector/css/bootstrap.min.css
similarity index 100%
rename from logs_collector/apps/collector/static/collector/css/bootstrap.min.css
rename to logs_collector/collector/static/collector/css/bootstrap.min.css
diff --git a/logs_collector/apps/collector/static/collector/css/bootstrap.min.css.map b/logs_collector/collector/static/collector/css/bootstrap.min.css.map
similarity index 100%
rename from logs_collector/apps/collector/static/collector/css/bootstrap.min.css.map
rename to logs_collector/collector/static/collector/css/bootstrap.min.css.map
diff --git a/logs_collector/apps/collector/static/collector/img/android-chrome-192x192.png b/logs_collector/collector/static/collector/img/android-chrome-192x192.png
similarity index 100%
rename from logs_collector/apps/collector/static/collector/img/android-chrome-192x192.png
rename to logs_collector/collector/static/collector/img/android-chrome-192x192.png
diff --git a/logs_collector/apps/collector/static/collector/img/android-chrome-512x512.png b/logs_collector/collector/static/collector/img/android-chrome-512x512.png
similarity index 100%
rename from logs_collector/apps/collector/static/collector/img/android-chrome-512x512.png
rename to logs_collector/collector/static/collector/img/android-chrome-512x512.png
diff --git a/logs_collector/apps/collector/static/collector/img/apple-touch-icon.png b/logs_collector/collector/static/collector/img/apple-touch-icon.png
similarity index 100%
rename from logs_collector/apps/collector/static/collector/img/apple-touch-icon.png
rename to logs_collector/collector/static/collector/img/apple-touch-icon.png
diff --git a/logs_collector/apps/collector/static/collector/img/favicon-16x16.png b/logs_collector/collector/static/collector/img/favicon-16x16.png
similarity index 100%
rename from logs_collector/apps/collector/static/collector/img/favicon-16x16.png
rename to logs_collector/collector/static/collector/img/favicon-16x16.png
diff --git a/logs_collector/apps/collector/static/collector/img/favicon-32x32.png b/logs_collector/collector/static/collector/img/favicon-32x32.png
similarity index 100%
rename from logs_collector/apps/collector/static/collector/img/favicon-32x32.png
rename to logs_collector/collector/static/collector/img/favicon-32x32.png
diff --git a/logs_collector/apps/collector/static/collector/img/favicon.ico b/logs_collector/collector/static/collector/img/favicon.ico
similarity index 100%
rename from logs_collector/apps/collector/static/collector/img/favicon.ico
rename to logs_collector/collector/static/collector/img/favicon.ico
diff --git a/logs_collector/apps/collector/static/collector/img/site.webmanifest b/logs_collector/collector/static/collector/img/site.webmanifest
similarity index 100%
rename from logs_collector/apps/collector/static/collector/img/site.webmanifest
rename to logs_collector/collector/static/collector/img/site.webmanifest
diff --git a/logs_collector/apps/collector/static/collector/js/bootstrap.bundle.min.js b/logs_collector/collector/static/collector/js/bootstrap.bundle.min.js
similarity index 100%
rename from logs_collector/apps/collector/static/collector/js/bootstrap.bundle.min.js
rename to logs_collector/collector/static/collector/js/bootstrap.bundle.min.js
diff --git a/logs_collector/apps/collector/static/collector/js/bootstrap.bundle.min.js.map b/logs_collector/collector/static/collector/js/bootstrap.bundle.min.js.map
similarity index 100%
rename from logs_collector/apps/collector/static/collector/js/bootstrap.bundle.min.js.map
rename to logs_collector/collector/static/collector/js/bootstrap.bundle.min.js.map
diff --git a/logs_collector/apps/collector/static/collector/js/bs.theme.mode.js b/logs_collector/collector/static/collector/js/bs.theme.mode.js
similarity index 100%
rename from logs_collector/apps/collector/static/collector/js/bs.theme.mode.js
rename to logs_collector/collector/static/collector/js/bs.theme.mode.js
diff --git a/logs_collector/apps/collector/static/collector/js/bs.tooltip.js b/logs_collector/collector/static/collector/js/bs.tooltip.js
similarity index 100%
rename from logs_collector/apps/collector/static/collector/js/bs.tooltip.js
rename to logs_collector/collector/static/collector/js/bs.tooltip.js
diff --git a/logs_collector/apps/collector/static/collector/js/jq.ticket.detail.js b/logs_collector/collector/static/collector/js/jq.ticket.detail.js
similarity index 100%
rename from logs_collector/apps/collector/static/collector/js/jq.ticket.detail.js
rename to logs_collector/collector/static/collector/js/jq.ticket.detail.js
diff --git a/logs_collector/apps/collector/static/collector/js/jquery-3.7.0.min.js b/logs_collector/collector/static/collector/js/jquery-3.7.0.min.js
similarity index 100%
rename from logs_collector/apps/collector/static/collector/js/jquery-3.7.0.min.js
rename to logs_collector/collector/static/collector/js/jquery-3.7.0.min.js
diff --git a/logs_collector/apps/collector/templates/collector/base.html b/logs_collector/collector/templates/collector/base.html
similarity index 100%
rename from logs_collector/apps/collector/templates/collector/base.html
rename to logs_collector/collector/templates/collector/base.html
diff --git a/logs_collector/apps/collector/templates/collector/includes/modal_archive.html b/logs_collector/collector/templates/collector/includes/modal_archive.html
similarity index 100%
rename from logs_collector/apps/collector/templates/collector/includes/modal_archive.html
rename to logs_collector/collector/templates/collector/includes/modal_archive.html
diff --git a/logs_collector/apps/collector/templates/collector/includes/modal_ticket.html b/logs_collector/collector/templates/collector/includes/modal_ticket.html
similarity index 100%
rename from logs_collector/apps/collector/templates/collector/includes/modal_ticket.html
rename to logs_collector/collector/templates/collector/includes/modal_ticket.html
diff --git a/logs_collector/apps/collector/templates/collector/includes/pagination.html b/logs_collector/collector/templates/collector/includes/pagination.html
similarity index 100%
rename from logs_collector/apps/collector/templates/collector/includes/pagination.html
rename to logs_collector/collector/templates/collector/includes/pagination.html
diff --git a/logs_collector/apps/collector/templates/collector/includes/ticket_archives.html b/logs_collector/collector/templates/collector/includes/ticket_archives.html
similarity index 100%
rename from logs_collector/apps/collector/templates/collector/includes/ticket_archives.html
rename to logs_collector/collector/templates/collector/includes/ticket_archives.html
diff --git a/logs_collector/apps/collector/templates/collector/includes/ticket_info.html b/logs_collector/collector/templates/collector/includes/ticket_info.html
similarity index 100%
rename from logs_collector/apps/collector/templates/collector/includes/ticket_info.html
rename to logs_collector/collector/templates/collector/includes/ticket_info.html
diff --git a/logs_collector/apps/collector/templates/collector/ticket.html b/logs_collector/collector/templates/collector/ticket.html
similarity index 100%
rename from logs_collector/apps/collector/templates/collector/ticket.html
rename to logs_collector/collector/templates/collector/ticket.html
diff --git a/logs_collector/apps/collector/templates/collector/ticket_create.html b/logs_collector/collector/templates/collector/ticket_create.html
similarity index 100%
rename from logs_collector/apps/collector/templates/collector/ticket_create.html
rename to logs_collector/collector/templates/collector/ticket_create.html
diff --git a/logs_collector/apps/collector/templates/collector/ticket_delete.html b/logs_collector/collector/templates/collector/ticket_delete.html
similarity index 100%
rename from logs_collector/apps/collector/templates/collector/ticket_delete.html
rename to logs_collector/collector/templates/collector/ticket_delete.html
diff --git a/logs_collector/apps/collector/templates/collector/tickets.html b/logs_collector/collector/templates/collector/tickets.html
similarity index 100%
rename from logs_collector/apps/collector/templates/collector/tickets.html
rename to logs_collector/collector/templates/collector/tickets.html
diff --git a/logs_collector/apps/collector/migrations/__init__.py b/logs_collector/collector/templatetags/__init__.py
similarity index 100%
rename from logs_collector/apps/collector/migrations/__init__.py
rename to logs_collector/collector/templatetags/__init__.py
diff --git a/logs_collector/apps/collector/templatetags/collector_extras.py b/logs_collector/collector/templatetags/collector_extras.py
similarity index 96%
rename from logs_collector/apps/collector/templatetags/collector_extras.py
rename to logs_collector/collector/templatetags/collector_extras.py
index bec170f..c4e4d77 100644
--- a/logs_collector/apps/collector/templatetags/collector_extras.py
+++ b/logs_collector/collector/templatetags/collector_extras.py
@@ -2,7 +2,7 @@ import markdown as md
 from django import template
 from django.template.defaultfilters import stringfilter
 
-from apps.collector.models import Platform
+from collector.models import Platform
 
 
 register = template.Library()
diff --git a/logs_collector/apps/collector/tests.py b/logs_collector/collector/tests.py
similarity index 100%
rename from logs_collector/apps/collector/tests.py
rename to logs_collector/collector/tests.py
diff --git a/logs_collector/apps/collector/urls.py b/logs_collector/collector/urls.py
similarity index 100%
rename from logs_collector/apps/collector/urls.py
rename to logs_collector/collector/urls.py
diff --git a/logs_collector/apps/collector/utils.py b/logs_collector/collector/utils.py
similarity index 100%
rename from logs_collector/apps/collector/utils.py
rename to logs_collector/collector/utils.py
diff --git a/logs_collector/apps/collector/views.py b/logs_collector/collector/views.py
similarity index 100%
rename from logs_collector/apps/collector/views.py
rename to logs_collector/collector/views.py
diff --git a/logs_collector/logs_collector/settings.py b/logs_collector/logs_collector/settings.py
index f7197c8..2a27f35 100644
--- a/logs_collector/logs_collector/settings.py
+++ b/logs_collector/logs_collector/settings.py
@@ -35,8 +35,8 @@ INSTALLED_APPS = [
     'django.contrib.sessions',
     'django.contrib.messages',
     'django.contrib.staticfiles',
-    'apps.collector.apps.CollectorConfig',  # main app
-    'apps.account.apps.AccountConfig',  # account app
+    'collector.apps.CollectorConfig',  # main app
+    'account.apps.AccountConfig',  # account app
     'rest_framework',
     'rest_framework_simplejwt',
     'django_filters',
diff --git a/logs_collector/logs_collector/urls.py b/logs_collector/logs_collector/urls.py
index a5ed7e1..eac5e33 100644
--- a/logs_collector/logs_collector/urls.py
+++ b/logs_collector/logs_collector/urls.py
@@ -11,7 +11,7 @@ from drf_spectacular.views import (
 from two_factor.urls import urlpatterns as tf_urls
 
 from logs_collector import settings
-from apps.account.utils import AdminSiteOTPRequiredMixinRedirectSetup
+from account.utils import AdminSiteOTPRequiredMixinRedirectSetup
 
 
 # ? 2FA patch (Admin site protection)
@@ -25,7 +25,7 @@ urlpatterns = [
     ),
     path(
         '',
-        include('apps.collector.urls', namespace='collector')
+        include('collector.urls', namespace='collector')
     ),
     path(
         '',
@@ -33,11 +33,11 @@ urlpatterns = [
     ),
     path(
         '',
-        include('apps.account.urls', namespace='account')
+        include('account.urls', namespace='account')
     ),
     path(
         'api/',
-        include('apps.collector.api.urls', namespace='collector_api')
+        include('collector.api.urls', namespace='collector_api')
     ),
 ]