diff --git a/docs/app/Examples/collections/Sidebar/Overlay/SidebarBottomOverlay.js b/docs/app/Examples/modules/Sidebar/Overlay/SidebarBottomOverlay.js
similarity index 100%
rename from docs/app/Examples/collections/Sidebar/Overlay/SidebarBottomOverlay.js
rename to docs/app/Examples/modules/Sidebar/Overlay/SidebarBottomOverlay.js
diff --git a/docs/app/Examples/collections/Sidebar/Overlay/SidebarLeftOverlay.js b/docs/app/Examples/modules/Sidebar/Overlay/SidebarLeftOverlay.js
similarity index 100%
rename from docs/app/Examples/collections/Sidebar/Overlay/SidebarLeftOverlay.js
rename to docs/app/Examples/modules/Sidebar/Overlay/SidebarLeftOverlay.js
diff --git a/docs/app/Examples/collections/Sidebar/Overlay/SidebarRightOverlay.js b/docs/app/Examples/modules/Sidebar/Overlay/SidebarRightOverlay.js
similarity index 100%
rename from docs/app/Examples/collections/Sidebar/Overlay/SidebarRightOverlay.js
rename to docs/app/Examples/modules/Sidebar/Overlay/SidebarRightOverlay.js
diff --git a/docs/app/Examples/collections/Sidebar/Overlay/SidebarTopOverlay.js b/docs/app/Examples/modules/Sidebar/Overlay/SidebarTopOverlay.js
similarity index 100%
rename from docs/app/Examples/collections/Sidebar/Overlay/SidebarTopOverlay.js
rename to docs/app/Examples/modules/Sidebar/Overlay/SidebarTopOverlay.js
diff --git a/docs/app/Examples/collections/Sidebar/Overlay/index.js b/docs/app/Examples/modules/Sidebar/Overlay/index.js
similarity index 77%
rename from docs/app/Examples/collections/Sidebar/Overlay/index.js
rename to docs/app/Examples/modules/Sidebar/Overlay/index.js
index 45ccde3c3d..ca9d6acbc2 100644
--- a/docs/app/Examples/collections/Sidebar/Overlay/index.js
+++ b/docs/app/Examples/modules/Sidebar/Overlay/index.js
@@ -8,22 +8,22 @@ const SidebarVariationsExamples = () => (
     <ComponentExample
       title='Left Overlay'
       description='Sidebar attached to the left of the pushable container overlayed on the pusher.'
-      examplePath='collections/Sidebar/Overlay/SidebarLeftOverlay'
+      examplePath='modules/Sidebar/Overlay/SidebarLeftOverlay'
     />
     <ComponentExample
       title='Right Overlay'
       description='Sidebar attached to the right of the pushable container overlayed on the pusher.'
-      examplePath='collections/Sidebar/Overlay/SidebarRightOverlay'
+      examplePath='modules/Sidebar/Overlay/SidebarRightOverlay'
     />
     <ComponentExample
       title='Top Overlay'
       description='Sidebar attached to the top of the pushable container overlayed on the pusher.'
-      examplePath='collections/Sidebar/Overlay/SidebarTopOverlay'
+      examplePath='modules/Sidebar/Overlay/SidebarTopOverlay'
     />
     <ComponentExample
       title='Bottom Overlay'
       description='Sidebar attached to the bottom of the pushable container overlayed on the pusher.'
-      examplePath='collections/Sidebar/Overlay/SidebarBottomOverlay'
+      examplePath='modules/Sidebar/Overlay/SidebarBottomOverlay'
     />
   </ExampleSection>
 )
