diff --git a/live_monitor_vue/Makefile b/live_monitor_vue/Makefile
index 67249b4..86684e2 100644
--- a/live_monitor_vue/Makefile
+++ b/live_monitor_vue/Makefile
@@ -27,4 +27,4 @@ ifeq ($(commit),)
 	$(error mn is not set)
 endif
 	make prehook
-	git add . && git commit -m "feat($(commit)):" && git push
+	git add . && git commit -m "$(commit)" && git push
diff --git a/live_monitor_vue/src/adapters/AdapterOfPacks.js b/live_monitor_vue/src/adapters/AdapterOfPacks.js
new file mode 100644
index 0000000..2564571
--- /dev/null
+++ b/live_monitor_vue/src/adapters/AdapterOfPacks.js
@@ -0,0 +1,8 @@
+class AdapterOfPacks {
+  constructor(url) {
+    this.url = url
+  }
+
+}
+
+export default AdapterOfPacks
\ No newline at end of file
diff --git a/live_monitor_vue/src/components/1_atoms/OneVideo.vue b/live_monitor_vue/src/components/1_atoms/OneVideo.vue
deleted file mode 100644
index 0b4e414..0000000
--- a/live_monitor_vue/src/components/1_atoms/OneVideo.vue
+++ /dev/null
@@ -1,109 +0,0 @@
-<template>
-  <div class="flex border-8 w-1/2 flex-col py-1 gap-y-5">
-    <div class="flex flex-row gap-y-5  w-full justify-between">
-      <fwb-p
-        v-if="!isEdit"
-        class="self-center px-5"
-      >
-        {{ label }}
-      </fwb-p>
-      <div
-        class="flex flex-row gap-x-5 justify-between"
-        :class="{'w-full': isEdit}"
-      >
-        <fwb-input
-          v-if="isEdit"
-          class="w-full"
-          :model-value="realLink"
-          @update:model-value="args => {tempLink = args}"
-        />
-        <ButtonEdit
-          v-if="!isEdit"
-          :on-click="() => {isEdit = true}"
-        />
-        <ButtonSave
-          v-if="isEdit"
-          :on-click="() => {clickSave()}"
-        />
-        <ButtonDiscard
-          v-if="isEdit"
-          :on-click="() => {clickDiscard()}"
-        />
-      </div>
-    </div>
-    <YouTube
-      v-if="isLinkNormal && isReady"
-      ref="youtube"
-      :src="realLink"
-      width="100%"
-    />
-  </div>
-</template>
-
-<script>
-import ButtonSave from "@atoms/ButtonSave.vue";
-import YouTube from "vue3-youtube";
-import ButtonEdit from "@atoms/ButtonEdit.vue";
-import ButtonDiscard from "@atoms/ButtonDiscard.vue";
-import {FwbInput, FwbP} from "flowbite-vue";
-
-export default {
-  components: {
-    FwbInput,
-    FwbP,
-    YouTube, ButtonDiscard, ButtonSave, ButtonEdit
-  },
-  props: {
-    videoLink: {
-      type: String,
-      default: '',
-    },
-    label: {
-      type: String,
-      default: ''
-    },
-    timeout: {
-      type: Number,
-      default: 0
-    },
-  },
-  data() {
-    return {
-      isEdit: false,
-      isReady: false,
-      tempLink: this.$props.videoLink,
-      realLink: this.$props.videoLink,
-    }
-  },
-  computed: {
-    isLinkNormal() {
-      return this.$data.realLink.toString().includes("https://www.youtube.com/watch?")
-    }
-  },
-  mounted() {
-    if (this.timeout) {
-      setTimeout(() => {
-        this.isReady = true
-      }, this.timeout);
-    } else {
-      this.isReady = true
-    }
-  },
-  methods: {
-    updateLink(newLink) {
-      console.log(newLink)
-    },
-    clickSave() {
-      this.$data.isEdit = false
-      let l = this.$data.tempLink
-      if (l.toString().includes("https://www.youtube.com/watch?")) {
-        this.$data.realLink = l
-      }
-    },
-    clickDiscard() {
-      this.$data.isEdit = false
-      console.log(`discard ${this.$data.tempLink}`)
-    }
-  }
-}
-</script>
diff --git a/live_monitor_vue/src/components/2_molecules/ButtonModal/index.vue b/live_monitor_vue/src/components/2_molecules/ButtonModal/ButtonModal.vue
similarity index 100%
rename from live_monitor_vue/src/components/2_molecules/ButtonModal/index.vue
rename to live_monitor_vue/src/components/2_molecules/ButtonModal/ButtonModal.vue
diff --git a/live_monitor_vue/src/components/3_organisms/MachinesModal/index.vue b/live_monitor_vue/src/components/2_molecules/MachinesModal/MachinesModal.vue
similarity index 85%
rename from live_monitor_vue/src/components/3_organisms/MachinesModal/index.vue
rename to live_monitor_vue/src/components/2_molecules/MachinesModal/MachinesModal.vue
index c752a39..f0199a5 100644
--- a/live_monitor_vue/src/components/3_organisms/MachinesModal/index.vue
+++ b/live_monitor_vue/src/components/2_molecules/MachinesModal/MachinesModal.vue
@@ -4,21 +4,21 @@
     btnClass="col-span-4"
     containerClass="pt-10 px-4 min-w-[80vw]"
   >
