diff --git a/public/components/nav/menu/HamburgerMenu.jsx b/public/components/nav/menu/HamburgerMenu.jsx
index 5e5b9cd..be2d2f7 100644
--- a/public/components/nav/menu/HamburgerMenu.jsx
+++ b/public/components/nav/menu/HamburgerMenu.jsx
@@ -24,8 +24,8 @@
 import React from 'react';
 import { connect } from 'react-redux';
 import { NavLink } from 'react-router-dom';
-import Language from './../../language/Language';
-import * as MenuActions from './../../actions/MenuActions';
+import Language from './../../../language/Language';
+import * as MenuActions from './../../../actions/MenuActions';
 
 const HamburerMenuItem = function(props) {
   return (
@@ -55,7 +55,7 @@ class HamburgerMenu extends React.Component {
           onClick={this.props.toggleMenu}
         >
           <img
-            src={ require('./../../images/icons/hamburger.svg') }
+            src={ require('./../../../assets/images/icons/hamburger.svg') }
             className="c-hamburger-menu__icon"
           />
         </button>
diff --git a/public/components/nav/navbar/Navbar.jsx b/public/components/nav/navbar/Navbar.jsx
index 52c65fa..26dcfca 100644
--- a/public/components/nav/navbar/Navbar.jsx
+++ b/public/components/nav/navbar/Navbar.jsx
@@ -26,9 +26,9 @@ import { withRouter } from 'react-router';
 import { connect } from 'react-redux';
 import { NavLink } from 'react-router-dom'
 import PageBoundary from './../../page/PageBoundary';
-import Language from './../../language/Language';
+import Language from './../../../language/Language';
 import HamburgerMenu from './../menu/HamburgerMenu';
-import Image from './../../image/Image';
+import Image from './../../../objects/image/Image';
 
 const NavbarLink = function(props) {
   return (
@@ -53,7 +53,7 @@ class Navbar extends React.Component {
             {/* Logo */}
             <NavLink to="/" className="c-navbar__logo-container" activeClassName="is-active">
               <Image
-                src={ require('./../../images/logo.svg') }
+                src={ require('./../../../assets/images/logo.svg') }
                 className="c-navbar__logo"
                 alt={ Language.get("site.name") }
                 title={ Language.get("site.name") }
diff --git a/public/components/page/contact/ContactPage.jsx b/public/components/page/contact/ContactPage.jsx
index 252dff7..20ff214 100644
--- a/public/components/page/contact/ContactPage.jsx
+++ b/public/components/page/contact/ContactPage.jsx
@@ -24,11 +24,15 @@
 import React from 'react';
 import { connect } from 'react-redux';
 import { bindActionCreators } from 'redux';
+
+//Components
 import Page, { PageBoundary } from './../Page';
-import Language from './../../language/Language';
-import ElementScrollFader from './../../animation/fade/ElementScrollFader';
-import ContentBox from './../../content/ContentBox';
-import { Title, Heading1, Paragraph } from './../../typography/Typography';
+import Language from './../../../language/Language';
+
+//Objects
+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 Input, {
   Form,
@@ -37,15 +41,15 @@ import Input, {
   TextArea,
   Label,
   ButtonGroup
-} from './../../input/Input';
+} from './../../../input/Input';
 import Section, {
   BodySection,
   ClearSection,
   SplitSection,
   Split
 } from './../../section/Section';
-import { openModal } from './../../actions/ModalActions';
-import Modal from './../../modal/Modal';
+import { openModal } from './../../../actions/ModalActions';
+import Modal from './../../../objects/modal/Modal';
 
 class ContactPage extends React.Component {
   constructor(props) {
diff --git a/public/components/page/home/HomePage.jsx b/public/components/page/home/HomePage.jsx
index 9a21768..5346a85 100644
--- a/public/components/page/home/HomePage.jsx
+++ b/public/components/page/home/HomePage.jsx
@@ -24,7 +24,7 @@
 import React from 'react';
 import { connect } from 'react-redux';
 import Page from './../Page';
-import Language from './../../language/Language'
+import Language from './../../../language/Language'
 
 import BannerSection from './sections/BannerSection';
 import PromoVideoSection from './sections/PromoVideoSection';
diff --git a/public/components/page/home/sections/BannerSection.jsx b/public/components/page/home/sections/BannerSection.jsx
index d1d7b48..98e1b1f 100644
--- a/public/components/page/home/sections/BannerSection.jsx
+++ b/public/components/page/home/sections/BannerSection.jsx
@@ -26,8 +26,8 @@ import Language from './../../../language/Language';
 import { PageBoundary } from './../../Page';
 import { ImageSection } from './../../../section/Section';
 import FloatingContentBox from './../../../content/FloatingContentBox';
-import { Title, Subtitle } from './../../../typography/Typography';
-import ElementScrollFader from './../../../animation/fade/ElementScrollFader';
+import { Title, Subtitle } from './../../../../objects/typography/Typography';
+import ElementScrollFader from './../../../../objects/animation/fade/ElementScrollFader';
 
 
 export default (props) => {
diff --git a/public/components/page/home/sections/ExistingWorkSection.jsx b/public/components/page/home/sections/ExistingWorkSection.jsx
index d6f5d2e..f4e84a5 100644
--- a/public/components/page/home/sections/ExistingWorkSection.jsx
+++ b/public/components/page/home/sections/ExistingWorkSection.jsx
@@ -26,7 +26,7 @@ import Language from './../../../language/Language';
 import { PageBoundary } from './../../Page';
 import { ImageSection, SplitSection, Split, ClearSection } from './../../../section/Section';
 import ContentBox from './../../../content/ContentBox';
-import { Title, Subtitle, Paragraph, Heading1, Heading2 } from './../../../typography/Typography';
+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';
@@ -37,7 +37,7 @@ import Window95, {
   ContextMenu, ContextMenuOption,
   Frame,
   AddressBar
-} from './../../../window/Window95';
+} from './../../../../object/window/Window95';
 
 const ExistingWorkFrame = (props) => {
   let fakeURL = props.href;
diff --git a/public/components/page/home/sections/PlatformsSection.jsx b/public/components/page/home/sections/PlatformsSection.jsx
index db3db7a..e193b8f 100644
--- a/public/components/page/home/sections/PlatformsSection.jsx
+++ b/public/components/page/home/sections/PlatformsSection.jsx
@@ -28,8 +28,8 @@ 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 { Title, Subtitle, Paragraph, Heading1 } from './../../../typography/Typography';
+import Video from './../../../../video/Video';
+import { Title, Subtitle, Paragraph, Heading1 } from './../../../../objects/typography/Typography';
 import ElementScrollFader from './../../../animation/fade/ElementScrollFader';
 
 const Platform = (props) => {
diff --git a/public/components/page/home/sections/ProgrammingSection.jsx b/public/components/page/home/sections/ProgrammingSection.jsx
index 9ea939f..bc073d2 100644
--- a/public/components/page/home/sections/ProgrammingSection.jsx
+++ b/public/components/page/home/sections/ProgrammingSection.jsx
@@ -27,7 +27,7 @@ import Language from './../../../language/Language';
 import { PageBoundary } from './../../Page';
 import { ImageSection } from './../../../section/Section';
 import ContentBox from './../../../content/ContentBox';
-import { Title, Paragraph, Heading1 } from './../../../typography/Typography';
+import { Title, Paragraph, Heading1 } from './../../../../objects/typography/Typography';
 import ElementScrollFader from './../../../animation/fade/ElementScrollFader';
 
 export default (props) => {
diff --git a/public/components/page/home/sections/PromoVideoSection.jsx b/public/components/page/home/sections/PromoVideoSection.jsx
index 943f802..908c7fe 100644
--- a/public/components/page/home/sections/PromoVideoSection.jsx
+++ b/public/components/page/home/sections/PromoVideoSection.jsx
@@ -27,8 +27,8 @@ import Page, { PageBoundary } from './../../Page';
 import Section, {  SplitSection, Split } from './../../../section/Section';
 import FloatingContentBox from './../../../content/FloatingContentBox';
 import ContentBox from './../../../content/ContentBox';
-import Video from './../../../video/Video';
-import { Title, Subtitle, Paragraph, Heading1 } from './../../../typography/Typography';
+import Video from './../../../../objects/video/Video';
+import { Title, Subtitle, Paragraph, Heading1 } from './../../../../objects/typography/Typography';
 import ElementScrollFader from './../../../animation/fade/ElementScrollFader';
 
 
@@ -41,8 +41,8 @@ export default (props) => {
           <Split className="u-text-center" padded>
             <ElementScrollFader>
               <Video
-                image={ require('./../../../videos/bunny/big_buck_bunny.jpg') }
-                mp4={ require('./../../../videos/bunny/big_buck_bunny.mp4') }
+                image={ require('./../../../../assets/videos/bunny/big_buck_bunny.jpg') }
+                mp4={ require('./../../../assets/videos/bunny/big_buck_bunny.mp4') }
                 controls
               />
             </ElementScrollFader>
diff --git a/public/components/page/legal/privacy/PrivacyPolicyPage.jsx b/public/components/page/legal/privacy/PrivacyPolicyPage.jsx
index 70a7a15..7140080 100644
--- a/public/components/page/legal/privacy/PrivacyPolicyPage.jsx
+++ b/public/components/page/legal/privacy/PrivacyPolicyPage.jsx
@@ -23,10 +23,10 @@
 
 import React from 'react';
 import { connect } from 'react-redux';
-import Language from './../../../language/Language';
+import Language from './../../../../language/Language';
 import Page, { PageBoundary } from './../../Page';
 import { BodySection, ClearSection } from './../../../section/Section';
-import { Title } from './../../../typography/Typography';
+import { Title } from './../../../../objects/typography/Typography';
 
 const PrivacyPolicyPage = (props) => {
   return (
diff --git a/public/components/section/image/ImageSection.jsx b/public/components/section/image/ImageSection.jsx
index 4dfc723..3a1f4fb 100644
--- a/public/components/section/image/ImageSection.jsx
+++ b/public/components/section/image/ImageSection.jsx
@@ -23,7 +23,7 @@
 
 import React from 'react';
 import Section from './../Section';
-import Image from './../../image/Image';
+import Image from './../../../objects/image/Image';
 
 export default function(props) {
   let image;
diff --git a/public/components/section/video/VideoSection.jsx b/public/components/section/video/VideoSection.jsx
index 3a5c6e6..8406d77 100644
--- a/public/components/section/video/VideoSection.jsx
+++ b/public/components/section/video/VideoSection.jsx
@@ -23,8 +23,8 @@
 
 import React from 'react';
 import Section from './../Section';
-import Video from './../../video/Video';
-import Loader from './../../loading/Loader';
+import Video from './../../../objects/video/Video';
+import Loader from './../../../objects/loading/Loader';
 
 class VideoSection extends React.Component {
   constructor(props) {
diff --git a/public/objects/input/Input.jsx b/public/objects/input/Input.jsx
index d0e3603..bb9266e 100644
--- a/public/objects/input/Input.jsx
+++ b/public/objects/input/Input.jsx
@@ -28,7 +28,7 @@ import ButtonGroup from './button/ButtonGroup';
 import Form, { FormManager } from './form/Form';
 import InputGroup from './group/InputGroup';
 import Label from './label/Label';
-import Keyboard from './../keyboard/Keyboard';
+import Keyboard from './../../keyboard/Keyboard';
 
 export default class Input extends React.Component {
   constructor(props) {
diff --git a/public/objects/modal/Modal.jsx b/public/objects/modal/Modal.jsx
index 75c2a5d..82563a9 100644
--- a/public/objects/modal/Modal.jsx
+++ b/public/objects/modal/Modal.jsx
@@ -26,10 +26,10 @@ import { connect } from 'react-redux';
 import { bindActionCreators } from 'redux';
 import { CSSTransition, TransitionGroup } from 'react-transition-group';
 import { Button } from './../input/Input';
-import Language from './../language/Language';
-import { openModal, closeModal } from './../actions/ModalActions';
+import Language from './../../language/Language';
+import { openModal, closeModal } from './../../actions/ModalActions';
 import { Heading4 } from './../typography/Typography';
-import Keyboard from './../keyboard/Keyboard';
+import Keyboard from './../../keyboard/Keyboard';
 
 class Modal extends React.Component {
   constructor(props) {