diff --git a/docs/app/Examples/collections/Sidebar/Push/SidebarBottomPush.js b/docs/app/Examples/modules/Sidebar/Push/SidebarBottomPush.js
similarity index 100%
rename from docs/app/Examples/collections/Sidebar/Push/SidebarBottomPush.js
rename to docs/app/Examples/modules/Sidebar/Push/SidebarBottomPush.js
diff --git a/docs/app/Examples/collections/Sidebar/Push/SidebarLeftPush.js b/docs/app/Examples/modules/Sidebar/Push/SidebarLeftPush.js
similarity index 100%
rename from docs/app/Examples/collections/Sidebar/Push/SidebarLeftPush.js
rename to docs/app/Examples/modules/Sidebar/Push/SidebarLeftPush.js
diff --git a/docs/app/Examples/collections/Sidebar/Push/SidebarRightPush.js b/docs/app/Examples/modules/Sidebar/Push/SidebarRightPush.js
similarity index 100%
rename from docs/app/Examples/collections/Sidebar/Push/SidebarRightPush.js
rename to docs/app/Examples/modules/Sidebar/Push/SidebarRightPush.js
diff --git a/docs/app/Examples/collections/Sidebar/Push/SidebarTopPush.js b/docs/app/Examples/modules/Sidebar/Push/SidebarTopPush.js
similarity index 100%
rename from docs/app/Examples/collections/Sidebar/Push/SidebarTopPush.js
rename to docs/app/Examples/modules/Sidebar/Push/SidebarTopPush.js
diff --git a/docs/app/Examples/collections/Sidebar/Push/index.js b/docs/app/Examples/modules/Sidebar/Push/index.js
similarity index 78%
rename from docs/app/Examples/collections/Sidebar/Push/index.js
rename to docs/app/Examples/modules/Sidebar/Push/index.js
index ca46fb0ec3..d8f6d676cb 100644
--- a/docs/app/Examples/collections/Sidebar/Push/index.js
+++ b/docs/app/Examples/modules/Sidebar/Push/index.js
@@ -8,22 +8,22 @@ const SidebarVariationsExamples = () => (
     <ComponentExample
       title='Left Push'
       description='Sidebar attached to the left of the pushable container pushing the pusher.'
-      examplePath='collections/Sidebar/Push/SidebarLeftPush'
+      examplePath='modules/Sidebar/Push/SidebarLeftPush'
     />
     <ComponentExample
       title='Right Push'
       description='Sidebar attached to the right of the pushable container pushing the pusher.'
-      examplePath='collections/Sidebar/Push/SidebarRightPush'
+      examplePath='modules/Sidebar/Push/SidebarRightPush'
     />
     <ComponentExample
       title='Top Push'
       description='Sidebar attached to the top of the pushable container pushing the pusher.'
-      examplePath='collections/Sidebar/Push/SidebarTopPush'
+      examplePath='modules/Sidebar/Push/SidebarTopPush'
     />
     <ComponentExample
       title='Bottom Push'
       description='Sidebar attached to the bottom of the pushable container pushing the pusher.'
-      examplePath='collections/Sidebar/Push/SidebarBottomPush'
+      examplePath='modules/Sidebar/Push/SidebarBottomPush'
     />
   </ExampleSection>
 )