-    <Tabulator v-bind="tabulatorOtps" />
+    <Tabulator v-bind="tabulatorOptions" />
   </ButtonModal>
 </template>
 
 <script>
-import ButtonModal from '@molecules/ButtonModal/index.vue'
+import ButtonModal from '@molecules/ButtonModal/ButtonModal.vue'
 import Tabulator from "@molecules/Tabulator/index.vue"
 
 export default {
-  name: 'Name',
+  name: 'MachinesModal',
   components: {ButtonModal, Tabulator},
   data() {
   },
   computed: {
-    tabulatorOtps() {
+    tabulatorOptions() {
       return {
         dataSource: this.packsData,
         columns:     [
diff --git a/live_monitor_vue/src/components/5_pages/Cron/Task.vue b/live_monitor_vue/src/components/5_pages/Cron/Task.vue
index 84580ab..0119533 100644
--- a/live_monitor_vue/src/components/5_pages/Cron/Task.vue
+++ b/live_monitor_vue/src/components/5_pages/Cron/Task.vue
@@ -71,7 +71,7 @@
 <script>
 import TaskModal from './TaskModal.vue'
 import TaskHistory from './TaskHistory.vue'
-import ButtonModal from '@molecules/ButtonModal/index.vue'
+import ButtonModal from '@molecules/ButtonModal/ButtonModal.vue'
 
 export default {
 name: 'Task',
diff --git a/live_monitor_vue/src/components/5_pages/Cron/TaskHistory.vue b/live_monitor_vue/src/components/5_pages/Cron/TaskHistory.vue
index 951eb4e..c40e530 100644
--- a/live_monitor_vue/src/components/5_pages/Cron/TaskHistory.vue
+++ b/live_monitor_vue/src/components/5_pages/Cron/TaskHistory.vue
@@ -14,7 +14,7 @@
 </template>
 
 <script>
-import ButtonModal from '@molecules/ButtonModal/index.vue'
+import ButtonModal from '@molecules/ButtonModal/ButtonModal.vue'
 import {data} from './historyData'
 
 export default {
diff --git a/live_monitor_vue/src/components/5_pages/Cron/TaskModal.vue b/live_monitor_vue/src/components/5_pages/Cron/TaskModal.vue
index bad96eb..4912720 100644
--- a/live_monitor_vue/src/components/5_pages/Cron/TaskModal.vue
+++ b/live_monitor_vue/src/components/5_pages/Cron/TaskModal.vue
@@ -220,7 +220,7 @@
 </template>
 
 <script>
-import ButtonModal from '@molecules/ButtonModal/index.vue'
+import ButtonModal from '@molecules/ButtonModal/ButtonModal.vue'
 import Datepicker from "@molecules/Datepicker/index.vue"
 import { FwbTextarea } from 'flowbite-vue'
 
diff --git a/live_monitor_vue/src/components/5_pages/LastPacks/index.vue b/live_monitor_vue/src/components/5_pages/LastPacks/index.vue
index ac91884..dc50dc4 100644
--- a/live_monitor_vue/src/components/5_pages/LastPacks/index.vue
+++ b/live_monitor_vue/src/components/5_pages/LastPacks/index.vue
@@ -101,12 +101,12 @@
 </template>
 
 <script>
-import ButtonModal from '@molecules/ButtonModal/index.vue'
+import ButtonModal from '@molecules/ButtonModal/ButtonModal.vue'
 import Datepicker from "@molecules/Datepicker/index.vue"
 import {mapGetters, mapMutations, mapActions} from 'vuex'
 import Tabulator from "@molecules/Tabulator/index.vue"
 import Spinner from "@molecules/Spinner/index.vue"
-import MachinesModal from "@organisms/MachinesModal/index.vue"
+import MachinesModal from "@molecules/MachinesModal/MachinesModal.vue"
 
 export default {
   name: 'LastPacks',
diff --git a/live_monitor_vue/src/components/5_pages/LastPacksNum/index.vue b/live_monitor_vue/src/components/5_pages/LastPacksNum/index.vue
index ab5cab7..0b78670 100644
--- a/live_monitor_vue/src/components/5_pages/LastPacksNum/index.vue
+++ b/live_monitor_vue/src/components/5_pages/LastPacksNum/index.vue
@@ -78,7 +78,7 @@
 </template>
 
 <script>
-import ButtonModal from '@molecules/ButtonModal/index.vue'
+import ButtonModal from '@molecules/ButtonModal/ButtonModal.vue'
 import {mapGetters, mapMutations, mapActions} from 'vuex'
 import Tabulator from "@molecules/Tabulator/index.vue"
 import Spinner from "@molecules/Spinner/index.vue"
@@ -98,8 +98,6 @@ export default {
   computed: {
     ...mapGetters('last_packs_num', ['packNum', 'pageState', 'packsData']),
     tabulatorOtps() {
-      console.log(this.packsData)
-
       return {
         dataSource: this.packsData,
         columns: [
diff --git a/live_monitor_vue/src/store/index.js b/live_monitor_vue/src/store/index.js
index 93f97f6..538a0dd 100644
--- a/live_monitor_vue/src/store/index.js
+++ b/live_monitor_vue/src/store/index.js
@@ -1,7 +1,7 @@
 import { createStore, createLogger } from 'vuex';
 import { store as main } from '@/store/modules/main';
 import { store as machines } from '@/store/modules/machines';
-import { store as layoutMachines } from '@/store/modules/machines';
+import { store as layoutMachines } from '@/store/modules/layoutMachines';
 import { store as finder_packs } from '@/store/modules/finder_packs';
 import { store as add_users } from '@/store/modules/add_users';
 import { store as layout } from '@/store/modules/layout';
diff --git a/live_monitor_vue/tests/adapters/AdapterOfMachines.test.js b/live_monitor_vue/tests/adapters/AdapterOfMachines.test.js
index 73e29e2..e283600 100644
--- a/live_monitor_vue/tests/adapters/AdapterOfMachines.test.js
+++ b/live_monitor_vue/tests/adapters/AdapterOfMachines.test.js
@@ -1,4 +1,4 @@
-import {describe, test, expect} from 'vitest'
+import {describe, test, expect, vi} from 'vitest'
 import AdapterOfMachines from "@adapters/AdapterOfMachines.js"
 import axios from 'axios'
 import {apiModalListMachines, appModalListMachines} from "@mocks/machines.js"
diff --git a/live_monitor_vue/tests/adapters/AdapterOfPacks.test.js b/live_monitor_vue/tests/adapters/AdapterOfPacks.test.js
index e69de29..55670ff 100644
--- a/live_monitor_vue/tests/adapters/AdapterOfPacks.test.js
+++ b/live_monitor_vue/tests/adapters/AdapterOfPacks.test.js
@@ -0,0 +1,15 @@
+import {describe, test, expect, vi} from 'vitest'
+import AdapterOfPacks from "@adapters/AdapterOfPacks.js"
+import axios from 'axios'
+
+vi.mock('axios')
+
+describe('AdapterOfMachines', () => {
+  axios.post.mockResolvedValue({data: []})
+
+  test('AdapterOfMachines should be a object', () => {
+    const adapterOfMachines = new AdapterOfPacks('')
+    expect(typeof adapterOfMachines).toBe('object')
+  })
+
+})
\ No newline at end of file
diff --git a/live_monitor_vue/tests/components/1_atoms/Accordion.test.js b/live_monitor_vue/tests/components/1_atoms/Accordion.test.js
new file mode 100644
index 0000000..9bac6ff
--- /dev/null
+++ b/live_monitor_vue/tests/components/1_atoms/Accordion.test.js
@@ -0,0 +1,10 @@
+import {test, describe, expect} from 'vitest'
+import { mount} from '@vue/test-utils'
+import Accordion from '@atoms/Accordion.vue';
+
+describe('Accordion', () => {
+  test('Accordion mounted', () => {
+    const wrapper = mount(Accordion)
+    expect(wrapper.exists()).toBe(true)
+  })
+})
\ No newline at end of file
diff --git a/live_monitor_vue/tests/components/1_atoms/Button.test.js b/live_monitor_vue/tests/components/1_atoms/Button.test.js
new file mode 100644
index 0000000..a6be83a
--- /dev/null
+++ b/live_monitor_vue/tests/components/1_atoms/Button.test.js
@@ -0,0 +1,10 @@
+import {test, describe, expect} from 'vitest'
+import { mount} from '@vue/test-utils'
+import Button from '@atoms/Button.vue';
+
+describe('Accordion', () => {
+  test('Accordion mounted', () => {
+    const wrapper = mount(Button)
+    expect(wrapper.exists()).toBe(true)
+  })
+})
\ No newline at end of file
diff --git a/live_monitor_vue/tests/components/1_atoms/ButtonDiscard.test.js b/live_monitor_vue/tests/components/1_atoms/ButtonDiscard.test.js
new file mode 100644
index 0000000..e5c4623
--- /dev/null
+++ b/live_monitor_vue/tests/components/1_atoms/ButtonDiscard.test.js
@@ -0,0 +1,10 @@
+import {test, describe, expect} from 'vitest'
+import { mount} from '@vue/test-utils'
+import ButtonDiscard from '@atoms/ButtonDiscard.vue';
+
+describe('ButtonDiscard', () => {
+  test('ButtonDiscard mounted', () => {
+    const wrapper = mount(ButtonDiscard)
+    expect(wrapper.exists()).toBe(true)
+  })
+})
\ No newline at end of file
diff --git a/live_monitor_vue/tests/components/1_atoms/ButtonEdit.test.js b/live_monitor_vue/tests/components/1_atoms/ButtonEdit.test.js
new file mode 100644
index 0000000..b104a9c
--- /dev/null
+++ b/live_monitor_vue/tests/components/1_atoms/ButtonEdit.test.js
@@ -0,0 +1,10 @@
+import {test, describe, expect} from 'vitest'
+import { mount} from '@vue/test-utils'
+import ButtonEdit from '@atoms/ButtonEdit.vue';
+
+describe('ButtonEdit', () => {
+  test('ButtonEdit mounted', () => {
+    const wrapper = mount(ButtonEdit)
+    expect(wrapper.exists()).toBe(true)
+  })
+})
\ No newline at end of file
diff --git a/live_monitor_vue/tests/components/1_atoms/ButtonSave.test.js b/live_monitor_vue/tests/components/1_atoms/ButtonSave.test.js
new file mode 100644
index 0000000..5bddfe3
--- /dev/null
+++ b/live_monitor_vue/tests/components/1_atoms/ButtonSave.test.js
@@ -0,0 +1,10 @@
+import {test, describe, expect} from 'vitest'
+import { mount} from '@vue/test-utils'
+import ButtonSave from '@atoms/ButtonSave.vue';
+
+describe('ButtonSave', () => {
+  test('ButtonSave mounted', () => {
+    const wrapper = mount(ButtonSave)
+    expect(wrapper.exists()).toBe(true)
+  })
+})
\ No newline at end of file
diff --git a/live_monitor_vue/tests/components/1_atoms/DoubleSwitch.test.js b/live_monitor_vue/tests/components/1_atoms/DoubleSwitch.test.js
new file mode 100644
index 0000000..c55de02
--- /dev/null
+++ b/live_monitor_vue/tests/components/1_atoms/DoubleSwitch.test.js
@@ -0,0 +1,10 @@
+import {test, describe, expect} from 'vitest'
+import { mount} from '@vue/test-utils'
+import DoubleSwitch from '@atoms/DoubleSwitch.vue';
+
+describe('DoubleSwitch', () => {
+  test('DoubleSwitch mounted', () => {
+    const wrapper = mount(DoubleSwitch)
+    expect(wrapper.exists()).toBe(true)
+  })
+})
\ No newline at end of file
diff --git a/live_monitor_vue/tests/components/2_molecules/ButtonModal.test.js b/live_monitor_vue/tests/components/2_molecules/ButtonModal.test.js
new file mode 100644
index 0000000..126de48
--- /dev/null
+++ b/live_monitor_vue/tests/components/2_molecules/ButtonModal.test.js
@@ -0,0 +1,10 @@
+import {test, describe, expect, vi} from 'vitest'
+import { mount} from '@vue/test-utils'
+import ButtonModal from '@molecules/ButtonModal/ButtonModal.vue';
+
+describe('ButtonModal', () => {
+  test('ButtonModal mounted', () => {
+    const wrapper = mount(ButtonModal)
+    expect(wrapper.exists()).toBe(true)
+  })
+})
\ No newline at end of file
diff --git a/live_monitor_vue/tests/components/2_molecules/MachinesModal.test.js b/live_monitor_vue/tests/components/2_molecules/MachinesModal.test.js
new file mode 100644
index 0000000..815a5c7
--- /dev/null
+++ b/live_monitor_vue/tests/components/2_molecules/MachinesModal.test.js
@@ -0,0 +1,10 @@
+import {test, describe, expect, vi} from 'vitest'
+import { mount} from '@vue/test-utils'
+import MachinesModal from '@molecules/MachinesModal/MachinesModal.vue';
+
+describe('MachinesModal', () => {
+  test('MachinesModal mounted', () => {
+    const wrapper = mount(MachinesModal)
+    expect(wrapper.exists()).toBe(true)
+  })
+})
\ No newline at end of file
diff --git a/live_monitor_vue/src/components/6_admin_pages/Services/service.spec.js b/live_monitor_vue/tests/components/6_admin_pages/Services/Service.test.js
similarity index 95%
rename from live_monitor_vue/src/components/6_admin_pages/Services/service.spec.js
rename to live_monitor_vue/tests/components/6_admin_pages/Services/Service.test.js
index 2c09cbd..c245569 100644
--- a/live_monitor_vue/src/components/6_admin_pages/Services/service.spec.js
+++ b/live_monitor_vue/tests/components/6_admin_pages/Services/Service.test.js
@@ -1,6 +1,6 @@
-import Service from './Service.vue'
+import Service from '@admin_pages/Services/Service.vue'
 import { globalServices } from '@store/modules/services/StaticData'
-import { shallowMount, mount } from '@vue/test-utils'
+import { mount } from '@vue/test-utils'
 import {createStore} from 'vuex'
 
 const store = createStore({
@@ -28,7 +28,7 @@ describe("Service", () => {
       },
     })
     await wrapper.setProps({ idx: 3 })
-    
+
     expect(wrapper.html()).toContain(3)
   })
 })
@@ -45,7 +45,7 @@ describe("Service", () => {
     })
 
     await wrapper.setProps({ name: 'глобальное хранилище' })
-    
+
     expect(wrapper.html()).toContain('доступен')
   })
 })
@@ -62,7 +62,7 @@ describe("Service", () => {
     })
 
     await wrapper.setProps({ name: 'Test service name' })
-    
+
     expect(wrapper.html()).toContain('отключен')
   })
 })
@@ -77,7 +77,7 @@ describe("Service", () => {
         service: {},
       },
     })
-    
+
     expect(wrapper.html()).toContain('Сервис глобального хранилища применяется для условно постоянного хранения данных в кэше')
   })
 })
