diff --git a/app/components/success-toast.js b/app/components/success-toast.js
deleted file mode 100644
index 13720d8..0000000
--- a/app/components/success-toast.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import Component from '@glimmer/component';
-
-export default class SuccessToastComponent extends Component {}
diff --git a/app/components/success-toast.hbs b/app/components/toast/success.hbs
similarity index 100%
rename from app/components/success-toast.hbs
rename to app/components/toast/success.hbs
diff --git a/app/components/toast/success.js b/app/components/toast/success.js
new file mode 100644
index 0000000..87bf3ac
--- /dev/null
+++ b/app/components/toast/success.js
@@ -0,0 +1,3 @@
+import Component from '@glimmer/component';
+
+export default class ToastSuccessComponent extends Component {}
diff --git a/app/components/task-toast.hbs b/app/components/toast/task.hbs
similarity index 100%
rename from app/components/task-toast.hbs
rename to app/components/toast/task.hbs
diff --git a/app/components/task-toast.js b/app/components/toast/task.js
similarity index 95%
rename from app/components/task-toast.js
rename to app/components/toast/task.js
index 39bbf3d..1ba4255 100644
--- a/app/components/task-toast.js
+++ b/app/components/toast/task.js
@@ -4,10 +4,10 @@ import { action } from '@ember/object';
 import { inject as service } from '@ember/service';
 import { tracked } from '@glimmer/tracking';
 import { Loading, Check, AlertOctagonOutline } from 'ember-mdi';
-import Task from '../models/task';
+import Task from 'meiliadmin/models/task';
 
 // TODO: refactor for using more inside Task logic
-export default class TaskToastComponent extends Component {
+export default class ToastTaskComponent extends Component {
   @service meilisearch;
 
   @tracked task;
diff --git a/app/services/toaster.js b/app/services/toaster.js
index 326cfb2..c040fab 100644
--- a/app/services/toaster.js
+++ b/app/services/toaster.js
@@ -2,8 +2,8 @@ import Service from '@ember/service';
 import { tracked } from '@glimmer/tracking';
 import { hbs } from 'ember-template-imports';
 import { action } from '@ember/object';
-import SuccessToast from '../components/success-toast';
-import TaskToast from '../components/task-toast';
+import SuccessToast from '../components/toast/success';
+import TaskToast from '../components/toast/task';
 
 export default class ToasterService extends Service {
   @tracked container = [];
diff --git a/tests/integration/components/success-toast-test.js b/tests/integration/components/success-toast-test.js
deleted file mode 100644
index 39cdf19..0000000
--- a/tests/integration/components/success-toast-test.js
+++ /dev/null
@@ -1,14 +0,0 @@
-import { module, test } from 'qunit';
-import { setupRenderingTest } from 'meiliadmin/tests/helpers';
-import { render } from '@ember/test-helpers';
-import { hbs } from 'ember-cli-htmlbars';
-
-module('Integration | Component | success-toast', function (hooks) {
-  setupRenderingTest(hooks);
-
-  // test('it renders', async function (assert) {
-  //   await render(hbs`<SuccessToast />`);
-
-  //   assert.dom(this.element).hasText('');
-  // });
-});
diff --git a/tests/integration/components/task-toast-test.js b/tests/integration/components/task-toast-test.js
deleted file mode 100644
index d26bf55..0000000
--- a/tests/integration/components/task-toast-test.js
+++ /dev/null
@@ -1,14 +0,0 @@
-import { module, test } from 'qunit';
-import { setupRenderingTest } from 'meiliadmin/tests/helpers';
-import { render } from '@ember/test-helpers';
-import { hbs } from 'ember-cli-htmlbars';
-
-module('Integration | Component | task-toast', function (hooks) {
-  setupRenderingTest(hooks);
-
-  // test('it renders', async function (assert) {
-  //   await render(hbs`<TaskToast />`);
-
-  //   assert.dom(this.element).hasText('');
-  // });
-});
diff --git a/tests/integration/components/toast/success-test.js b/tests/integration/components/toast/success-test.js
new file mode 100644
index 0000000..23e5816
--- /dev/null
+++ b/tests/integration/components/toast/success-test.js
@@ -0,0 +1,26 @@
+import { module, test } from 'qunit';
+import { setupRenderingTest } from 'meiliadmin/tests/helpers';
+import { render } from '@ember/test-helpers';
+import { hbs } from 'ember-cli-htmlbars';
+
+module('Integration | Component | toast/success', function (hooks) {
+  setupRenderingTest(hooks);
+
+  test('it renders', async function (assert) {
+    // Set any properties with this.set('myProperty', 'value');
+    // Handle any actions with this.set('myAction', function(val) { ... });
+
+    await render(hbs`<Toast::Success />`);
+
+    assert.dom(this.element).hasText('');
+
+    // Template block usage:
+    await render(hbs`
+      <Toast::Success>
+        template block text
+      </Toast::Success>
+    `);
+
+    assert.dom(this.element).hasText('template block text');
+  });
+});
diff --git a/tests/integration/components/toast/task-test.js b/tests/integration/components/toast/task-test.js
new file mode 100644
index 0000000..32487a6
--- /dev/null
+++ b/tests/integration/components/toast/task-test.js
@@ -0,0 +1,26 @@
+import { module, test } from 'qunit';
+import { setupRenderingTest } from 'meiliadmin/tests/helpers';
+import { render } from '@ember/test-helpers';
+import { hbs } from 'ember-cli-htmlbars';
+
+module('Integration | Component | toast/task', function (hooks) {
+  setupRenderingTest(hooks);
+
+  test('it renders', async function (assert) {
+    // Set any properties with this.set('myProperty', 'value');
+    // Handle any actions with this.set('myAction', function(val) { ... });
+
+    await render(hbs`<Toast::Task />`);
+
+    assert.dom(this.element).hasText('');
+
+    // Template block usage:
+    await render(hbs`
+      <Toast::Task>
+        template block text
+      </Toast::Task>
+    `);
+
+    assert.dom(this.element).hasText('template block text');
+  });
+});