diff --git a/examples/Intro.md b/examples/Intro.md
index 44962afeb..3ee894bb7 100644
--- a/examples/Intro.md
+++ b/examples/Intro.md
@@ -21,16 +21,16 @@ Choose the localizer that best suits your needs, or write your own. Whatever you
 before you can use the calendar (you only need to set it up once).
 
 ```jsx
-import BigCalendar from 'react-big-calendar'
+import { Calendar, momentLocalizer } from 'react-big-calendar'
 import moment from 'moment'
 
 // Setup the localizer by providing the moment (or globalize) Object
 // to the correct localizer.
-const localizer = BigCalendar.momentLocalizer(moment) // or globalizeLocalizer
+const localizer = momentLocalizer(moment) // or globalizeLocalizer
 
 const MyCalendar = props => (
   <div>
-    <BigCalendar
+    <Calendar
       localizer={localizer}
       events={myEventsList}
       startAccessor="start"
diff --git a/examples/demos/basic.js b/examples/demos/basic.js
index a040d6121..3dbd1d324 100644
--- a/examples/demos/basic.js
+++ b/examples/demos/basic.js
@@ -1,9 +1,9 @@
 import React from 'react'
-import BigCalendar from 'react-big-calendar'
+import { Calendar, Views } from 'react-big-calendar'
 import events from '../events'
 import dates from '../../src/utils/dates'
 
-let allViews = Object.keys(BigCalendar.Views).map(k => BigCalendar.Views[k])
+let allViews = Object.keys(Views).map(k => Views[k])
 
 const ColoredDateCellWrapper = ({ children }) =>
   React.cloneElement(React.Children.only(children), {
@@ -13,7 +13,7 @@ const ColoredDateCellWrapper = ({ children }) =>
   })
 
 let Basic = ({ localizer }) => (
-  <BigCalendar
+  <Calendar
     events={events}
     views={allViews}
     step={60}
diff --git a/examples/demos/cultures.js b/examples/demos/cultures.js
index 454e75290..6fef18c82 100644
--- a/examples/demos/cultures.js
+++ b/examples/demos/cultures.js
@@ -1,5 +1,5 @@
 import React from 'react'
-import BigCalendar from 'react-big-calendar'
+import { Calendar } from 'react-big-calendar'
 import events from '../events'
 import Layout from 'react-tackle-box/Layout'
 
@@ -37,7 +37,7 @@ class Cultures extends React.Component {
             </select>
           </Layout>
         </ExampleControlSlot.Entry>
-        <BigCalendar
+        <Calendar
           rtl={rtl}
           events={events}
           culture={this.state.culture}
diff --git a/examples/demos/customHeader.js b/examples/demos/customHeader.js
index 667392d19..904d538c2 100644
--- a/examples/demos/customHeader.js
+++ b/examples/demos/customHeader.js
@@ -1,5 +1,5 @@
 import React from 'react'
-import BigCalendar from 'react-big-calendar'
+import { Calendar } from 'react-big-calendar'
 import events from '../events'
 
 let MyOtherNestedComponent = () => <div>NESTED COMPONENT</div>
@@ -13,7 +13,7 @@ let MyCustomHeader = ({ label }) => (
 )
 
 let CustomHeader = ({ localizer }) => (
-  <BigCalendar
+  <Calendar
     events={events}
     localizer={localizer}
     defaultDate={new Date(2015, 3, 1)}
diff --git a/examples/demos/customView.js b/examples/demos/customView.js
index bd285bb1e..ebd5d3997 100644
--- a/examples/demos/customView.js
+++ b/examples/demos/customView.js
@@ -2,7 +2,7 @@ import React from 'react'
 
 import dates from 'date-arithmetic'
 import events from '../events'
-import BigCalendar from 'react-big-calendar'
+import { Calendar, Views, Navigate } from 'react-big-calendar'
 import TimeGrid from 'react-big-calendar/lib/TimeGrid'
 import ExampleControlSlot from '../ExampleControlSlot'
 
@@ -32,10 +32,10 @@ MyWeek.range = date => {
 
 MyWeek.navigate = (date, action) => {
   switch (action) {
-    case BigCalendar.Navigate.PREVIOUS:
+    case Navigate.PREVIOUS:
       return dates.add(date, -3, 'day')
 
-    case BigCalendar.Navigate.NEXT:
+    case Navigate.NEXT:
       return dates.add(date, 3, 'day')
 
     default:
@@ -52,10 +52,10 @@ let CustomView = ({ localizer }) => (
     <ExampleControlSlot.Entry waitForOutlet>
       <strong>The Calendar below implments a custom 3-day week view</strong>
     </ExampleControlSlot.Entry>
-    <BigCalendar
+    <Calendar
       events={events}
       localizer={localizer}
-      defaultView={BigCalendar.Views.WEEK}
+      defaultView={Views.WEEK}
       defaultDate={new Date(2015, 3, 1)}
       views={{ month: true, week: MyWeek }}
     />
diff --git a/examples/demos/dnd.js b/examples/demos/dnd.js
index 2ff643178..16bc2e8f2 100644
--- a/examples/demos/dnd.js
+++ b/examples/demos/dnd.js
@@ -1,11 +1,11 @@
 import React from 'react'
 import events from '../events'
-import BigCalendar from 'react-big-calendar'
+import { Calendar, Views } from 'react-big-calendar'
 import withDragAndDrop from 'react-big-calendar/lib/addons/dragAndDrop'
 
 import 'react-big-calendar/lib/addons/dragAndDrop/styles.scss'
 
-const DragAndDropCalendar = withDragAndDrop(BigCalendar)
+const DragAndDropCalendar = withDragAndDrop(Calendar)
 
 class Dnd extends React.Component {
   constructor(props) {
@@ -84,7 +84,7 @@ class Dnd extends React.Component {
         onEventResize={this.resizeEvent}
         onSelectSlot={this.newEvent}
         onDragStart={console.log}
-        defaultView={BigCalendar.Views.MONTH}
+        defaultView={Views.MONTH}
         defaultDate={new Date(2015, 3, 12)}
       />
     )
diff --git a/examples/demos/dndOutsideSource.js b/examples/demos/dndOutsideSource.js
index e5050a3d0..fb7c95dc7 100644
--- a/examples/demos/dndOutsideSource.js
+++ b/examples/demos/dndOutsideSource.js
@@ -1,13 +1,13 @@
 import React from 'react'
 import events from '../events'
-import BigCalendar from 'react-big-calendar'
+import { Calendar, Views } from 'react-big-calendar'
 import withDragAndDrop from 'react-big-calendar/lib/addons/dragAndDrop'
 import Layout from 'react-tackle-box/Layout'
 import Card from '../Card'
 
 import 'react-big-calendar/lib/addons/dragAndDrop/styles.scss'
 
-const DragAndDropCalendar = withDragAndDrop(BigCalendar)
+const DragAndDropCalendar = withDragAndDrop(Calendar)
 
 const formatName = (name, count) => `${name} ID ${count}`
 
@@ -163,7 +163,7 @@ class Dnd extends React.Component {
           onEventResize={this.resizeEvent}
           onSelectSlot={this.newEvent}
           onD
-          defaultView={BigCalendar.Views.MONTH}
+          defaultView={Views.MONTH}
           defaultDate={new Date(2015, 3, 12)}
         />
       </div>
diff --git a/examples/demos/dndresource.js b/examples/demos/dndresource.js
index 75364af1d..cd1e0b6e5 100644
--- a/examples/demos/dndresource.js
+++ b/examples/demos/dndresource.js
@@ -1,10 +1,10 @@
 import React from 'react'
-import BigCalendar from 'react-big-calendar'
+import { Calendar } from 'react-big-calendar'
 import withDragAndDrop from 'react-big-calendar/lib/addons/dragAndDrop'
 
 import 'react-big-calendar/lib/addons/dragAndDrop/styles.scss'
 
-const DragAndDropCalendar = withDragAndDrop(BigCalendar)
+const DragAndDropCalendar = withDragAndDrop(Calendar)
 
 const events = [
   {
diff --git a/examples/demos/popup.js b/examples/demos/popup.js
index 94f34df9a..1eea7da84 100644
--- a/examples/demos/popup.js
+++ b/examples/demos/popup.js
@@ -1,5 +1,5 @@
 import React from 'react'
-import BigCalendar from 'react-big-calendar'
+import { Calendar } from 'react-big-calendar'
 import events from '../events'
 import ExampleControlSlot from '../ExampleControlSlot'
 
@@ -11,7 +11,7 @@ let Popup = ({ localizer }) => (
         days events to see an inline popup of all the events.
       </strong>
     </ExampleControlSlot.Entry>
-    <BigCalendar
+    <Calendar
       popup
       events={events}
       localizer={localizer}
diff --git a/examples/demos/rendering.js b/examples/demos/rendering.js
index b694f8b2d..889601a9c 100644
--- a/examples/demos/rendering.js
+++ b/examples/demos/rendering.js
@@ -1,5 +1,5 @@
 import React from 'react'
-import BigCalendar from 'react-big-calendar'
+import { Calendar, Views } from 'react-big-calendar'
 import events from '../events'
 
 function Event({ event }) {
@@ -40,11 +40,11 @@ const customSlotPropGetter = date => {
 }
 
 let Rendering = ({ localizer }) => (
-  <BigCalendar
+  <Calendar
     events={events}
     localizer={localizer}
     defaultDate={new Date(2015, 3, 1)}
-    defaultView={BigCalendar.Views.AGENDA}
+    defaultView={Views.AGENDA}
     dayPropGetter={customDayPropGetter}
     slotPropGetter={customSlotPropGetter}
     components={{
diff --git a/examples/demos/resource.js b/examples/demos/resource.js
index 8524f43fa..3a192c7aa 100644
--- a/examples/demos/resource.js
+++ b/examples/demos/resource.js
@@ -1,5 +1,5 @@
 import React from 'react'
-import BigCalendar from 'react-big-calendar'
+import { Calendar, Views } from 'react-big-calendar'
 import ExampleControlSlot from '../ExampleControlSlot'
 
 const events = [
@@ -43,10 +43,10 @@ const resourceMap = [
 
 let Resource = ({ localizer }) => (
   <>
-    <BigCalendar
+    <Calendar
       events={events}
       localizer={localizer}
-      defaultView={BigCalendar.Views.DAY}
+      defaultView={Views.DAY}
       views={['day', 'work_week']}
       step={60}
       defaultDate={new Date(2018, 0, 29)}
diff --git a/examples/demos/selectable.js b/examples/demos/selectable.js
index 4d6637d95..4462b0324 100644
--- a/examples/demos/selectable.js
+++ b/examples/demos/selectable.js
@@ -1,5 +1,5 @@
 import React from 'react'
-import BigCalendar from 'react-big-calendar'
+import { Calendar, Views } from 'react-big-calendar'
 import events from '../events'
 import ExampleControlSlot from '../ExampleControlSlot'
 
@@ -37,11 +37,11 @@ class Selectable extends React.Component {
             to select a date/time range.
           </strong>
         </ExampleControlSlot.Entry>
-        <BigCalendar
+        <Calendar
           selectable
           localizer={localizer}
           events={this.state.events}
-          defaultView={BigCalendar.Views.WEEK}
+          defaultView={Views.WEEK}
           scrollToTime={new Date(1970, 1, 1, 6)}
           defaultDate={new Date(2015, 3, 12)}
           onSelectEvent={event => alert(event.title)}
diff --git a/examples/demos/timeslots.js b/examples/demos/timeslots.js
index b556a9f33..0e33d4db8 100644
--- a/examples/demos/timeslots.js
+++ b/examples/demos/timeslots.js
@@ -1,14 +1,14 @@
 import React from 'react'
-import BigCalendar from 'react-big-calendar'
+import { Calendar, Views } from 'react-big-calendar'
 import events from '../events'
 
 let Timeslots = ({ localizer }) => (
-  <BigCalendar
+  <Calendar
     events={events}
     step={15}
     timeslots={8}
     localizer={localizer}
-    defaultView={BigCalendar.Views.WEEK}
+    defaultView={Views.WEEK}
     defaultDate={new Date(2015, 3, 12)}
   />
 )
diff --git a/src/Calendar.js b/src/Calendar.js
index 8a773351b..25fac52d1 100644
--- a/src/Calendar.js
+++ b/src/Calendar.js
@@ -363,7 +363,7 @@ class Calendar extends React.Component {
      * }
      * ```
      *
