diff --git a/.babelrc b/.babelrc
index 7fd52af..84c2e57 100644
--- a/.babelrc
+++ b/.babelrc
@@ -12,13 +12,5 @@
         ]
       ]
     }
-  },
-  "plugins": [
-    [
-      "@babel/plugin-proposal-private-property-in-object",
-      {
-        "loose": true
-      }
-    ]
-  ]
+  }
 }
diff --git a/babel.config.js b/babel.config.js
index 9540040..6f92f3d 100644
--- a/babel.config.js
+++ b/babel.config.js
@@ -1,6 +1,6 @@
 module.exports = {
   presets: ['@babel/preset-env'],
-  "plugins": [
+  plugins: [
     [
       "@babel/plugin-proposal-private-property-in-object",
       {
diff --git a/jest.config.ts b/jest.config.ts
index 8cc487c..58bfcf1 100644
--- a/jest.config.ts
+++ b/jest.config.ts
@@ -26,12 +26,13 @@ export default {
   ],
   collectCoverage: true,
   collectCoverageFrom: [
-    '<rootDir>/nci/components/**/*.{js,vue,ts}',
+    '<rootDir>/nci/app/components/**/*.{js,vue,ts}',
     '<rootDir>/nci/storybook/**/*.{js,vue,ts}',
     '<rootDir>/nci/app/factories/**/*.{js,vue,ts}',
     '<rootDir>/pages/**/*.{js,vue,ts}',
     '<rootDir>/store/**/*.{js,vue,ts}',
     "!**/node_modules/**"
   ],
-  testEnvironment: "jsdom"
+  testEnvironment: "jsdom",
+  setupFilesAfterEnv: ['./nci/app/testing/registerComponents.ts']
 }
diff --git a/nci.config.ts b/nci.config.ts
index b14fe2e..76d67e0 100644
--- a/nci.config.ts
+++ b/nci.config.ts
@@ -7,9 +7,8 @@ import Theme from "./nci/theme/default-light";
 /** Import App Config Type */
 import { AppConfig } from '@/nci/app/interfaces'
 
-const nciConfig = {
+export const nciConfig = {
   config: Config,
   theme: Theme,
 } as AppConfig;
 
-export default nciConfig;
diff --git a/nci/app/appConfig.ts b/nci/app/appConfig.ts
index 76b16ef..4e15cc8 100644
--- a/nci/app/appConfig.ts
+++ b/nci/app/appConfig.ts
@@ -1,4 +1,4 @@
-import nciConfig from "../../nci.config"
+import { nciConfig } from "../../nci.config"
 
 /** Import App Config Type */
 import { AppConfig } from '@/nci/app/interfaces'
diff --git a/nci/components/nci-anchor/__test__/index.test.ts b/nci/app/components/nci-anchor/__test__/index.test.ts
similarity index 94%
rename from nci/components/nci-anchor/__test__/index.test.ts
rename to nci/app/components/nci-anchor/__test__/index.test.ts
index d358df4..c87184f 100644
--- a/nci/components/nci-anchor/__test__/index.test.ts
+++ b/nci/app/components/nci-anchor/__test__/index.test.ts
@@ -1,5 +1,5 @@
 import { mount } from '@vue/test-utils'
-import nciAnchor from '@/nci/components/nci-anchor/index.vue'
+import nciAnchor from '@/nci/app/components/nci-anchor/index.vue'
 import { Button } from '@/nci/app/interfaces';
 
 /** Button Component Tests */
@@ -22,7 +22,6 @@ describe('nci-anchor component', () => {
       } as Button,
       stubs: ['nuxt-link']
     })
-
     /** Check the component mounted */
     expect(wrapper.vm).toBeTruthy();
 
diff --git a/nci/components/nci-anchor/index.vue b/nci/app/components/nci-anchor/index.vue
similarity index 100%
rename from nci/components/nci-anchor/index.vue
rename to nci/app/components/nci-anchor/index.vue
diff --git a/nci/components/nci-anchor/stories/button/__test__/index.test.ts b/nci/app/components/nci-anchor/stories/button/__test__/index.test.ts
similarity index 66%
rename from nci/components/nci-anchor/stories/button/__test__/index.test.ts
rename to nci/app/components/nci-anchor/stories/button/__test__/index.test.ts
index c991b49..82c7ddf 100644
--- a/nci/components/nci-anchor/stories/button/__test__/index.test.ts
+++ b/nci/app/components/nci-anchor/stories/button/__test__/index.test.ts
@@ -2,15 +2,16 @@
 
 import { mount } from '@vue/test-utils';
 
-import nciAnchor from '@/nci/components/nci-anchor/index.vue';
+import nciAnchor from '@/nci/app/components/nci-anchor/index.vue';
 
 //👇 Imports a specific story for the test
-import { button } from '@/nci/components/nci-anchor/stories/button/index.stories';
+import { button } from '@/nci/app/components/nci-anchor/stories/button/index.stories';
 
 it('renders the button in the primary state', () => {
   const wrapper = mount(nciAnchor, {
     propsData: button.args,
     stubs: ['nuxt-link']
   });
+
   expect(wrapper).toBeTruthy();
 });
diff --git a/nci/components/nci-anchor/stories/button/index.stories.ts b/nci/app/components/nci-anchor/stories/button/index.stories.ts
similarity index 89%
rename from nci/components/nci-anchor/stories/button/index.stories.ts
rename to nci/app/components/nci-anchor/stories/button/index.stories.ts
index 0313a92..fea79cd 100644
--- a/nci/components/nci-anchor/stories/button/index.stories.ts
+++ b/nci/app/components/nci-anchor/stories/button/index.stories.ts
@@ -1,5 +1,5 @@
 /** Import the Nuxt Image component  */
-import nciAnchor from '@/nci/components/nci-anchor/index.vue';
+import nciAnchor from '@/nci/app/components/nci-anchor/index.vue';
 
 /** Import shared Typeface interfaces */
 import { Button } from '@/nci/app/interfaces';
@@ -47,5 +47,4 @@ const datab = {
 export const button: Story<Button> = Templateb.bind({})
 button.args = injectObject(Theme.anchor, datab)
 button.decorators = [() => ({ template: '<div class="mt-10"><story /></div>' })];
-//console.log(injectObject(Theme.anchor, datab))
-export { Sizes } from '@/nci/components/nci-anchor/stories/list/index.stories'
+export { Sizes } from '@/nci/app/components/nci-anchor/stories/list/index.stories'
diff --git a/nci/components/nci-anchor/stories/list/__test__/index.test.ts b/nci/app/components/nci-anchor/stories/list/__test__/index.test.ts
similarity index 83%
rename from nci/components/nci-anchor/stories/list/__test__/index.test.ts
rename to nci/app/components/nci-anchor/stories/list/__test__/index.test.ts
index 88a2ad0..a347ca3 100644
--- a/nci/components/nci-anchor/stories/list/__test__/index.test.ts
+++ b/nci/app/components/nci-anchor/stories/list/__test__/index.test.ts
@@ -2,8 +2,8 @@
 
 import { mount } from '@vue/test-utils';
 
-import { Sizes } from '@/nci/components/nci-anchor/stories/list/index.stories';
-import nciAnchor from '@/nci/components/nci-anchor/index.vue';
+import { Sizes } from '@/nci/app/components/nci-anchor/stories/list/index.stories';
+import nciAnchor from '@/nci/app/components/nci-anchor/index.vue';
 import { Button } from '@/nci/app/interfaces'
 
 //👇 Imports a specific story for the test
diff --git a/nci/components/nci-anchor/stories/list/index.stories.ts b/nci/app/components/nci-anchor/stories/list/index.stories.ts
similarity index 94%
rename from nci/components/nci-anchor/stories/list/index.stories.ts
rename to nci/app/components/nci-anchor/stories/list/index.stories.ts
index 760cae2..c994998 100644
--- a/nci/components/nci-anchor/stories/list/index.stories.ts
+++ b/nci/app/components/nci-anchor/stories/list/index.stories.ts
@@ -1,5 +1,5 @@
 /** Import the Nuxt Image component  */
-import nciAnchor from '@/nci/components/nci-anchor/index.vue';
+import nciAnchor from '@/nci/app/components/nci-anchor/index.vue';
 
 /** Import shared Typeface interfaces */
 import { Button } from '@/nci/app/interfaces';
diff --git a/nci/components/nci-image/__test__/index.test.ts b/nci/app/components/nci-image/__test__/index.test.ts
similarity index 94%
rename from nci/components/nci-image/__test__/index.test.ts
rename to nci/app/components/nci-image/__test__/index.test.ts
index c228ebd..04f6715 100644
--- a/nci/components/nci-image/__test__/index.test.ts
+++ b/nci/app/components/nci-image/__test__/index.test.ts
@@ -1,5 +1,5 @@
 import { mount } from '@vue/test-utils'
-import nciImage from '@/nci/components/nci-image/index.vue'
+import nciImage from '@/nci/app/components/nci-image/index.vue'
 import { Image } from '@/nci/app/interfaces';
 
 describe('nci-image component', () => {
diff --git a/nci/components/nci-image/index.vue b/nci/app/components/nci-image/index.vue
similarity index 100%
rename from nci/components/nci-image/index.vue
rename to nci/app/components/nci-image/index.vue
diff --git a/nci/components/nci-image/stories/image/__test__/index.test.ts b/nci/app/components/nci-image/stories/image/__test__/index.test.ts
similarity index 86%
rename from nci/components/nci-image/stories/image/__test__/index.test.ts
rename to nci/app/components/nci-image/stories/image/__test__/index.test.ts
index be564f5..a7fbab3 100644
--- a/nci/components/nci-image/stories/image/__test__/index.test.ts
+++ b/nci/app/components/nci-image/stories/image/__test__/index.test.ts
@@ -1,7 +1,7 @@
 import { mount } from '@vue/test-utils'
-import nciImage from '@/nci/components/nci-image/index.vue'
+import nciImage from '@/nci/app/components/nci-image/index.vue'
 
-import { image } from '@/nci/components/nci-image/stories/image/index.stories';
+import { image } from '@/nci/app/components/nci-image/stories/image/index.stories';
 
 /** Img Component Tests */
 /**
diff --git a/nci/components/nci-image/stories/image/index.stories.ts b/nci/app/components/nci-image/stories/image/index.stories.ts
similarity index 89%
rename from nci/components/nci-image/stories/image/index.stories.ts
rename to nci/app/components/nci-image/stories/image/index.stories.ts
index 27026ef..b46f50e 100644
--- a/nci/components/nci-image/stories/image/index.stories.ts
+++ b/nci/app/components/nci-image/stories/image/index.stories.ts
@@ -1,5 +1,5 @@
 /** Import the Nuxt Image component  */
-import nciImage from '@/nci/components/nci-image/index.vue';
+import nciImage from '@/nci/app/components/nci-image/index.vue';
 
 /** Import shared Typeface interfaces */
 import { Image } from '@/nci/app/interfaces';
@@ -44,4 +44,4 @@ export const image: Story<Image> = Templateb.bind({});
 image.args = data
 
 
-export { Sizes } from '@/nci/components/nci-image/stories/list/index.stories'
+export { Sizes } from '@/nci/app/components/nci-image/stories/list/index.stories'
diff --git a/nci/components/nci-image/stories/list/__test__/index.test.ts b/nci/app/components/nci-image/stories/list/__test__/index.test.ts
similarity index 84%
rename from nci/components/nci-image/stories/list/__test__/index.test.ts
rename to nci/app/components/nci-image/stories/list/__test__/index.test.ts
index 8c62508..f2468d6 100644
--- a/nci/components/nci-image/stories/list/__test__/index.test.ts
+++ b/nci/app/components/nci-image/stories/list/__test__/index.test.ts
@@ -2,8 +2,8 @@
 
 import { mount } from '@vue/test-utils';
 
-import { Sizes } from '@/nci/components/nci-image/stories/list/index.stories';
-import nciImage from '@/nci/components/nci-image/index.vue';
+import { Sizes } from '@/nci/app/components/nci-image/stories/list/index.stories';
+import nciImage from '@/nci/app/components/nci-image/index.vue';
 import { Image } from '@/nci/app/interfaces'
 
 // Imports a specific story for the test
diff --git a/nci/components/nci-image/stories/list/index.stories.ts b/nci/app/components/nci-image/stories/list/index.stories.ts
similarity index 95%
rename from nci/components/nci-image/stories/list/index.stories.ts
rename to nci/app/components/nci-image/stories/list/index.stories.ts
index 04e3243..8eacc75 100644
--- a/nci/components/nci-image/stories/list/index.stories.ts
+++ b/nci/app/components/nci-image/stories/list/index.stories.ts
@@ -1,5 +1,5 @@
 /** Import the Nuxt Image component  */
-import nciImage from '@/nci/components/nci-image/index.vue';
+import nciImage from '@/nci/app/components/nci-image/index.vue';
 
 /** Import shared Typeface interfaces */
 import { Image } from '@/nci/app/interfaces';
diff --git a/nci/components/nci-page/__test__/index.test.ts b/nci/app/components/nci-page/__test__/index.test.ts
similarity index 93%
rename from nci/components/nci-page/__test__/index.test.ts
rename to nci/app/components/nci-page/__test__/index.test.ts
index df18ea0..637ba0c 100644
--- a/nci/components/nci-page/__test__/index.test.ts
+++ b/nci/app/components/nci-page/__test__/index.test.ts
@@ -1,5 +1,5 @@
 import { mount } from '@vue/test-utils'
-import nciPage from '@/nci/components/nci-page/index.vue';
+import nciPage from '@/nci/app/components/nci-page/index.vue';
 
 import { Pages, Page } from '@/nci/app/interfaces';
 import Config from '@/nci/data/demo';
diff --git a/nci/components/nci-page/index.vue b/nci/app/components/nci-page/index.vue
similarity index 100%
rename from nci/components/nci-page/index.vue
rename to nci/app/components/nci-page/index.vue
diff --git a/nci/components/nci-section/__test__/index.test.ts b/nci/app/components/nci-section/__test__/index.test.ts
similarity index 93%
rename from nci/components/nci-section/__test__/index.test.ts
rename to nci/app/components/nci-section/__test__/index.test.ts
index c014eee..590f5fd 100644
--- a/nci/components/nci-section/__test__/index.test.ts
+++ b/nci/app/components/nci-section/__test__/index.test.ts
@@ -1,5 +1,5 @@
 import { mount } from '@vue/test-utils'
-import nciSection from '@/nci/components/nci-section/index.vue';
+import nciSection from '@/nci/app/components/nci-section/index.vue';
 
 import { Pages } from '@/nci/app/interfaces';
 import Config from '@/nci/data/demo';
@@ -32,6 +32,7 @@ describe('nci-section component', () => {
             propsData: pageSections[key2],
             stubs: ['nuxt-link']
           })
+
           /** Check the component mounted */
           expect(wrapper.vm).toBeTruthy();
         })
diff --git a/nci/components/nci-section/index.vue b/nci/app/components/nci-section/index.vue
similarity index 100%
rename from nci/components/nci-section/index.vue
rename to nci/app/components/nci-section/index.vue
diff --git a/nci/components/nci-section/stories/__test__/index.test.ts b/nci/app/components/nci-section/stories/__test__/index.test.ts
similarity index 88%
rename from nci/components/nci-section/stories/__test__/index.test.ts
rename to nci/app/components/nci-section/stories/__test__/index.test.ts
index 4bc4be0..2c55d93 100644
--- a/nci/components/nci-section/stories/__test__/index.test.ts
+++ b/nci/app/components/nci-section/stories/__test__/index.test.ts
@@ -1,6 +1,6 @@
 import registerComponents from '@/nci/app/testing/registerComponents'
 
-import { story } from '@/nci/components/nci-section/stories/index.stories'
+import { story } from '@/nci/app/components/nci-section/stories/index.stories'
 
 /** Section Component Tests */
 /**
diff --git a/nci/components/nci-section/stories/index.stories.ts b/nci/app/components/nci-section/stories/index.stories.ts
similarity index 100%
rename from nci/components/nci-section/stories/index.stories.ts
rename to nci/app/components/nci-section/stories/index.stories.ts
diff --git a/nci/components/nci-title/__test__/index.test.ts b/nci/app/components/nci-title/__test__/index.test.ts
similarity index 95%
rename from nci/components/nci-title/__test__/index.test.ts
rename to nci/app/components/nci-title/__test__/index.test.ts
index 5a55f1f..d0b39e3 100644
--- a/nci/components/nci-title/__test__/index.test.ts
+++ b/nci/app/components/nci-title/__test__/index.test.ts
@@ -1,5 +1,5 @@
 import { mount } from '@vue/test-utils'
-import nciTitle from '@/nci/components/nci-title/index.vue';
+import nciTitle from '@/nci/app/components/nci-title/index.vue';
 import { Title } from '@/nci/app/interfaces';
 
 /** Img Component Tests */
@@ -40,7 +40,6 @@ describe('nci-title component', () => {
     /** Check props match */
     expect(wrapper.props().value).toBe('My Awesome Website');
     expect(wrapper.props().tag).toBe("h1");
-
     /** Check an image exists in the DOM */
     expect(wrapper.find('h1').exists()).toBe(true);
 
diff --git a/nci/components/nci-title/index.vue b/nci/app/components/nci-title/index.vue
similarity index 100%
rename from nci/components/nci-title/index.vue
rename to nci/app/components/nci-title/index.vue
diff --git a/nci/components/nci-title/stories/list/__test__/index.test.ts b/nci/app/components/nci-title/stories/list/__test__/index.test.ts
similarity index 88%
rename from nci/components/nci-title/stories/list/__test__/index.test.ts
rename to nci/app/components/nci-title/stories/list/__test__/index.test.ts
index a636457..94b592d 100644
--- a/nci/components/nci-title/stories/list/__test__/index.test.ts
+++ b/nci/app/components/nci-title/stories/list/__test__/index.test.ts
@@ -1,7 +1,7 @@
 import { mount } from '@vue/test-utils'
-import nciTitle from '@/nci/components/nci-title/index.vue'
+import nciTitle from '@/nci/app/components/nci-title/index.vue'
 
-import { Sizes } from '@/nci/components/nci-title/stories/list/index.stories';
+import { Sizes } from '@/nci/app/components/nci-title/stories/list/index.stories';
 
 import { Title } from '@/nci/app/interfaces'
 
diff --git a/nci/components/nci-title/stories/list/index.stories.ts b/nci/app/components/nci-title/stories/list/index.stories.ts
similarity index 94%
rename from nci/components/nci-title/stories/list/index.stories.ts
rename to nci/app/components/nci-title/stories/list/index.stories.ts
index 70f98fe..be27e22 100644
--- a/nci/components/nci-title/stories/list/index.stories.ts
+++ b/nci/app/components/nci-title/stories/list/index.stories.ts
@@ -1,5 +1,5 @@
 /** Import the Nuxt Image component  */
-import nciTitle from '@/nci/components/nci-title/index.vue';
+import nciTitle from '@/nci/app/components/nci-title/index.vue';
 
 /** Import shared Typeface interfaces */
 import { Title } from '@/nci/app/interfaces';
diff --git a/nci/components/nci-title/stories/title/__test__/index.test.ts b/nci/app/components/nci-title/stories/title/__test__/index.test.ts
similarity index 86%
rename from nci/components/nci-title/stories/title/__test__/index.test.ts
rename to nci/app/components/nci-title/stories/title/__test__/index.test.ts
index ac304ee..e4a6dae 100644
--- a/nci/components/nci-title/stories/title/__test__/index.test.ts
+++ b/nci/app/components/nci-title/stories/title/__test__/index.test.ts
@@ -1,7 +1,7 @@
 import { mount } from '@vue/test-utils'
-import nciTitle from '@/nci/components/nci-title/index.vue'
+import nciTitle from '@/nci/app/components/nci-title/index.vue'
 
-import { title } from '@/nci/components/nci-title/stories/title/index.stories';
+import { title } from '@/nci/app/components/nci-title/stories/title/index.stories';
 
 /** Title Component Tests */
 /**
diff --git a/nci/components/nci-title/stories/title/index.stories.ts b/nci/app/components/nci-title/stories/title/index.stories.ts
similarity index 91%
rename from nci/components/nci-title/stories/title/index.stories.ts
rename to nci/app/components/nci-title/stories/title/index.stories.ts
index d17c548..de7c884 100644
--- a/nci/components/nci-title/stories/title/index.stories.ts
+++ b/nci/app/components/nci-title/stories/title/index.stories.ts
@@ -1,5 +1,5 @@
 /** Import the Nuxt Image component  */
-import nciTitle from '@/nci/components/nci-title/index.vue';
+import nciTitle from '@/nci/app/components/nci-title/index.vue';
 
 /** Import shared Typeface interfaces */
 import { Title } from '@/nci/app/interfaces';
@@ -53,4 +53,4 @@ const blah = injectObject(Theme.title, data)
 const result = blah;
 title.args = result
 
-export { Sizes } from '@/nci/components/nci-title/stories/list/index.stories'
+export { Sizes } from '@/nci/app/components/nci-title/stories/list/index.stories'
diff --git a/nci/app/helpers/math/floatToFixed/__test__/index.test.ts b/nci/app/helpers/math/floatToFixed/__test__/index.test.ts
new file mode 100644
index 0000000..acfd30a
--- /dev/null
+++ b/nci/app/helpers/math/floatToFixed/__test__/index.test.ts
@@ -0,0 +1,8 @@
+import { floatToFixed } from '@/nci/app/helpers/math/floatToFixed';
+
+describe('Set float decimal length', () => {
+  it('Should return a number with corresponding decimal place length', () => {
+    const checkNumber = floatToFixed(1.23945847584748, 2)
+    expect(checkNumber).toBe(1.24)
+  })
+})
diff --git a/nci/app/testing/registerComponents.ts b/nci/app/testing/registerComponents.ts
index 4f6b971..7648f3f 100644
--- a/nci/app/testing/registerComponents.ts
+++ b/nci/app/testing/registerComponents.ts
@@ -13,7 +13,7 @@ import Vue from 'vue';
 function registerComponents(): void {
 
   // Automatically register all components
-  const fileComponents = glob.sync(path.join(__dirname, '../../components/**/index.vue'));
+  const fileComponents = glob.sync(path.join(__dirname, '../components/**/index.vue'));
 
   // Iterate through components directory and add each file object to an array
   for (const file of fileComponents) {
diff --git a/nci/test/jest.setup.js b/nci/test/jest.setup.js
deleted file mode 100644
index f464328..0000000
--- a/nci/test/jest.setup.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import VueTestUtils from '@vue/test-utils'
-
-// Mock Nuxt components
-VueTestUtils.config.stubs['nuxt-link'] = '<a><slot /></a>'
-VueTestUtils.config.stubs['no-ssr'] = '<span><slot /></span>'
diff --git a/nuxt.config.ts b/nuxt.config.ts
index dd08913..aa83bc6 100644
--- a/nuxt.config.ts
+++ b/nuxt.config.ts
@@ -41,14 +41,14 @@ const config: NuxtConfig = {
       '@storybook/addon-controls',
       '@storybook/addon-notes',
     ],
-    stories: ['@/nci/components/**/*/index.stories.@(ts)']
+    stories: ['@/nci/app/components/**/*/index.stories.@(ts)']
   },
   tailwindcss: {
     cssPath: '@/assets/css/tailwind.css',
     configPath: '@/tailwind.config.ts',
   },
   // Auto import components: https://go.nuxtjs.dev/config-components
-  components: ['@/nci/components'/*'@/components'*/],
+  components: ['@/nci/app/components'/*'@/components'*/],
 
   // Modules for dev and build (recommended): https://go.nuxtjs.dev/config-modules
   buildModules: [