diff --git a/components/Film/Film.spec.js b/components/Film/Film.spec.js
index 522577e..51046f6 100644
--- a/components/Film/Film.spec.js
+++ b/components/Film/Film.spec.js
@@ -1,5 +1,5 @@
 import { mount, RouterLinkStub } from "@vue/test-utils";
-import Film from "@/components/Film/Film";
+import Film from "./";
 import mockFilms from "@/test/fake-films.json";
 
 describe("Film", () => {
diff --git a/components/Film/Film.vue b/components/Film/index.vue
similarity index 100%
rename from components/Film/Film.vue
rename to components/Film/index.vue
diff --git a/test/Grid.spec.js b/components/Grid/Grid.spec.js
similarity index 86%
rename from test/Grid.spec.js
rename to components/Grid/Grid.spec.js
index 61e7bfb..22f4bba 100644
--- a/test/Grid.spec.js
+++ b/components/Grid/Grid.spec.js
@@ -1,6 +1,6 @@
 import { shallowMount } from "@vue/test-utils";
-import Grid from "@/components/Grid";
-import mockFilms from "./fake-films.json";
+import Grid from "./";
+import mockFilms from "@/test/fake-films.json";
 
 describe("Grid", () => {
   it("tests props", () => {
diff --git a/components/Grid.vue b/components/Grid/index.vue
similarity index 82%
rename from components/Grid.vue
rename to components/Grid/index.vue
index ac1a141..feb1bf8 100644
--- a/components/Grid.vue
+++ b/components/Grid/index.vue
@@ -1,11 +1,11 @@
 <template>
-  <div class="grid">
+  <div class="flex flex-wrap">
     <Film :key="film.id" v-for="film in dataSource" :film="film" />
   </div>
 </template>
 
 <script>
-import Film from "./Film/Film";
+import Film from "../Film";
 
 export default {
   components: { Film },
diff --git a/pages/films/index.vue b/pages/films/index.vue
index 73805ef..0d55a9a 100644
--- a/pages/films/index.vue
+++ b/pages/films/index.vue
@@ -8,9 +8,11 @@
 </template>
 
 <script>
+import Grid from "@/components/Grid";
+
 export default {
   name: "Films",
-  components: { Grid: () => import("@/components/Grid") },
+  components: { Grid },
   head: {
     titleTemplate: "%s - Films"
   },