diff --git a/src/components/Menu/Menu.css b/src/components/Menu/Menu.css
deleted file mode 100644
index e69de29..0000000
diff --git a/src/components/Tabs/Tab/Tab.js b/src/components/Tab/Tab.js
similarity index 90%
rename from src/components/Tabs/Tab/Tab.js
rename to src/components/Tab/Tab.js
index 249e6e8..b8f4751 100644
--- a/src/components/Tabs/Tab/Tab.js
+++ b/src/components/Tab/Tab.js
@@ -2,8 +2,8 @@ import React from "react";
 import propTypes from "prop-types";
 
 import styled from "styled-components";
-import { createBorderStyles, createBoxStyles } from "../../common";
-import { blockSizes, padding, colors } from "../../common/theme.variables";
+import { createBorderStyles, createBoxStyles } from "../common";
+import { blockSizes, padding, colors } from "../common/theme.variables";
 
 const StyledTab = styled.div`
   ${createBoxStyles()}
diff --git a/src/components/Tabs/TabBody/TabBody.js b/src/components/TabBody/TabBody.js
similarity index 84%
rename from src/components/Tabs/TabBody/TabBody.js
rename to src/components/TabBody/TabBody.js
index dcbbd41..c73c51f 100644
--- a/src/components/Tabs/TabBody/TabBody.js
+++ b/src/components/TabBody/TabBody.js
@@ -2,8 +2,8 @@ import React from "react";
 import propTypes from "prop-types";
 
 import styled from "styled-components";
-import { createBorderStyles, createBoxStyles } from "../../common";
-import { padding } from "../../common/theme.variables";
+import { createBorderStyles, createBoxStyles } from "../common";
+import { padding } from "../common/theme.variables";
 
 const StyledTabBody = styled.div`
   ${createBoxStyles()}
diff --git a/src/components/Table/Table.stories.js b/src/components/Table/Table.stories.js
index e7e86d6..f9118aa 100644
--- a/src/components/Table/Table.stories.js
+++ b/src/components/Table/Table.stories.js
@@ -2,11 +2,11 @@ import React from "react";
 import { storiesOf } from "@storybook/react";
 
 import Table from "./Table";
-import TableBody from "./TableBody/TableBody";
-import TableHead from "./TableHead/TableHead";
-import TableRow from "./TableRow/TableRow";
-import TableHeaderCell from "./TableHeaderCell/TableHeaderCell";
-import TableDataCell from "./TableDataCell/TableDataCell";
+import TableBody from "../TableBody/TableBody";
+import TableHead from "../TableHead/TableHead";
+import TableRow from "../TableRow/TableRow";
+import TableHeadCell from "../TableHeadCell/TableHeadCell";
+import TableDataCell from "../TableDataCell/TableDataCell";
 
 import Window from "../Window/Window";
 import WindowHeader from "../WindowHeader/WindowHeader";
