diff --git a/public/components/App.jsx b/public/components/App.jsx
index 4571fc7..2aae2d0 100644
--- a/public/components/App.jsx
+++ b/public/components/App.jsx
@@ -32,8 +32,6 @@ import Footer from './footer/Footer';
 import Routes, { RouteWrapper } from './page/route/Routes';
 import Favicon from './Favicon';
 
-import Background from '@objects/background/Background';
-
 //Routes Definitions
 const AppRoutes = (props) => {
   return (
diff --git a/public/objects/background/Background.jsx b/public/objects/background/Background.jsx
deleted file mode 100644
index 0ed9c79..0000000
--- a/public/objects/background/Background.jsx
+++ /dev/null
@@ -1,40 +0,0 @@
-// Copyright (c) 2018 Dominic Masters
-//
-// MIT License
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-import React from 'react';
-
-import Styles from './Background.scss';
-
-export default function(props) {
-  let style = props.style || "test";
-  let styleClassPrefix = "o-background--style-"+style;
-  let inners = [];
-
-  return (
-    <div className={"o-background "+styleClassPrefix}>
-      <div className={"o-background__inner " + styleClassPrefix + "__inner" }>
-        { inners }
-      </div>
-    </div>
-  );
-}
diff --git a/public/objects/background/Background.scss b/public/objects/background/Background.scss
deleted file mode 100644
index e69de29..0000000
diff --git a/public/objects/content/ContentBox.jsx b/public/objects/content/box/ContentBox.jsx
similarity index 83%
rename from public/objects/content/ContentBox.jsx
rename to public/objects/content/box/ContentBox.jsx
index 917fa15..3bd1f6b 100644
--- a/public/objects/content/ContentBox.jsx
+++ b/public/objects/content/box/ContentBox.jsx
@@ -23,15 +23,17 @@
 
 import React from 'react';
 
+import Styles from './ContentBox';
+
 export default (props) => {
+  let newProps = {...props};
+  let { className, box } = props;
+  
+  delete newProps.box;
+
   let clazz = "o-content-box";
+  if(box) clazz += " is-box"
+  if(className) clazz += ` ${className}`;
 
-  if(props.box) clazz += " is-box"
-  if(props.className) clazz += " " + props.className;
-
-  return (
-    <div className={clazz}>
-      {props.children}
-    </div>
-  );
+  return <div {...newProps} className={clazz} />;
 };
diff --git a/public/styles/objects/_content-box.scss b/public/objects/content/box/ContentBox.scss
similarity index 93%
rename from public/styles/objects/_content-box.scss
rename to public/objects/content/box/ContentBox.scss
index fb3079b..15b85d7 100644
--- a/public/styles/objects/_content-box.scss
+++ b/public/objects/content/box/ContentBox.scss
@@ -9,6 +9,7 @@
  *  Version:
  *    1.0.0 - 2018/06/19
  */
+@import '~@styles/global';
 $o-content-box--padding: 1em;
 
 .o-content-box {
diff --git a/public/objects/content/FloatingContentBox.jsx b/public/objects/content/box/FloatingContentBox.jsx
similarity index 76%
rename from public/objects/content/FloatingContentBox.jsx
rename to public/objects/content/box/FloatingContentBox.jsx
index a45b863..b909226 100644
--- a/public/objects/content/FloatingContentBox.jsx
+++ b/public/objects/content/box/FloatingContentBox.jsx
@@ -22,28 +22,34 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 import React from 'react';
+
+import Styles from './FloatingContentBox';
+
 import ContentBox from './ContentBox';
 
-export default function(props) {
+export default (props) => {
+  let newProps = {...props};
+  let { position, size, children, className } = props;
+
+  ["position","size","children"].forEach(e => delete newProps[e]);
+
   let clazzes = "o-floating-content-box";
 
   //Positions
-  let position = "middle center";
-  if(props.position) position = props.position;
+  position = position || "middle center";
   clazzes += " " + position.split(" ").map(i => 'is-'+i).join(" ");
 
   //Sizes`
-  let size = "medium";
-  if(props.size) size = props.size;
-  clazzes += " is-"+size;
+  size = size || "medium";
+  clazzes += ` is-${size}`;
 
   //Custom Classes
-  if(props.className) clazzes += " " + props.className;
+  if(className) clazzes += ` ${className}`;
 
   return (
-    <ContentBox {...props} className={ clazzes }>
+    <ContentBox {...newProps} className={ clazzes }>
       <div className="o-floating-content-box__inner">
-        { props.children }
+        { children }
       </div>
     </ContentBox>
   );
diff --git a/public/styles/objects/_floating-content-box.scss b/public/objects/content/box/FloatingContentBox.scss
similarity index 96%
rename from public/styles/objects/_floating-content-box.scss
rename to public/objects/content/box/FloatingContentBox.scss
index c1fc997..0f13a68 100644
--- a/public/styles/objects/_floating-content-box.scss
+++ b/public/objects/content/box/FloatingContentBox.scss
@@ -10,6 +10,8 @@
  *  Version:
  *    1.0.0 - 2018/05/11
  */
+@import '~@styles/global';
+
 $o-floating--inset: 5%;
 
 .o-floating-content-box {
diff --git a/public/pages/contact/ContactPage.jsx b/public/pages/contact/ContactPage.jsx
index ddcc033..f276ba0 100644
--- a/public/pages/contact/ContactPage.jsx
+++ b/public/pages/contact/ContactPage.jsx
@@ -42,7 +42,7 @@ import Section, {
 
 //Objects
 import ElementScrollFader from '@objects/animation/fade/ElementScrollFader';
-import ContentBox from '@objects/content/ContentBox';
+import ContentBox from '@objects/content/box/ContentBox';
 import { Title, Heading1, Paragraph } from '@objects/typography/Typography';
 import Input, {
   Form,
diff --git a/public/pages/home/sections/BannerSection.jsx b/public/pages/home/sections/BannerSection.jsx
index 77c43da..e682fa9 100644
--- a/public/pages/home/sections/BannerSection.jsx
+++ b/public/pages/home/sections/BannerSection.jsx
@@ -25,7 +25,7 @@ import React from 'react';
 import Language from '@public/language/Language';
 import { PageBoundary } from '@components/page/Page';
 import { ImageSection } from '@components/section/Section';
-import FloatingContentBox from '@objects/content/FloatingContentBox';
+import FloatingContentBox from '@objects/content/box/FloatingContentBox';
 import { Title, Subtitle } from '@objects/typography/Typography';
 import ElementScrollFader from '@objects/animation/fade/ElementScrollFader';
 
diff --git a/public/pages/home/sections/ExistingWorkSection.jsx b/public/pages/home/sections/ExistingWorkSection.jsx
index 0720269..f9f42d4 100644
--- a/public/pages/home/sections/ExistingWorkSection.jsx
+++ b/public/pages/home/sections/ExistingWorkSection.jsx
@@ -25,7 +25,7 @@ import React from 'react';
 import Language from '@public/language/Language';
 import { PageBoundary } from '@components/page/Page';
 import { ImageSection, SplitSection, Split, ClearSection } from '@components/section/Section';
-import ContentBox from '@objects/content/ContentBox';
+import ContentBox from '@objects/content/box/ContentBox';
 import { Title, Subtitle, Paragraph, Heading1, Heading2 } from '@objects/typography/Typography';
 import { Button } from '@objects/input/Input';
 import ElementScrollFader from '@objects/animation/fade/ElementScrollFader';
diff --git a/public/pages/home/sections/PlatformsSection.jsx b/public/pages/home/sections/PlatformsSection.jsx
index 7f1c683..d29c8c1 100644
--- a/public/pages/home/sections/PlatformsSection.jsx
+++ b/public/pages/home/sections/PlatformsSection.jsx
@@ -25,8 +25,8 @@ import React from 'react';
 import Language from '@public/language/Language';
 import { PageBoundary } from '@components/page/Page';
 import { ImageSection, SplitSection, Split } from '@components/section/Section';
-import FloatingContentBox from '@objects/content/FloatingContentBox';
-import ContentBox from '@objects/content/ContentBox';
+import FloatingContentBox from '@objects/content/box/FloatingContentBox';
+import ContentBox from '@objects/content/box/ContentBox';
 import Image from '@objects/image/Image';
 import Video from '@objects/video/Video';
 import { Title, Subtitle, Paragraph, Heading1 } from '@objects/typography/Typography';
diff --git a/public/pages/home/sections/ProgrammingSection.jsx b/public/pages/home/sections/ProgrammingSection.jsx
index b2fd956..b46ee7c 100644
--- a/public/pages/home/sections/ProgrammingSection.jsx
+++ b/public/pages/home/sections/ProgrammingSection.jsx
@@ -26,7 +26,7 @@ import { connect } from 'react-redux';
 import Language from '@public/language/Language';
 import { PageBoundary } from '@components/page/Page';
 import { ImageSection } from '@components/section/Section';
-import ContentBox from '@objects/content/ContentBox';
+import ContentBox from '@objects/content/box/ContentBox';
 import { Title, Paragraph, Heading1 } from '@objects/typography/Typography';
 import ElementScrollFader from '@objects/animation/fade/ElementScrollFader';
 
diff --git a/public/pages/home/sections/PromoVideoSection.jsx b/public/pages/home/sections/PromoVideoSection.jsx
index dea9eea..e5bbc89 100644
--- a/public/pages/home/sections/PromoVideoSection.jsx
+++ b/public/pages/home/sections/PromoVideoSection.jsx
@@ -25,8 +25,8 @@ import React from 'react';
 import Language from '@public/language/Language';
 import Page, { PageBoundary } from '@components/page/Page';
 import Section, {  SplitSection, Split } from '@components/section/Section';
-import FloatingContentBox from '@objects/content/FloatingContentBox';
-import ContentBox from '@objects/content/ContentBox';
+import ContentBox from '@objects/content/box/ContentBox';
+import FloatingContentBox from '@objects/content/box/FloatingContentBox';
 import Video from '@objects/video/Video';
 import { Title, Subtitle, Paragraph, Heading1 } from '@objects/typography/Typography';
 import ElementScrollFader from '@objects/animation/fade/ElementScrollFader';