diff --git a/docs/app/Examples/collections/Sidebar/ScaleDown/SidebarBottomScaleDown.js b/docs/app/Examples/modules/Sidebar/ScaleDown/SidebarBottomScaleDown.js
similarity index 100%
rename from docs/app/Examples/collections/Sidebar/ScaleDown/SidebarBottomScaleDown.js
rename to docs/app/Examples/modules/Sidebar/ScaleDown/SidebarBottomScaleDown.js
diff --git a/docs/app/Examples/collections/Sidebar/ScaleDown/SidebarLeftScaleDown.js b/docs/app/Examples/modules/Sidebar/ScaleDown/SidebarLeftScaleDown.js
similarity index 100%
rename from docs/app/Examples/collections/Sidebar/ScaleDown/SidebarLeftScaleDown.js
rename to docs/app/Examples/modules/Sidebar/ScaleDown/SidebarLeftScaleDown.js
diff --git a/docs/app/Examples/collections/Sidebar/ScaleDown/SidebarRightScaleDown.js b/docs/app/Examples/modules/Sidebar/ScaleDown/SidebarRightScaleDown.js
similarity index 100%
rename from docs/app/Examples/collections/Sidebar/ScaleDown/SidebarRightScaleDown.js
rename to docs/app/Examples/modules/Sidebar/ScaleDown/SidebarRightScaleDown.js
diff --git a/docs/app/Examples/collections/Sidebar/ScaleDown/SidebarTopScaleDown.js b/docs/app/Examples/modules/Sidebar/ScaleDown/SidebarTopScaleDown.js
similarity index 100%
rename from docs/app/Examples/collections/Sidebar/ScaleDown/SidebarTopScaleDown.js
rename to docs/app/Examples/modules/Sidebar/ScaleDown/SidebarTopScaleDown.js
diff --git a/docs/app/Examples/collections/Sidebar/ScaleDown/index.js b/docs/app/Examples/modules/Sidebar/ScaleDown/index.js
similarity index 77%
rename from docs/app/Examples/collections/Sidebar/ScaleDown/index.js
rename to docs/app/Examples/modules/Sidebar/ScaleDown/index.js
index e5c47fca3d..5abd623cba 100644
--- a/docs/app/Examples/collections/Sidebar/ScaleDown/index.js
+++ b/docs/app/Examples/modules/Sidebar/ScaleDown/index.js
@@ -8,22 +8,22 @@ const SidebarVariationsExamples = () => (
     <ComponentExample
       title='Left Scale Down'
       description='Sidebar attached to the left of the pushable container scaling down the pusher.'
-      examplePath='collections/Sidebar/ScaleDown/SidebarLeftScaleDown'
+      examplePath='modules/Sidebar/ScaleDown/SidebarLeftScaleDown'
     />
     <ComponentExample
       title='Right Scale Down'
       description='Sidebar attached to the right of the pushable container scaling down the pusher.'
-      examplePath='collections/Sidebar/ScaleDown/SidebarRightScaleDown'
+      examplePath='modules/Sidebar/ScaleDown/SidebarRightScaleDown'
     />
     <ComponentExample
       title='Top Scale Down'
       description='Sidebar attached to the top of the pushable container scaling down the pusher.'
-      examplePath='collections/Sidebar/ScaleDown/SidebarTopScaleDown'
+      examplePath='modules/Sidebar/ScaleDown/SidebarTopScaleDown'
     />
     <ComponentExample
       title='Bottom Scale Down'
       description='Sidebar attached to the bottom of the pushable container scaling down the pusher.'
-      examplePath='collections/Sidebar/ScaleDown/SidebarBottomScaleDown'
+      examplePath='modules/Sidebar/ScaleDown/SidebarBottomScaleDown'
     />
   </ExampleSection>
 )
diff --git a/docs/app/Examples/collections/Sidebar/SlideAlong/SidebarLeftSlideAlong.js b/docs/app/Examples/modules/Sidebar/SlideAlong/SidebarLeftSlideAlong.js
similarity index 100%
rename from docs/app/Examples/collections/Sidebar/SlideAlong/SidebarLeftSlideAlong.js
rename to docs/app/Examples/modules/Sidebar/SlideAlong/SidebarLeftSlideAlong.js
diff --git a/docs/app/Examples/collections/Sidebar/SlideAlong/SidebarRightSlideAlong.js b/docs/app/Examples/modules/Sidebar/SlideAlong/SidebarRightSlideAlong.js
similarity index 100%
rename from docs/app/Examples/collections/Sidebar/SlideAlong/SidebarRightSlideAlong.js
rename to docs/app/Examples/modules/Sidebar/SlideAlong/SidebarRightSlideAlong.js
diff --git a/docs/app/Examples/collections/Sidebar/SlideAlong/index.js b/docs/app/Examples/modules/Sidebar/SlideAlong/index.js
similarity index 81%
rename from docs/app/Examples/collections/Sidebar/SlideAlong/index.js
rename to docs/app/Examples/modules/Sidebar/SlideAlong/index.js
index a73264e3e4..0519e92aac 100644
--- a/docs/app/Examples/collections/Sidebar/SlideAlong/index.js
+++ b/docs/app/Examples/modules/Sidebar/SlideAlong/index.js
@@ -8,12 +8,12 @@ const SidebarVariationsExamples = () => (
     <ComponentExample
       title='Left Slide Along'
       description='Sidebar attached to the left of the pushable container sliding along the pusher.'
-      examplePath='collections/Sidebar/SlideAlong/SidebarLeftSlideAlong'
+      examplePath='modules/Sidebar/SlideAlong/SidebarLeftSlideAlong'
     />
     <ComponentExample
       title='Right Slide Along'
       description='Sidebar attached to the right of the pushable container sliding along the pusher.'
-      examplePath='collections/Sidebar/SlideAlong/SidebarRightSlideAlong'
+      examplePath='modules/Sidebar/SlideAlong/SidebarRightSlideAlong'
     />
   </ExampleSection>
 )