@@ -90,12 +90,12 @@ describe("Service", () => {
       },
       props: {
         service: {serviceIp: '192.168.1.1', serviceCode: '1234567890', serviceLink: 'http://test.com', is_online: false,
-      },
+        },
       },
     })
 
     await wrapper.setProps({ service: {serviceIp: '192.168.1.7', serviceCode: '1234567897', is_online: true} }) // 1 раз, далее новый тест
-    
+
     expect(wrapper.html()).toContain('192.168.1.7')
     expect(wrapper.html()).toContain('1234567897')
     expect(wrapper.html()).toContain('доступен')
@@ -116,7 +116,7 @@ describe("Service", () => {
     })
 
     await wrapper.get('.copyText').trigger('click')
-    
+
     expect(wrapper.html()).toContain('copyed')
   })
 })
diff --git a/live_monitor_vue/src/components/6_admin_pages/Services/index.spec.js b/live_monitor_vue/tests/components/6_admin_pages/Services/ServicesPage.test.js
similarity index 94%
rename from live_monitor_vue/src/components/6_admin_pages/Services/index.spec.js
rename to live_monitor_vue/tests/components/6_admin_pages/Services/ServicesPage.test.js
index 50a6e11..ef9e724 100644
--- a/live_monitor_vue/src/components/6_admin_pages/Services/index.spec.js
+++ b/live_monitor_vue/tests/components/6_admin_pages/Services/ServicesPage.test.js
@@ -1,6 +1,6 @@
-import Services from './index.vue'
+import Services from '@admin_pages/Services/index.vue'
 import { globalServices } from '@store/modules/services/StaticData'
-import { shallowMount, mount } from '@vue/test-utils'
+import { mount } from '@vue/test-utils'
 import {createStore} from 'vuex'
 
 const store = createStore({
@@ -29,7 +29,7 @@ describe("Services", () => {
         }
       },
     })
-    
+
     expect(wrapper.text()).toContain('Показать больше сервисов')
   })
 })