diff --git a/src/Carousel/Carousel.stories.js b/src/Carousel/Carousel.stories.js
new file mode 100644
index 0000000..5ba9029
--- /dev/null
+++ b/src/Carousel/Carousel.stories.js
@@ -0,0 +1,27 @@
+import CarouselView from './CarouselView.svelte';
+import CarouselViewCustomDots from './CarouselViewCustomDots.svelte';
+import CarouselViewCustomArrows from './CarouselViewCustomArrows.svelte';
+
+export default {
+  title: 'Carousel',
+  component: CarouselView
+};
+
+const Template = ({ ...args }) => ({
+  Component: CarouselView,
+  props: args
+});
+export const Primary = Template.bind({});
+
+const TemplateCustomDots = ({ ...args }) => ({
+  Component: CarouselViewCustomDots,
+  props: args
+});
+export const WithCustomDots = TemplateCustomDots.bind({});
+
+const TemplateCustomArrows = ({ ...args }) => ({
+  Component: CarouselViewCustomArrows,
+  props: args
+});
+export const WithCustomArrows = TemplateCustomArrows.bind({});
+
diff --git a/src/ImageCarousel/ImageCarousel.svelte b/src/Carousel/Carousel.svelte
similarity index 97%
rename from src/ImageCarousel/ImageCarousel.svelte
rename to src/Carousel/Carousel.svelte
index 9e60f14..132f3e8 100644
--- a/src/ImageCarousel/ImageCarousel.svelte
+++ b/src/Carousel/Carousel.svelte
@@ -1,6 +1,5 @@
 <script>
   // TODO: rename image carousel to just carousel
-  // TODO: subscribe on mount and unsubscribe on destroy to
   import { onDestroy, onMount } from 'svelte'
   import { store } from '../store'
   import {
@@ -70,7 +69,7 @@
   })
 
   function applySlideSizes() {
-    const children = innerContentContainerElement.children
+    const children = innerContentContainerElement ? innerContentContainerElement.children : []
     pageWidth = contentContainerElement.clientWidth
 
     const slidesCount = children.length
diff --git a/src/ImageCarousel/ImageCarouselView.svelte b/src/Carousel/CarouselView.svelte
similarity index 94%
rename from src/ImageCarousel/ImageCarouselView.svelte
rename to src/Carousel/CarouselView.svelte
index 5610e83..c1294d7 100644
--- a/src/ImageCarousel/ImageCarouselView.svelte
+++ b/src/Carousel/CarouselView.svelte
@@ -1,5 +1,5 @@
 <script>
-  import ImageCarousel from './ImageCarousel.svelte'
+  import Carousel from './Carousel.svelte'
 
   /**
    * Enable Next/Previos arrows
@@ -61,7 +61,7 @@
 </script>
 
 <div class="main-container">
-  <ImageCarousel
+  <Carousel
     {arrows}
     {infinite}
     {slidesToShow}
@@ -80,7 +80,7 @@
         <p>{color}</p>
       </div>
     {/each}
-  </ImageCarousel>
+  </Carousel>
 </div>
 
 <style>
diff --git a/src/ImageCarousel/ImageCarouselViewCustomArrows.svelte b/src/Carousel/CarouselViewCustomArrows.svelte
similarity index 96%
rename from src/ImageCarousel/ImageCarouselViewCustomArrows.svelte
rename to src/Carousel/CarouselViewCustomArrows.svelte
index fce65b6..5b730e9 100644
--- a/src/ImageCarousel/ImageCarouselViewCustomArrows.svelte
+++ b/src/Carousel/CarouselViewCustomArrows.svelte
@@ -1,5 +1,5 @@
 <script>
-  import ImageCarousel from './ImageCarousel.svelte'
+  import Carousel from './Carousel.svelte'
 
   /**
    * Enable Next/Previos arrows
@@ -61,7 +61,7 @@
 </script>
 
 <div class="main-container">
-  <ImageCarousel
+  <Carousel
     {arrows}
     {infinite}
     {slidesToShow}
@@ -92,7 +92,7 @@
         <span>&gt;&gt;&gt;</span>
       </div>
     </div>
-  </ImageCarousel>
+  </Carousel>
 </div>
 
 <style>
diff --git a/src/ImageCarousel/ImageCarouselViewCustomDots.svelte b/src/Carousel/CarouselViewCustomDots.svelte
similarity index 96%
rename from src/ImageCarousel/ImageCarouselViewCustomDots.svelte
rename to src/Carousel/CarouselViewCustomDots.svelte
index 090df6f..8d51c5a 100644
--- a/src/ImageCarousel/ImageCarouselViewCustomDots.svelte
+++ b/src/Carousel/CarouselViewCustomDots.svelte
@@ -1,11 +1,11 @@
 <script>
-  import ImageCarousel from './ImageCarousel.svelte'
+  import Carousel from './Carousel.svelte'
 
   /**
    * Enable Next/Previos arrows
    */
   export let arrows = true;
-  
+
   /**
    * Infinite looping
    */
@@ -65,7 +65,7 @@
 </script>
 
 <div class="main-container">
-  <ImageCarousel
+  <Carousel
     {arrows}
     {infinite}
     {slidesToShow}
@@ -102,7 +102,7 @@
         </select>
       </div>
     </div>
-  </ImageCarousel>
+  </Carousel>
 </div>
 
 <style>
diff --git a/src/ImageCarousel/ImageCarousel.stories.js b/src/ImageCarousel/ImageCarousel.stories.js
deleted file mode 100644
index 282479c..0000000
--- a/src/ImageCarousel/ImageCarousel.stories.js
+++ /dev/null
@@ -1,27 +0,0 @@
-import ImageCarouselView from './ImageCarouselView.svelte';
-import ImageCarouselViewCustomDots from './ImageCarouselViewCustomDots.svelte';
-import ImageCarouselViewCustomArrows from './ImageCarouselViewCustomArrows.svelte';
-
-export default {
-  title: 'ImageCarousel',
-  component: ImageCarouselView
-};
-
-const Template = ({ ...args }) => ({
-  Component: ImageCarouselView,
-  props: args
-});
-export const Primary = Template.bind({});
-
-const TemplateCustomDots = ({ ...args }) => ({
-  Component: ImageCarouselViewCustomDots,
-  props: args
-});
-export const WithCustomDots = TemplateCustomDots.bind({});
-
-const TemplateCustomArrows = ({ ...args }) => ({
-  Component: ImageCarouselViewCustomArrows,
-  props: args
-});
-export const WithCustomArrows = TemplateCustomArrows.bind({});
-