@@ -21,9 +21,9 @@ class SimpleTable extends React.Component {
           <Table>
             <TableHead>
               <TableRow head>
-                <TableHeaderCell>Name</TableHeaderCell>
-                <TableHeaderCell>Swag</TableHeaderCell>
-                <TableHeaderCell>Ready</TableHeaderCell>
+                <TableHeadCell>Name</TableHeadCell>
+                <TableHeadCell>Swag</TableHeadCell>
+                <TableHeadCell>Ready</TableHeadCell>
               </TableRow>
             </TableHead>
             <TableBody>
diff --git a/src/components/Table/TableBody/TableBody.js b/src/components/TableBody/TableBody.js
similarity index 86%
rename from src/components/Table/TableBody/TableBody.js
rename to src/components/TableBody/TableBody.js
index bb27dbb..661d6ef 100644
--- a/src/components/Table/TableBody/TableBody.js
+++ b/src/components/TableBody/TableBody.js
@@ -2,8 +2,8 @@ import React from "react";
 import propTypes from "prop-types";
 
 import styled from "styled-components";
-import { colors } from "../../common/theme.variables";
-import { insetShadow } from "../../common";
+import { colors } from "../common/theme.variables";
+import { insetShadow } from "../common";
 
 const StyledTableBody = styled.tbody`
   background: ${colors.light};
diff --git a/src/components/Table/TableDataCell/TableDataCell.js b/src/components/TableDataCell/TableDataCell.js
similarity index 90%
rename from src/components/Table/TableDataCell/TableDataCell.js
rename to src/components/TableDataCell/TableDataCell.js
index e3f9982..fbeaef7 100644
--- a/src/components/Table/TableDataCell/TableDataCell.js
+++ b/src/components/TableDataCell/TableDataCell.js
@@ -2,7 +2,7 @@ import React from "react";
 import propTypes from "prop-types";
 
 import styled from "styled-components";
-import { padding } from "../../common/theme.variables";
+import { padding } from "../common/theme.variables";
 
 const StyledTd = styled.td`
   padding: 0 ${padding.sm};
diff --git a/src/components/Table/TableHead/TableHead.js b/src/components/TableHead/TableHead.js
similarity index 100%
rename from src/components/Table/TableHead/TableHead.js
rename to src/components/TableHead/TableHead.js
diff --git a/src/components/Table/TableHeaderCell/TableHeaderCell.js b/src/components/TableHeadCell/TableHeadCell.js
similarity index 70%
rename from src/components/Table/TableHeaderCell/TableHeaderCell.js
rename to src/components/TableHeadCell/TableHeadCell.js
index aba1bf1..29dab7c 100644
--- a/src/components/Table/TableHeaderCell/TableHeaderCell.js
+++ b/src/components/TableHeadCell/TableHeadCell.js
@@ -2,8 +2,8 @@ import React from "react";
 import propTypes from "prop-types";
 
 import styled from "styled-components";
-import { createBorderStyles } from "../../common";
-import { padding } from "../../common/theme.variables";
+import { createBorderStyles } from "../common";
+import { padding } from "../common/theme.variables";
 
 // ⭕⭕⭕⭕ move text down on Click
 
@@ -22,7 +22,7 @@ const StyledHeadCell = styled.th`
   cursor: default;
 `;
 
-const TableHeaderCell = ({ className, children, style, ...otherProps }) => {
+const TableHeadCell = ({ className, children, style, ...otherProps }) => {
   return (
     <StyledHeadCell className={className} style={style} {...otherProps}>
       {children}
@@ -30,14 +30,14 @@ const TableHeaderCell = ({ className, children, style, ...otherProps }) => {
   );
 };
 
-TableHeaderCell.defaultProps = {
+TableHeadCell.defaultProps = {
   onClick: null
 };
 
-TableHeaderCell.propTypes = {
+TableHeadCell.propTypes = {
   children: propTypes.node,
   className: propTypes.string,
   style: propTypes.object
 };
 
-export default TableHeaderCell;
+export default TableHeadCell;
diff --git a/src/components/Table/TableRow/TableRow.js b/src/components/TableRow/TableRow.js
similarity index 92%
rename from src/components/Table/TableRow/TableRow.js
rename to src/components/TableRow/TableRow.js
index b85f79c..9c0eca9 100644
--- a/src/components/Table/TableRow/TableRow.js
+++ b/src/components/TableRow/TableRow.js
@@ -2,7 +2,7 @@ import React from "react";
 import propTypes from "prop-types";
 
 import styled from "styled-components";
-import { blockSizes, colors } from "../../common/theme.variables";
+import { blockSizes, colors } from "../common/theme.variables";
 
 const StyledTr = styled.tr`
   color: inherit;
diff --git a/src/components/Tabs/TabBody/TabBody.css b/src/components/Tabs/TabBody/TabBody.css
deleted file mode 100644
index 7ee2a4c..0000000
--- a/src/components/Tabs/TabBody/TabBody.css
+++ /dev/null
@@ -1,25 +0,0 @@
-.TabBody {
-  position: relative;
-  height: 100%;
-  padding: 2em 1em 1em 1em;
-  background: #ced0cf;
-  border-top: 2px solid #fff;
-  border-left: 2px solid #fff;
-  border-bottom: 2px solid #050608;
-  border-right: 2px solid #050608;
-}
-.TabBody:before {
-  padding: 0;
-  content: "";
-  display: inline-block;
-  position: absolute;
-  left: 0px;
-  top: 0px;
-  width: calc(100% - 4px);
-  height: calc(100% - 4px);
-
-  border-top: 2px solid #dfe0e3;
-  border-left: 2px solid #dfe0e3;
-  border-bottom: 2px solid #888c8f;
-  border-right: 2px solid #888c8f;
-}
diff --git a/src/components/Tabs/Tabs.stories.js b/src/components/Tabs/Tabs.stories.js
index fdbdb44..f5b4548 100644
--- a/src/components/Tabs/Tabs.stories.js
+++ b/src/components/Tabs/Tabs.stories.js
@@ -2,8 +2,8 @@ import React from "react";
 import { storiesOf } from "@storybook/react";
 
 import Tabs from "./Tabs";
-import Tab from "./Tab/Tab";
-import TabBody from "./TabBody/TabBody";
+import Tab from "../Tab/Tab";
+import TabBody from "../TabBody/TabBody";
 
 import Window from "../Window/Window";
 import WindowHeader from "../WindowHeader/WindowHeader";