diff --git a/docs/app/Examples/collections/Sidebar/SlideOut/SidebarLeftSlideOut.js b/docs/app/Examples/modules/Sidebar/SlideOut/SidebarLeftSlideOut.js
similarity index 100%
rename from docs/app/Examples/collections/Sidebar/SlideOut/SidebarLeftSlideOut.js
rename to docs/app/Examples/modules/Sidebar/SlideOut/SidebarLeftSlideOut.js
diff --git a/docs/app/Examples/collections/Sidebar/SlideOut/SidebarRightSlideOut.js b/docs/app/Examples/modules/Sidebar/SlideOut/SidebarRightSlideOut.js
similarity index 100%
rename from docs/app/Examples/collections/Sidebar/SlideOut/SidebarRightSlideOut.js
rename to docs/app/Examples/modules/Sidebar/SlideOut/SidebarRightSlideOut.js
diff --git a/docs/app/Examples/collections/Sidebar/SlideOut/index.js b/docs/app/Examples/modules/Sidebar/SlideOut/index.js
similarity index 82%
rename from docs/app/Examples/collections/Sidebar/SlideOut/index.js
rename to docs/app/Examples/modules/Sidebar/SlideOut/index.js
index 1cc13fbe3b..8742b16721 100644
--- a/docs/app/Examples/collections/Sidebar/SlideOut/index.js
+++ b/docs/app/Examples/modules/Sidebar/SlideOut/index.js
@@ -8,12 +8,12 @@ const SidebarVariationsExamples = () => (
     <ComponentExample
       title='Left Slide Out'
       description='Sidebar attached to the left of the pushable container sliding out from the pusher.'
-      examplePath='collections/Sidebar/SlideOut/SidebarLeftSlideOut'
+      examplePath='modules/Sidebar/SlideOut/SidebarLeftSlideOut'
     />
     <ComponentExample
       title='Right Slide Out'
       description='Sidebar attached to the right of the pushable container sliding out from the pusher.'
-      examplePath='collections/Sidebar/SlideOut/SidebarRightSlideOut'
+      examplePath='modules/Sidebar/SlideOut/SidebarRightSlideOut'
     />
   </ExampleSection>
 )
