diff --git a/public/components/page/contact/ContactPage.jsx b/public/components/page/contact/ContactPage.jsx
index 20ff214..dca2f42 100644
--- a/public/components/page/contact/ContactPage.jsx
+++ b/public/components/page/contact/ContactPage.jsx
@@ -33,7 +33,7 @@ import Language from './../../../language/Language';
 import ElementScrollFader from './../../../objects/animation/fade/ElementScrollFader';
 import ContentBox from './../../../objects/content/ContentBox';
 import { Title, Heading1, Paragraph } from './../../../objects/typography/Typography';
-import Forms from './../../../common/Forms';
+//import Forms from './../../../common/Forms';
 import Input, {
   Form,
   FormManager,
@@ -41,7 +41,7 @@ import Input, {
   TextArea,
   Label,
   ButtonGroup
-} from './../../../input/Input';
+} from './../../../objects/input/Input';
 import Section, {
   BodySection,
   ClearSection,
diff --git a/public/components/page/home/sections/BannerSection.jsx b/public/components/page/home/sections/BannerSection.jsx
index 98e1b1f..d5da7c2 100644
--- a/public/components/page/home/sections/BannerSection.jsx
+++ b/public/components/page/home/sections/BannerSection.jsx
@@ -22,10 +22,10 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 import React from 'react';
-import Language from './../../../language/Language';
+import Language from './../../../../language/Language';
 import { PageBoundary } from './../../Page';
 import { ImageSection } from './../../../section/Section';
-import FloatingContentBox from './../../../content/FloatingContentBox';
+import FloatingContentBox from './../../../../objects/content/FloatingContentBox';
 import { Title, Subtitle } from './../../../../objects/typography/Typography';
 import ElementScrollFader from './../../../../objects/animation/fade/ElementScrollFader';
 
@@ -34,7 +34,7 @@ export default (props) => {
   return (
     <ImageSection
       className="p-home-page__banner"
-      src={ require('./../../../images/banners/about/glasses.svg') }
+      src={ require('./../../../../assets/images/banners/about/glasses.svg') }
       alt="domsPlace"
       width="2400"
       height="1200"
diff --git a/public/components/page/home/sections/ExistingWorkSection.jsx b/public/components/page/home/sections/ExistingWorkSection.jsx
index f4e84a5..13d710b 100644
--- a/public/components/page/home/sections/ExistingWorkSection.jsx
+++ b/public/components/page/home/sections/ExistingWorkSection.jsx
@@ -22,14 +22,14 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 import React from 'react';
-import Language from './../../../language/Language';
+import Language from './../../../../language/Language';
 import { PageBoundary } from './../../Page';
 import { ImageSection, SplitSection, Split, ClearSection } from './../../../section/Section';
-import ContentBox from './../../../content/ContentBox';
+import ContentBox from './../../../../objects/content/ContentBox';
 import { Title, Subtitle, Paragraph, Heading1, Heading2 } from './../../../../objects/typography/Typography';
-import { Button } from './../../../input/Input';
-import ElementScrollFader from './../../../animation/fade/ElementScrollFader';
-import Image from './../../../image/Image';
+import { Button } from './../../../../objects/input/Input';
+import ElementScrollFader from './../../../../objects/animation/fade/ElementScrollFader';
+import Image from './../../../../objects/image/Image';
 
 import Window95, {
   TitleBar, Close, Minimize,
@@ -37,7 +37,7 @@ import Window95, {
   ContextMenu, ContextMenuOption,
   Frame,
   AddressBar
-} from './../../../../object/window/Window95';
+} from './../../../../objects/window/Window95';
 
 const ExistingWorkFrame = (props) => {
   let fakeURL = props.href;
@@ -113,7 +113,7 @@ export default (props) => {
   return (
     <ImageSection
       className="p-home-page__promo p-home-page__promo-work"
-      src={ require('./../../../images/patterns/arcade.svg') }
+      src={ require('./../../../../assets/images/patterns/arcade.svg') }
       loadable
       background
     >
@@ -139,7 +139,7 @@ export default (props) => {
           href="//www.kopalife.com/products/kube-customise"
           fromLeft="top"
           fromRight="bottom"
-          src={ require('./../../../images/work-showcase/kopalife.png') }
+          src={ require('./../../../../assets/images/work-showcase/kopalife.png') }
           title={ Language.get("pages.home.work.kopa.heading") }
           description={ Language.get("pages.home.work.kopa.description") }
         />
@@ -150,7 +150,7 @@ export default (props) => {
           fromLeft="right"
           fromRight="right"
           swap
-          src={ require('./../../../images/work-showcase/smai.svg') }
+          src={ require('./../../../../assets/images/work-showcase/smai.svg') }
           title={ Language.get("pages.home.work.smai.heading") }
           description={ Language.get("pages.home.work.smai.description") }
         />
@@ -161,7 +161,7 @@ export default (props) => {
           fromLeft="left"
           fromRight="left"
 
-          src={ require('./../../../images/work-showcase/ozhair.png') }
+          src={ require('./../../../../assets/images/work-showcase/ozhair.png') }
           title={ Language.get("pages.home.work.ozhair.heading") }
           description={ Language.get("pages.home.work.ozhair.description") }
         />
diff --git a/public/components/page/home/sections/PlatformsSection.jsx b/public/components/page/home/sections/PlatformsSection.jsx
index e193b8f..c3652e7 100644
--- a/public/components/page/home/sections/PlatformsSection.jsx
+++ b/public/components/page/home/sections/PlatformsSection.jsx
@@ -22,15 +22,15 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 import React from 'react';
-import Language from './../../../language/Language';
+import Language from './../../../../language/Language';
 import { PageBoundary } from './../../Page';
 import { ImageSection, SplitSection, Split } from './../../../section/Section';
-import FloatingContentBox from './../../../content/FloatingContentBox';
-import ContentBox from './../../../content/ContentBox';
-import Image from './../../../image/Image';
-import Video from './../../../../video/Video';
+import FloatingContentBox from './../../../../objects/content/FloatingContentBox';
+import ContentBox from './../../../../objects/content/ContentBox';
+import Image from './../../../../objects/image/Image';
+import Video from './../../../../objects/video/Video';
 import { Title, Subtitle, Paragraph, Heading1 } from './../../../../objects/typography/Typography';
-import ElementScrollFader from './../../../animation/fade/ElementScrollFader';
+import ElementScrollFader from './../../../../objects/animation/fade/ElementScrollFader';
 
 const Platform = (props) => {
   let children;
@@ -60,7 +60,7 @@ export default (props) => {
   return (
     <ImageSection
       className="p-home-page__promo p-home-page__promo-platforms"
-      src={ require('./../../../images/patterns/game-show.svg') }
+      src={ require('./../../../../assets/images/patterns/game-show.svg') }
       loadable
       background
     >
@@ -74,14 +74,14 @@ export default (props) => {
         <div className="p-home-page__brands">
           {/* Shopify */}
           <Platform
-            src={require('./../../../images/branding/shopify/shopify_glyph.svg')}
+            src={require('./../../../../assets/images/branding/shopify/shopify_glyph.svg')}
             from="left"
             to="//www.shopify.com"
             title={ Language.get("pages.home.platforms.shopify") }
           />
           {/* React */}
           <Platform
-            src={require('./../../../images/branding/react/react-logo.svg')}
+            src={require('./../../../../assets/images/branding/react/react-logo.svg')}
             from="top"
             to="//reactjs.org"
             title={ Language.get("pages.home.platforms.react") }
@@ -89,7 +89,7 @@ export default (props) => {
 
           {/* MonoGame */}
           <Platform
-            src={require('./../../../images/branding/monogame/monogame-logo.svg')}
+            src={require('./../../../../assets/images/branding/monogame/monogame-logo.svg')}
             from="bottom"
             to="http://www.monogame.net"
             title={ Language.get("pages.home.platforms.monogame") }
@@ -97,7 +97,7 @@ export default (props) => {
 
           {/* PGSQL */}
           <Platform
-            src={require('./../../../images/branding/pgsql/pgsql-logo.svg')}
+            src={require('./../../../../assets/images/branding/pgsql/pgsql-logo.svg')}
             from="right"
             to="//www.postgresql.org"
             title={ Language.get("pages.home.platforms.pgsql") }
@@ -105,7 +105,7 @@ export default (props) => {
 
           {/* NodeJS */}
           <Platform
-            src={require('./../../../images/branding/nodejs/nodejs-logo.svg')}
+            src={require('./../../../../assets/images/branding/nodejs/nodejs-logo.svg')}
             from="top"
             to="//nodejs.org"
             title={ Language.get("pages.home.platforms.nodejs") }
@@ -113,7 +113,7 @@ export default (props) => {
 
           {/* C# */}
           <Platform
-            src={require('./../../../images/branding/csharp/csharp-logo.svg')}
+            src={require('./../../../../assets/images/branding/csharp/csharp-logo.svg')}
             from="top"
             to="//docs.microsoft.com/en-us/dotnet/csharp/"
             title={ Language.get("pages.home.platforms.csharp") }
@@ -121,7 +121,7 @@ export default (props) => {
 
           {/* PHP */}
           <Platform
-            src={require('./../../../images/branding/php/php-logo.svg')}
+            src={require('./../../../../assets/images/branding/php/php-logo.svg')}
             from="top"
             to="//php.net"
             title={ Language.get("pages.home.platforms.php") }
@@ -129,7 +129,7 @@ export default (props) => {
 
           {/* Java */}
           <Platform
-            src={require('./../../../images/branding/java/java-logo.svg')}
+            src={require('./../../../../assets/images/branding/java/java-logo.svg')}
             from="top"
             to="//java.com"
             title={ Language.get("pages.home.platforms.java") }
@@ -137,7 +137,7 @@ export default (props) => {
 
           {/* neto */}
           <Platform
-            src={require('./../../../images/branding/neto/neto-logo.svg')}
+            src={require('./../../../../assets/images/branding/neto/neto-logo.svg')}
             from="bottom"
             to="//www.neto.com.au"
             title={ Language.get("pages.home.platforms.neto") }
@@ -145,7 +145,7 @@ export default (props) => {
 
           {/* MySQL */}
           <Platform
-            src={require('./../../../images/branding/mysql/mysql-logo.svg')}
+            src={require('./../../../../assets/images/branding/mysql/mysql-logo.svg')}
             from="bottom"
             to="//www.mysql.com"
             title={ Language.get("pages.home.platforms.mysql") }
@@ -153,7 +153,7 @@ export default (props) => {
 
           {/* Heroku */}
           <Platform
-            src={require('./../../../images/branding/heroku/heroku-logo.svg')}
+            src={require('./../../../../assets/images/branding/heroku/heroku-logo.svg')}
             from="bottom"
             to="//heroku.com"
             title={ Language.get("pages.home.platforms.heroku") }
@@ -161,7 +161,7 @@ export default (props) => {
 
           {/* OpenGL */}
           <Platform
-            src={require('./../../../images/branding/opengl/opengl-logo.svg')}
+            src={require('./../../../../assets/images/branding/opengl/opengl-logo.svg')}
             from="bottom"
             to="//www.opengl.org"
             title={ Language.get("pages.home.platforms.opengl") }
@@ -169,7 +169,7 @@ export default (props) => {
 
           {/* Discord */}
           <Platform
-            src={ require('./../../../images/branding/discord/discord-logo.svg') }
+            src={ require('./../../../../assets/images/branding/discord/discord-logo.svg') }
             from="right"
             to="//discordapp.com"
             title={ Language.get("pages.home.platforms.discord") }
@@ -177,7 +177,7 @@ export default (props) => {
 
           {/* Twitch */}
           <Platform
-            src={ require('./../../../images/branding/twitch/twitch-logo.svg') }
+            src={ require('./../../../../assets/images/branding/twitch/twitch-logo.svg') }
             from="right"
             to="//twitch.tv"
             title={ Language.get("pages.home.platforms.twitch") }
@@ -185,7 +185,7 @@ export default (props) => {
 
           {/* Twitter */}
           <Platform
-            src={require('./../../../images/branding/twitter/twitter-logo.svg')}
+            src={require('./../../../../assets/images/branding/twitter/twitter-logo.svg')}
             from="left"
             to="//twitter.com"
             title={ Language.get("pages.home.platforms.twitter") }
@@ -193,7 +193,7 @@ export default (props) => {
 
           {/* Google Cloud */}
           <Platform
-            src={ require('./../../../images/branding/google-cloud/google-cloud-logo.svg') }
+            src={ require('./../../../../assets/images/branding/google-cloud/google-cloud-logo.svg') }
             from="left"
             to="//console.cloud.google.com"
             title={ Language.get("pages.home.platforms.googlecloud") }
diff --git a/public/components/page/home/sections/ProgrammingSection.jsx b/public/components/page/home/sections/ProgrammingSection.jsx
index bc073d2..f786135 100644
--- a/public/components/page/home/sections/ProgrammingSection.jsx
+++ b/public/components/page/home/sections/ProgrammingSection.jsx
@@ -23,18 +23,18 @@
 
 import React from 'react';
 import { connect } from 'react-redux';
-import Language from './../../../language/Language';
+import Language from './../../../../language/Language';
 import { PageBoundary } from './../../Page';
 import { ImageSection } from './../../../section/Section';
-import ContentBox from './../../../content/ContentBox';
+import ContentBox from './../../../../objects/content/ContentBox';
 import { Title, Paragraph, Heading1 } from './../../../../objects/typography/Typography';
-import ElementScrollFader from './../../../animation/fade/ElementScrollFader';
+import ElementScrollFader from './../../../../objects/animation/fade/ElementScrollFader';
 
 export default (props) => {
   return (
     <ImageSection
       className="p-home-page__promo p-home-page__promo-programming"
-      src={ require('./../../../images/patterns/rhythm-heaven.svg') }
+      src={ require('./../../../../assets/images/patterns/rhythm-heaven.svg') }
       loadable
       background
     >
diff --git a/public/components/page/home/sections/PromoVideoSection.jsx b/public/components/page/home/sections/PromoVideoSection.jsx
index 908c7fe..4672326 100644
--- a/public/components/page/home/sections/PromoVideoSection.jsx
+++ b/public/components/page/home/sections/PromoVideoSection.jsx
@@ -22,14 +22,14 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 import React from 'react';
-import Language from './../../../language/Language';
+import Language from './../../../../language/Language';
 import Page, { PageBoundary } from './../../Page';
 import Section, {  SplitSection, Split } from './../../../section/Section';
-import FloatingContentBox from './../../../content/FloatingContentBox';
-import ContentBox from './../../../content/ContentBox';
+import FloatingContentBox from './../../../../objects/content/FloatingContentBox';
+import ContentBox from './../../../../objects/content/ContentBox';
 import Video from './../../../../objects/video/Video';
 import { Title, Subtitle, Paragraph, Heading1 } from './../../../../objects/typography/Typography';
-import ElementScrollFader from './../../../animation/fade/ElementScrollFader';
+import ElementScrollFader from './../../../../objects/animation/fade/ElementScrollFader';
 
 
 export default (props) => {
@@ -42,7 +42,7 @@ export default (props) => {
             <ElementScrollFader>
               <Video
                 image={ require('./../../../../assets/videos/bunny/big_buck_bunny.jpg') }
-                mp4={ require('./../../../assets/videos/bunny/big_buck_bunny.mp4') }
+                mp4={ require('./../../../../assets/videos/bunny/big_buck_bunny.mp4') }
                 controls
               />
             </ElementScrollFader>
diff --git a/public/objects/window/AddressBar.jsx b/public/objects/window/AddressBar.jsx
index f4f1c54..0a938dc 100644
--- a/public/objects/window/AddressBar.jsx
+++ b/public/objects/window/AddressBar.jsx
@@ -24,7 +24,7 @@
 import React from 'react';
 import { connect } from 'react-redux';
 import Frame from './Frame';
-import Language from './../language/Language';
+import Language from './../../language/Language';
 
 class AddressBar extends React.Component {
   constructor(props) {