diff --git a/.storybook/config.js b/.storybook/config.js
index 7d970d4..6bd342a 100644
--- a/.storybook/config.js
+++ b/.storybook/config.js
@@ -2,8 +2,8 @@ import { configure, addDecorator } from "@storybook/react";
 import { withInfo } from "@storybook/addon-info";
 import { withThemesProvider } from "storybook-addon-styled-component-theme";
 
-import "../src/components/index.css";
-import themes from "../src/components/common/themes";
+import "../src/lib/index.css";
+import themes from "../src/lib/common/themes";
 
 const demoThemes = [
   themes.default,
diff --git a/src/components/Anchor/Anchor.js b/src/lib/Anchor/Anchor.js
similarity index 100%
rename from src/components/Anchor/Anchor.js
rename to src/lib/Anchor/Anchor.js
diff --git a/src/components/Anchor/Anchor.stories.js b/src/lib/Anchor/Anchor.stories.js
similarity index 100%
rename from src/components/Anchor/Anchor.stories.js
rename to src/lib/Anchor/Anchor.stories.js
diff --git a/src/components/AppBar/AppBar.js b/src/lib/AppBar/AppBar.js
similarity index 100%
rename from src/components/AppBar/AppBar.js
rename to src/lib/AppBar/AppBar.js
diff --git a/src/components/AppBar/AppBar.stories.js b/src/lib/AppBar/AppBar.stories.js
similarity index 100%
rename from src/components/AppBar/AppBar.stories.js
rename to src/lib/AppBar/AppBar.stories.js
diff --git a/src/components/Bar/Bar.js b/src/lib/Bar/Bar.js
similarity index 100%
rename from src/components/Bar/Bar.js
rename to src/lib/Bar/Bar.js
diff --git a/src/components/Bar/Bar.stories.js b/src/lib/Bar/Bar.stories.js
similarity index 100%
rename from src/components/Bar/Bar.stories.js
rename to src/lib/Bar/Bar.stories.js
diff --git a/src/components/Button/Button.js b/src/lib/Button/Button.js
similarity index 100%
rename from src/components/Button/Button.js
rename to src/lib/Button/Button.js
diff --git a/src/components/Button/Button.stories.js b/src/lib/Button/Button.stories.js
similarity index 100%
rename from src/components/Button/Button.stories.js
rename to src/lib/Button/Button.stories.js
diff --git a/src/components/Checkbox/Checkbox.js b/src/lib/Checkbox/Checkbox.js
similarity index 100%
rename from src/components/Checkbox/Checkbox.js
rename to src/lib/Checkbox/Checkbox.js
diff --git a/src/components/Checkbox/Checkbox.stories.js b/src/lib/Checkbox/Checkbox.stories.js
similarity index 100%
rename from src/components/Checkbox/Checkbox.stories.js
rename to src/lib/Checkbox/Checkbox.stories.js
diff --git a/src/components/Cutout/Cutout.js b/src/lib/Cutout/Cutout.js
similarity index 100%
rename from src/components/Cutout/Cutout.js
rename to src/lib/Cutout/Cutout.js
diff --git a/src/components/Cutout/Cutout.stories.js b/src/lib/Cutout/Cutout.stories.js
similarity index 100%
rename from src/components/Cutout/Cutout.stories.js
rename to src/lib/Cutout/Cutout.stories.js
diff --git a/src/components/DatePicker/DatePicker.js b/src/lib/DatePicker/DatePicker.js
similarity index 100%
rename from src/components/DatePicker/DatePicker.js
rename to src/lib/DatePicker/DatePicker.js
diff --git a/src/components/DatePicker/DatePicker.stories.js b/src/lib/DatePicker/DatePicker.stories.js
similarity index 100%
rename from src/components/DatePicker/DatePicker.stories.js
rename to src/lib/DatePicker/DatePicker.stories.js
diff --git a/src/components/Divider/Divider.js b/src/lib/Divider/Divider.js
similarity index 100%
rename from src/components/Divider/Divider.js
rename to src/lib/Divider/Divider.js
diff --git a/src/components/Divider/Divider.stories.js b/src/lib/Divider/Divider.stories.js
similarity index 100%
rename from src/components/Divider/Divider.stories.js
rename to src/lib/Divider/Divider.stories.js
diff --git a/src/components/Fab/Fab.css b/src/lib/Fab/Fab.css
similarity index 100%
rename from src/components/Fab/Fab.css
rename to src/lib/Fab/Fab.css
diff --git a/src/components/Fab/Fab.js b/src/lib/Fab/Fab.js
similarity index 100%
rename from src/components/Fab/Fab.js
rename to src/lib/Fab/Fab.js
diff --git a/src/components/Fab/Fab.stories.js b/src/lib/Fab/Fab.stories.js
similarity index 100%
rename from src/components/Fab/Fab.stories.js
rename to src/lib/Fab/Fab.stories.js
diff --git a/src/components/Fieldset/Fieldset.js b/src/lib/Fieldset/Fieldset.js
similarity index 100%
rename from src/components/Fieldset/Fieldset.js
rename to src/lib/Fieldset/Fieldset.js
diff --git a/src/components/Fieldset/Fieldset.stories.js b/src/lib/Fieldset/Fieldset.stories.js
similarity index 100%
rename from src/components/Fieldset/Fieldset.stories.js
rename to src/lib/Fieldset/Fieldset.stories.js
diff --git a/src/components/FileIcon/FileIcon.css b/src/lib/FileIcon/FileIcon.css
similarity index 100%
rename from src/components/FileIcon/FileIcon.css
rename to src/lib/FileIcon/FileIcon.css
diff --git a/src/components/FileIcon/FileIcon.js b/src/lib/FileIcon/FileIcon.js
similarity index 100%
rename from src/components/FileIcon/FileIcon.js
rename to src/lib/FileIcon/FileIcon.js
diff --git a/src/components/Hourglass/Hourglass.js b/src/lib/Hourglass/Hourglass.js
similarity index 100%
rename from src/components/Hourglass/Hourglass.js
rename to src/lib/Hourglass/Hourglass.js
diff --git a/src/components/Hourglass/Hourglass.stories.js b/src/lib/Hourglass/Hourglass.stories.js
similarity index 100%
rename from src/components/Hourglass/Hourglass.stories.js
rename to src/lib/Hourglass/Hourglass.stories.js
diff --git a/src/components/Hourglass/hourglass.gif b/src/lib/Hourglass/hourglass.gif
similarity index 100%
rename from src/components/Hourglass/hourglass.gif
rename to src/lib/Hourglass/hourglass.gif
diff --git a/src/components/Icon/LogoIcon.js b/src/lib/Icon/LogoIcon.js
similarity index 100%
rename from src/components/Icon/LogoIcon.js
rename to src/lib/Icon/LogoIcon.js
diff --git a/src/components/InputBase/InputBase.js b/src/lib/InputBase/InputBase.js
similarity index 100%
rename from src/components/InputBase/InputBase.js
rename to src/lib/InputBase/InputBase.js
diff --git a/src/components/List/List.js b/src/lib/List/List.js
similarity index 100%
rename from src/components/List/List.js
rename to src/lib/List/List.js
diff --git a/src/components/List/List.stories.js b/src/lib/List/List.stories.js
similarity index 100%
rename from src/components/List/List.stories.js
rename to src/lib/List/List.stories.js
diff --git a/src/components/ListItem/ListItem.js b/src/lib/ListItem/ListItem.js
similarity index 100%
rename from src/components/ListItem/ListItem.js
rename to src/lib/ListItem/ListItem.js
diff --git a/src/components/ListItem/ListItem.stories.js b/src/lib/ListItem/ListItem.stories.js
similarity index 100%
rename from src/components/ListItem/ListItem.stories.js
rename to src/lib/ListItem/ListItem.stories.js
diff --git a/src/components/Menu/Menu.js b/src/lib/Menu/Menu.js
similarity index 100%
rename from src/components/Menu/Menu.js
rename to src/lib/Menu/Menu.js
diff --git a/src/components/Menu/Menu.stories.js b/src/lib/Menu/Menu.stories.js
similarity index 100%
rename from src/components/Menu/Menu.stories.js
rename to src/lib/Menu/Menu.stories.js
diff --git a/src/components/NumberField/NumberField.js b/src/lib/NumberField/NumberField.js
similarity index 100%
rename from src/components/NumberField/NumberField.js
rename to src/lib/NumberField/NumberField.js
diff --git a/src/components/NumberField/NumberField.stories.js b/src/lib/NumberField/NumberField.stories.js
similarity index 100%
rename from src/components/NumberField/NumberField.stories.js
rename to src/lib/NumberField/NumberField.stories.js
diff --git a/src/components/Progress/Progress.js b/src/lib/Progress/Progress.js
similarity index 100%
rename from src/components/Progress/Progress.js
rename to src/lib/Progress/Progress.js
diff --git a/src/components/Progress/Progress.stories.js b/src/lib/Progress/Progress.stories.js
similarity index 100%
rename from src/components/Progress/Progress.stories.js
rename to src/lib/Progress/Progress.stories.js
diff --git a/src/components/Radio/Radio.js b/src/lib/Radio/Radio.js
similarity index 100%
rename from src/components/Radio/Radio.js
rename to src/lib/Radio/Radio.js
diff --git a/src/components/Radio/Radio.stories.js b/src/lib/Radio/Radio.stories.js
similarity index 100%
rename from src/components/Radio/Radio.stories.js
rename to src/lib/Radio/Radio.stories.js
diff --git a/src/components/Select/Select.js b/src/lib/Select/Select.js
similarity index 100%
rename from src/components/Select/Select.js
rename to src/lib/Select/Select.js
diff --git a/src/components/Select/Select.stories.js b/src/lib/Select/Select.stories.js
similarity index 100%
rename from src/components/Select/Select.stories.js
rename to src/lib/Select/Select.stories.js
diff --git a/src/components/Tab/Tab.js b/src/lib/Tab/Tab.js
similarity index 100%
rename from src/components/Tab/Tab.js
rename to src/lib/Tab/Tab.js
diff --git a/src/components/TabBody/TabBody.js b/src/lib/TabBody/TabBody.js
similarity index 100%
rename from src/components/TabBody/TabBody.js
rename to src/lib/TabBody/TabBody.js
diff --git a/src/components/Table/Table.js b/src/lib/Table/Table.js
similarity index 100%
rename from src/components/Table/Table.js
rename to src/lib/Table/Table.js
diff --git a/src/components/Table/Table.stories.js b/src/lib/Table/Table.stories.js
similarity index 100%
rename from src/components/Table/Table.stories.js
rename to src/lib/Table/Table.stories.js
diff --git a/src/components/TableBody/TableBody.js b/src/lib/TableBody/TableBody.js
similarity index 100%
rename from src/components/TableBody/TableBody.js
rename to src/lib/TableBody/TableBody.js
diff --git a/src/components/TableDataCell/TableDataCell.js b/src/lib/TableDataCell/TableDataCell.js
similarity index 100%
rename from src/components/TableDataCell/TableDataCell.js
rename to src/lib/TableDataCell/TableDataCell.js
diff --git a/src/components/TableHead/TableHead.js b/src/lib/TableHead/TableHead.js
similarity index 100%
rename from src/components/TableHead/TableHead.js
rename to src/lib/TableHead/TableHead.js
diff --git a/src/components/TableHeadCell/TableHeadCell.js b/src/lib/TableHeadCell/TableHeadCell.js
similarity index 100%
rename from src/components/TableHeadCell/TableHeadCell.js
rename to src/lib/TableHeadCell/TableHeadCell.js
diff --git a/src/components/TableRow/TableRow.js b/src/lib/TableRow/TableRow.js
similarity index 100%
rename from src/components/TableRow/TableRow.js
rename to src/lib/TableRow/TableRow.js
diff --git a/src/components/Tabs/Tabs.js b/src/lib/Tabs/Tabs.js
similarity index 100%
rename from src/components/Tabs/Tabs.js
rename to src/lib/Tabs/Tabs.js
diff --git a/src/components/Tabs/Tabs.stories.js b/src/lib/Tabs/Tabs.stories.js
similarity index 100%
rename from src/components/Tabs/Tabs.stories.js
rename to src/lib/Tabs/Tabs.stories.js
diff --git a/src/components/TextArea/TextArea.js b/src/lib/TextArea/TextArea.js
similarity index 100%
rename from src/components/TextArea/TextArea.js
rename to src/lib/TextArea/TextArea.js
diff --git a/src/components/TextArea/TextArea.stories.js b/src/lib/TextArea/TextArea.stories.js
similarity index 100%
rename from src/components/TextArea/TextArea.stories.js
rename to src/lib/TextArea/TextArea.stories.js
diff --git a/src/components/TextField/TextField.js b/src/lib/TextField/TextField.js
similarity index 100%
rename from src/components/TextField/TextField.js
rename to src/lib/TextField/TextField.js
diff --git a/src/components/TextField/TextField.stories.js b/src/lib/TextField/TextField.stories.js
similarity index 100%
rename from src/components/TextField/TextField.stories.js
rename to src/lib/TextField/TextField.stories.js
diff --git a/src/components/Toolbar/Toolbar.js b/src/lib/Toolbar/Toolbar.js
similarity index 100%
rename from src/components/Toolbar/Toolbar.js
rename to src/lib/Toolbar/Toolbar.js
diff --git a/src/components/Tooltip/Tooltip.js b/src/lib/Tooltip/Tooltip.js
similarity index 100%
rename from src/components/Tooltip/Tooltip.js
rename to src/lib/Tooltip/Tooltip.js
diff --git a/src/components/Tooltip/Tooltip.stories.js b/src/lib/Tooltip/Tooltip.stories.js
similarity index 100%
rename from src/components/Tooltip/Tooltip.stories.js
rename to src/lib/Tooltip/Tooltip.stories.js
diff --git a/src/components/Window/Window.js b/src/lib/Window/Window.js
similarity index 100%
rename from src/components/Window/Window.js
rename to src/lib/Window/Window.js
diff --git a/src/components/Window/Window.stories.js b/src/lib/Window/Window.stories.js
similarity index 100%
rename from src/components/Window/Window.stories.js
rename to src/lib/Window/Window.stories.js
diff --git a/src/components/WindowContent/WindowContent.js b/src/lib/WindowContent/WindowContent.js
similarity index 100%
rename from src/components/WindowContent/WindowContent.js
rename to src/lib/WindowContent/WindowContent.js
diff --git a/src/components/WindowHeader/WindowHeader.js b/src/lib/WindowHeader/WindowHeader.js
similarity index 100%
rename from src/components/WindowHeader/WindowHeader.js
rename to src/lib/WindowHeader/WindowHeader.js
diff --git a/src/components/common/index.js b/src/lib/common/index.js
similarity index 100%
rename from src/components/common/index.js
rename to src/lib/common/index.js
diff --git a/src/components/common/theme.variables.js b/src/lib/common/theme.variables.js
similarity index 100%
rename from src/components/common/theme.variables.js
rename to src/lib/common/theme.variables.js
diff --git a/src/components/common/themes.js b/src/lib/common/themes.js
similarity index 100%
rename from src/components/common/themes.js
rename to src/lib/common/themes.js
diff --git a/src/components/index.css b/src/lib/index.css
similarity index 100%
rename from src/components/index.css
rename to src/lib/index.css
diff --git a/src/components/index.js b/src/lib/index.js
similarity index 100%
rename from src/components/index.js
rename to src/lib/index.js