-     * @type Calendar.Views ('month'|'week'|'work_week'|'day'|'agenda')
+     * @type Views ('month'|'week'|'work_week'|'day'|'agenda')
      * @View
      ['month', 'week', 'day', 'agenda']
      */
@@ -377,7 +377,7 @@ class Calendar extends React.Component {
      * Set to `null` to disable drill-down actions.
      *
      * ```js
-     * <BigCalendar
+     * <Calendar
      *   drilldownView="agenda"
      * />
      * ```
@@ -392,7 +392,7 @@ class Calendar extends React.Component {
      * Return `null` to disable drill-down actions.
      *
      * ```js
-     * <BigCalendar
+     * <Calendar
      *   getDrilldownView={(targetDate, currentViewName, configuredViewNames) =>
      *     if (currentViewName === 'month' && configuredViewNames.includes('week'))
      *       return 'week'
@@ -424,8 +424,8 @@ class Calendar extends React.Component {
      * Distance in pixels, from the edges of the viewport, the "show more" overlay should be positioned.
      *
      * ```jsx
-     * <BigCalendar popupOffset={30}/>
-     * <BigCalendar popupOffset={{x: 30, y: 20}}/>
+     * <Calendar popupOffset={30}/>
+     * <Calendar popupOffset={{x: 30, y: 20}}/>
      * ```
      */
     popupOffset: PropTypes.oneOfType([
diff --git a/src/addons/dragAndDrop/README.md b/src/addons/dragAndDrop/README.md
index 76a4825c8..0fa1ab6a1 100644
--- a/src/addons/dragAndDrop/README.md
+++ b/src/addons/dragAndDrop/README.md
@@ -1,12 +1,12 @@
 ### Drag and Drop
 
 ```js
-import BigCalendar from 'react-big-calendar'
+import { Calendar } from 'react-big-calendar'
 import withDragAndDrop from 'react-big-calendar/lib/addons/dragAndDrop'
 
 import 'react-big-calendar/lib/addons/dragAndDrop/styles.css'
 
-const DraggableCalendar = withDragAndDrop(BigCalendar)
+const DraggableCalendar = withDragAndDrop(Calendar)
 
 /* ... */
 
diff --git a/stories/Calendar.js b/stories/Calendar.js
index 8be67e0c1..bad4e4f98 100644
--- a/stories/Calendar.js
+++ b/stories/Calendar.js
@@ -10,7 +10,7 @@ import demoEvents from '../examples/events'
 import createEvents from './helpers/createEvents'
 import customComponents from './helpers/customComponents'
 
-import { events, Calendar } from './helpers'
+import { events, Views, Calendar } from './helpers'
 
 storiesOf('Big Calendar', module)
   .add('demo', () => (
@@ -24,7 +24,7 @@ storiesOf('Big Calendar', module)
   .add('default view', () => {
     return (
       <Calendar
-        defaultView={Calendar.Views.WEEK}
+        defaultView={Views.WEEK}
         min={moment('12:00am', 'h:mma').toDate()}
         max={moment('11:59pm', 'h:mma').toDate()}
         events={events}
@@ -38,7 +38,7 @@ storiesOf('Big Calendar', module)
     return (
       <Calendar
         selectable
-        defaultView={Calendar.Views.WEEK}
+        defaultView={Views.WEEK}
         min={moment('12:00am', 'h:mma').toDate()}
         max={moment('11:59pm', 'h:mma').toDate()}
         events={events}
@@ -51,7 +51,7 @@ storiesOf('Big Calendar', module)
   .add('add custom date header', () => {
     return (
       <Calendar
-        defaultView={Calendar.Views.MONTH}
+        defaultView={Views.MONTH}
         events={events}
         components={{
           month: {
@@ -67,7 +67,7 @@ storiesOf('Big Calendar', module)
     return (
       <Calendar
         defaultDate={new Date()}
-        defaultView={Calendar.Views.DAY}
+        defaultView={Views.DAY}
         events={createEvents(1)}
         step={30}
       />
@@ -111,11 +111,7 @@ storiesOf('Big Calendar', module)
   .add('agenda view - with length prop', () => {
     return (
       /* should display as title toolbar (from now to now + 14 days) */
-      <Calendar
-        defaultView={Calendar.Views.AGENDA}
-        events={events}
-        length={14}
-      />
+      <Calendar defaultView={Views.AGENDA} events={events} length={14} />
     )
   })
   .add('custom now is the first of the month', () => {
@@ -126,7 +122,7 @@ storiesOf('Big Calendar', module)
     }
     return (
       <Calendar
-        defaultView={Calendar.Views.WEEK}
+        defaultView={Views.WEEK}
         getNow={customNow}
         min={moment('12:00am', 'h:mma').toDate()}
         max={moment('11:59pm', 'h:mma').toDate()}
@@ -157,7 +153,7 @@ storiesOf('Big Calendar', module)
   .add('add custom dateCellWrapper', () => {
     return (
       <Calendar
-        defaultView={Calendar.Views.MONTH}
+        defaultView={Views.MONTH}
         events={events}
         components={{
           dateCellWrapper: customComponents.dateCellWrapper,
@@ -168,7 +164,7 @@ storiesOf('Big Calendar', module)
   .add('add custom timeSlotWrapper', () => {
     return (
       <Calendar
-        defaultView={Calendar.Views.DAY}
+        defaultView={Views.DAY}
         events={events}
         components={{
           timeSlotWrapper: customComponents.timeSlotWrapper,
@@ -179,7 +175,7 @@ storiesOf('Big Calendar', module)
   .add('add custom eventWrapper', () => {
     return (
       <Calendar
-        defaultView={Calendar.Views.DAY}
+        defaultView={Views.DAY}
         events={events}
         components={{
           eventWrapper: customComponents.eventWrapper,
@@ -190,7 +186,7 @@ storiesOf('Big Calendar', module)
   .add('add custom no agenda events label', () => {
     return (
       <Calendar
-        defaultView={Calendar.Views.AGENDA}
+        defaultView={Views.AGENDA}
         events={events}
         messages={{
           noEventsInRange:
@@ -202,7 +198,7 @@ storiesOf('Big Calendar', module)
   .add('add custom timeSlotWrapper', () => {
     return (
       <Calendar
-        defaultView={Calendar.Views.WEEK}
+        defaultView={Views.WEEK}
         events={events}
         components={{
           timeSlotWrapper: customComponents.timeSlotWrapper,
diff --git a/stories/DragAndDrop.js b/stories/DragAndDrop.js
index 3ad618ec4..3fd8e2d55 100644
--- a/stories/DragAndDrop.js
+++ b/stories/DragAndDrop.js
@@ -2,7 +2,7 @@ import React from 'react'
 import { storiesOf } from '@storybook/react'
 import { action } from '@storybook/addon-actions'
 
-import { events, Calendar, DragAndDropCalendar } from './helpers'
+import { events, Calendar, Views, DragAndDropCalendar } from './helpers'
 import customComponents from './helpers/customComponents'
 
 storiesOf('Drag and Drop', module)
@@ -10,7 +10,7 @@ storiesOf('Drag and Drop', module)
     return (
       <DragAndDropCalendar
         defaultDate={new Date()}
-        defaultView={Calendar.Views.WEEK}
+        defaultView={Views.WEEK}
         events={events}
         resizable
         onEventDrop={action('event dropped')}
@@ -22,7 +22,7 @@ storiesOf('Drag and Drop', module)
     return (
       <DragAndDropCalendar
         defaultDate={new Date()}
-        defaultView={Calendar.Views.WEEK}
+        defaultView={Views.WEEK}
         events={events}
         resizable
         step={15}
@@ -36,7 +36,7 @@ storiesOf('Drag and Drop', module)
     return (
       <DragAndDropCalendar
         defaultDate={new Date()}
-        defaultView={Calendar.Views.WEEK}
+        defaultView={Views.WEEK}
         events={events}
         resizable
         showMultiDayTimes
@@ -52,7 +52,7 @@ storiesOf('Drag and Drop', module)
           dateCellWrapper: customComponents.dateCellWrapper,
         }}
         defaultDate={new Date()}
-        defaultView={Calendar.Views.MONTH}
+        defaultView={Views.MONTH}
         events={events}
         resizable
         showMultiDayTimes
@@ -68,7 +68,7 @@ storiesOf('Drag and Drop', module)
           timeSlotWrapper: customComponents.timeSlotWrapper,
         }}
         defaultDate={new Date()}
-        defaultView={Calendar.Views.WEEK}
+        defaultView={Views.WEEK}
         events={events}
         resizable
         showMultiDayTimes
@@ -84,7 +84,7 @@ storiesOf('Drag and Drop', module)
           eventWrapper: customComponents.eventWrapper,
         }}
         defaultDate={new Date()}
-        defaultView={Calendar.Views.WEEK}
+        defaultView={Views.WEEK}
         events={events}
         resizable
         showMultiDayTimes
diff --git a/stories/Durations.js b/stories/Durations.js
index ee76df48f..b304311a1 100644
--- a/stories/Durations.js
+++ b/stories/Durations.js
@@ -2,13 +2,13 @@ import React from 'react'
 import { storiesOf } from '@storybook/react'
 import moment from 'moment'
 
-import { Calendar, DragableCalendar } from './helpers'
+import { Calendar, Views, DragableCalendar } from './helpers'
 
 storiesOf('Event Durations', module)
   .add('Daylight savings starts', () => {
     return (
       <DragableCalendar
-        defaultView={Calendar.Views.DAY}
+        defaultView={Views.DAY}
         min={moment('12:00am', 'h:mma').toDate()}
         max={moment('11:59pm', 'h:mma').toDate()}
         events={[
@@ -38,7 +38,7 @@ storiesOf('Event Durations', module)
   .add('Daylight savings ends', () => {
     return (
       <DragableCalendar
-        defaultView={Calendar.Views.DAY}
+        defaultView={Views.DAY}
         min={moment('12:00am', 'h:mma').toDate()}
         max={moment('11:59pm', 'h:mma').toDate()}
         events={[
@@ -68,7 +68,7 @@ storiesOf('Event Durations', module)
   .add('Daylight savings starts, after 2am', () => {
     return (
       <DragableCalendar
-        defaultView={Calendar.Views.DAY}
+        defaultView={Views.DAY}
         min={moment('3:00am', 'h:mma').toDate()}
         max={moment('11:59pm', 'h:mma').toDate()}
         events={[
@@ -86,7 +86,7 @@ storiesOf('Event Durations', module)
   .add('Daylight savings ends, after 2am', () => {
     return (
       <DragableCalendar
-        defaultView={Calendar.Views.DAY}
+        defaultView={Views.DAY}
         min={moment('3:00am', 'h:mma').toDate()}
         max={moment('11:59pm', 'h:mma').toDate()}
         events={[
diff --git a/stories/Layout.js b/stories/Layout.js
index 6d3847a29..0ce9a39ba 100644
--- a/stories/Layout.js
+++ b/stories/Layout.js
@@ -2,14 +2,14 @@ import React from 'react'
 import { storiesOf } from '@storybook/react'
 import moment from 'moment'
 
-import { events, Calendar, DragAndDropCalendar } from './helpers'
+import { events, Calendar, Views, DragAndDropCalendar } from './helpers'
 import createEvents from './helpers/createEvents'
 
 storiesOf('Layout Issues', module)
   .add('event layout', () => {
     return (
       <Calendar
-        defaultView={Calendar.Views.DAY}
+        defaultView={Views.DAY}
         defaultDate={new Date()}
         timeslots={4}
         events={createEvents(1)}
@@ -89,7 +89,7 @@ storiesOf('Layout Issues', module)
   .add('events on a constrained day column', () => {
     return (
       <Calendar
-        defaultView={Calendar.Views.DAY}
+        defaultView={Views.DAY}
         min={moment('8 am', 'h a').toDate()}
         max={moment('5 pm', 'h a').toDate()}
         events={events}
diff --git a/stories/Timeslots.js b/stories/Timeslots.js
index 897dd2ae2..6510f490e 100644
--- a/stories/Timeslots.js
+++ b/stories/Timeslots.js
@@ -10,7 +10,7 @@ storiesOf('Timeslots', module)
   .add('selectable, step 15, 4 timeslots', () => {
     return (
       <Calendar
-        defaultView={Calendar.Views.WEEK}
+        defaultView={Views.WEEK}
         selectable
         timeslots={4}
         step={15}
@@ -27,7 +27,7 @@ storiesOf('Timeslots', module)
     return (
       <Calendar
         selectable
-        defaultView={Calendar.Views.WEEK}
+        defaultView={Views.WEEK}
         timeslots={6}
         step={10}
         min={moment('12:00am', 'h:mma').toDate()}
@@ -43,7 +43,7 @@ storiesOf('Timeslots', module)
     return (
       <Calendar
         selectable
-        defaultView={Calendar.Views.WEEK}
+        defaultView={Views.WEEK}
         timeslots={6}
         step={5}
         min={moment('12:00am', 'h:mma').toDate()}
@@ -58,7 +58,7 @@ storiesOf('Timeslots', module)
   .add('selectable, 3 timeslots', () => {
     return (
       <Calendar
-        defaultView={Calendar.Views.WEEK}
+        defaultView={Views.WEEK}
         selectable
         timeslots={3}
         getNow={() => moment('9:30am', 'h:mma').toDate()}
diff --git a/stories/helpers/index.js b/stories/helpers/index.js
index 7eee8f5ad..f40ebf09d 100644
--- a/stories/helpers/index.js
+++ b/stories/helpers/index.js
@@ -4,8 +4,7 @@ import { action } from '@storybook/addon-actions'
 import moment from 'moment'
 import React from 'react'
 
-import BaseCalendar from '../../src'
-import momentLocalizer from '../../src/localizers/moment.js'
+import { Calendar as BaseCalendar, momentLocalizer } from '../../src'
 
 // For Testing SASS styling
 import '../../src/sass/styles.scss'
@@ -13,6 +12,8 @@ import '../../src/addons/dragAndDrop/styles.scss'
 
 import withDragAndDrop from '../../src/addons/dragAndDrop'
 
+export { Views } from '../../src'
+
 addDecorator(function WithHeight(fn) {
   return <div style={{ height: 600 }}>{fn()}</div>
 })
@@ -27,8 +28,6 @@ export const Calendar = props => (
   <BaseCalendar localizer={localizer} {...props} />
 )
 
-Object.assign(Calendar, BaseCalendar)
-
 export const DragAndDropCalendar = withDragAndDrop(Calendar)
 
 export const DragableCalendar = props => {