diff --git a/docs/app/Examples/collections/Sidebar/Uncover/SidebarLeftUncover.js b/docs/app/Examples/modules/Sidebar/Uncover/SidebarLeftUncover.js
similarity index 100%
rename from docs/app/Examples/collections/Sidebar/Uncover/SidebarLeftUncover.js
rename to docs/app/Examples/modules/Sidebar/Uncover/SidebarLeftUncover.js
diff --git a/docs/app/Examples/collections/Sidebar/Uncover/SidebarRightUncover.js b/docs/app/Examples/modules/Sidebar/Uncover/SidebarRightUncover.js
similarity index 100%
rename from docs/app/Examples/collections/Sidebar/Uncover/SidebarRightUncover.js
rename to docs/app/Examples/modules/Sidebar/Uncover/SidebarRightUncover.js
diff --git a/docs/app/Examples/collections/Sidebar/Uncover/index.js b/docs/app/Examples/modules/Sidebar/Uncover/index.js
similarity index 82%
rename from docs/app/Examples/collections/Sidebar/Uncover/index.js
rename to docs/app/Examples/modules/Sidebar/Uncover/index.js
index 477687ab29..099688c79d 100644
--- a/docs/app/Examples/collections/Sidebar/Uncover/index.js
+++ b/docs/app/Examples/modules/Sidebar/Uncover/index.js
@@ -8,12 +8,12 @@ const SidebarVariationsExamples = () => (
     <ComponentExample
       title='Left Uncover'
       description='Sidebar attached to the left of the pushable container uncovering by the pusher.'
-      examplePath='collections/Sidebar/Uncover/SidebarLeftUncover'
+      examplePath='modules/Sidebar/Uncover/SidebarLeftUncover'
     />
     <ComponentExample
       title='Right Uncover'
       description='Sidebar attached to the right of the pushable container uncovered by the pusher.'
-      examplePath='collections/Sidebar/Uncover/SidebarRightUncover'
+      examplePath='modules/Sidebar/Uncover/SidebarRightUncover'
     />
   </ExampleSection>
 )
diff --git a/docs/app/Examples/collections/Sidebar/index.js b/docs/app/Examples/modules/Sidebar/index.js
similarity index 100%
rename from docs/app/Examples/collections/Sidebar/index.js
rename to docs/app/Examples/modules/Sidebar/index.js
diff --git a/src/index.js b/src/index.js
index e00ebf3e78..246cf8ef92 100644
--- a/src/index.js
+++ b/src/index.js
@@ -36,10 +36,6 @@ export { default as MessageHeader } from './collections/Message/MessageHeader'
 export { default as MessageItem } from './collections/Message/MessageItem'
 export { default as MessageList } from './collections/Message/MessageList'
 
-export { default as Sidebar } from './collections/Sidebar'
-export { default as SidebarPushable } from './collections/Sidebar/SidebarPushable'
-export { default as SidebarPusher } from './collections/Sidebar/SidebarPusher'
-
 export { default as Table } from './collections/Table'
 export { default as TableBody } from './collections/Table/TableBody'
 export { default as TableCell } from './collections/Table/TableCell'
@@ -137,6 +133,10 @@ export { default as SearchCategory } from './modules/Search/SearchCategory'
 export { default as SearchResult } from './modules/Search/SearchResult'
 export { default as SearchResults } from './modules/Search/SearchResults'
 
+export { default as Sidebar } from './modules/Sidebar'
+export { default as SidebarPushable } from './modules/Sidebar/SidebarPushable'
+export { default as SidebarPusher } from './modules/Sidebar/SidebarPusher'
+
 // Views
 export { default as Card } from './views/Card/Card'
 export { default as CardContent } from './views/Card/CardContent'
diff --git a/src/collections/Sidebar/Sidebar.js b/src/modules/Sidebar/Sidebar.js
similarity index 100%
rename from src/collections/Sidebar/Sidebar.js
rename to src/modules/Sidebar/Sidebar.js
diff --git a/src/collections/Sidebar/SidebarPushable.js b/src/modules/Sidebar/SidebarPushable.js
similarity index 100%
rename from src/collections/Sidebar/SidebarPushable.js
rename to src/modules/Sidebar/SidebarPushable.js
diff --git a/src/collections/Sidebar/SidebarPusher.js b/src/modules/Sidebar/SidebarPusher.js
similarity index 100%
rename from src/collections/Sidebar/SidebarPusher.js
rename to src/modules/Sidebar/SidebarPusher.js
diff --git a/src/collections/Sidebar/index.js b/src/modules/Sidebar/index.js
similarity index 100%
rename from src/collections/Sidebar/index.js
rename to src/modules/Sidebar/index.js