diff --git a/src/index.ts b/src/index.ts
index b9ae1eae..6cba22a5 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -14,8 +14,8 @@
  *
  */
 
-import RRule from './rrule'
-import RRuleSet from './rruleset'
+import { RRule } from './rrule'
+import { RRuleSet } from './rruleset'
 
 export { rrulestr } from './rrulestr'
 export { Frequency, ByWeekday, Options } from './types'
diff --git a/src/iter/index.ts b/src/iter/index.ts
index fef6562b..495b64e7 100644
--- a/src/iter/index.ts
+++ b/src/iter/index.ts
@@ -2,7 +2,7 @@ import IterResult from '../iterresult'
 import { ParsedOptions, freqIsDailyOrGreater, QueryMethodTypes } from '../types'
 import dateutil from '../dateutil'
 import Iterinfo from '../iterinfo/index'
-import RRule from '../rrule'
+import { RRule } from '../rrule'
 import { buildTimeset } from '../parseoptions'
 import { notEmpty, includes, isPresent } from '../helpers'
 import { DateWithZone } from '../datewithzone'
diff --git a/src/iterinfo/monthinfo.ts b/src/iterinfo/monthinfo.ts
index 4c4ab746..c96f9bb1 100644
--- a/src/iterinfo/monthinfo.ts
+++ b/src/iterinfo/monthinfo.ts
@@ -1,5 +1,5 @@
 import { ParsedOptions } from '../types'
-import RRule from '../rrule'
+import { RRule } from '../rrule'
 import { empty, repeat, pymod } from '../helpers'
 
 export interface MonthInfo {
diff --git a/src/iterset.ts b/src/iterset.ts
index 3f25853b..9d90a0c0 100644
--- a/src/iterset.ts
+++ b/src/iterset.ts
@@ -1,7 +1,7 @@
 import IterResult from './iterresult'
-import RRule from './rrule'
+import { RRule } from './rrule'
 import { DateWithZone } from './datewithzone'
-import { iter } from './iter/index'
+import { iter } from './iter'
 import dateutil from './dateutil'
 import { QueryMethodTypes, IterResultType } from './types'
 
diff --git a/src/nlp/index.ts b/src/nlp/index.ts
index 58265d41..bfaed219 100644
--- a/src/nlp/index.ts
+++ b/src/nlp/index.ts
@@ -1,6 +1,6 @@
 import ToText, { DateFormatter, GetText } from './totext'
 import parseText from './parsetext'
-import RRule from '../rrule'
+import { RRule } from '../rrule'
 import { Frequency } from '../types'
 import ENGLISH, { Language } from './i18n'
 
diff --git a/src/nlp/parsetext.ts b/src/nlp/parsetext.ts
index 890536d2..76150eb0 100644
--- a/src/nlp/parsetext.ts
+++ b/src/nlp/parsetext.ts
@@ -1,5 +1,5 @@
 import ENGLISH, { Language } from './i18n'
-import RRule from '../rrule'
+import { RRule } from '../rrule'
 import { Options } from '../types'
 import { WeekdayStr } from '../weekday'
 
diff --git a/src/nlp/totext.ts b/src/nlp/totext.ts
index 1e0abac4..ee84eee2 100644
--- a/src/nlp/totext.ts
+++ b/src/nlp/totext.ts
@@ -1,5 +1,5 @@
 import ENGLISH, { Language } from './i18n'
-import RRule from '../rrule'
+import { RRule } from '../rrule'
 import { Options, ByWeekday } from '../types'
 import { Weekday } from '../weekday'
 import { isArray, isNumber, isPresent } from '../helpers'
diff --git a/src/optionstostring.ts b/src/optionstostring.ts
index 6321712e..3e088128 100644
--- a/src/optionstostring.ts
+++ b/src/optionstostring.ts
@@ -1,5 +1,5 @@
 import { Options } from './types'
-import RRule, { DEFAULT_OPTIONS } from './rrule'
+import { RRule, DEFAULT_OPTIONS } from './rrule'
 import { includes, isPresent, isArray, isNumber, toArray } from './helpers'
 import { Weekday } from './weekday'
 import dateutil from './dateutil'
diff --git a/src/parseoptions.ts b/src/parseoptions.ts
index c312bd8f..21733a6c 100644
--- a/src/parseoptions.ts
+++ b/src/parseoptions.ts
@@ -1,6 +1,6 @@
 import { Options, ParsedOptions, freqIsDailyOrGreater } from './types'
 import { includes, notEmpty, isPresent, isNumber, isArray, isWeekdayStr } from './helpers'
-import RRule, { defaultKeys, DEFAULT_OPTIONS } from './rrule'
+import { RRule, defaultKeys, DEFAULT_OPTIONS } from './rrule'
 import dateutil from './dateutil'
 import { Weekday } from './weekday'
 import { Time } from './datetime'
diff --git a/src/rrule.ts b/src/rrule.ts
index db337cd5..c1526a8e 100644
--- a/src/rrule.ts
+++ b/src/rrule.ts
@@ -57,7 +57,7 @@ export const defaultKeys = Object.keys(DEFAULT_OPTIONS) as (keyof Options)[]
  *        The only required option is `freq`, one of RRule.YEARLY, RRule.MONTHLY, ...
  * @constructor
  */
-export default class RRule implements QueryMethods {
+export class RRule implements QueryMethods {
   public _cache: Cache | null
   public origOptions: Partial<Options>
   public options: ParsedOptions
diff --git a/src/rruleset.ts b/src/rruleset.ts
index 1e548fb9..d4c89cd1 100644
--- a/src/rruleset.ts
+++ b/src/rruleset.ts
@@ -1,4 +1,4 @@
-import RRule from './rrule'
+import { RRule } from './rrule'
 import dateutil from './dateutil'
 import { includes } from './helpers'
 import IterResult from './iterresult'
@@ -26,7 +26,7 @@ function createGetterSetter <T> (fieldName: string) {
   }
 }
 
-export default class RRuleSet extends RRule {
+export class RRuleSet extends RRule {
   public readonly _rrule: RRule[]
   public readonly _rdate: Date[]
   public readonly _exrule: RRule[]
diff --git a/src/rrulestr.ts b/src/rrulestr.ts
index 967d20a1..7513438d 100644
--- a/src/rrulestr.ts
+++ b/src/rrulestr.ts
@@ -1,5 +1,5 @@
-import RRule from './rrule'
-import RRuleSet from './rruleset'
+import { RRule } from './rrule'
+import { RRuleSet } from './rruleset'
 import dateutil from './dateutil'
 import { includes, split } from './helpers'
 import { Options } from './types'
diff --git a/test/optionstostring.test.ts b/test/optionstostring.test.ts
index 4eb5e94e..81449e3b 100644
--- a/test/optionstostring.test.ts
+++ b/test/optionstostring.test.ts
@@ -1,5 +1,5 @@
 import { Options } from "../src/types";
-import RRule from "../src/rrule";
+import { RRule } from "../src/rrule";
 import { optionsToString } from "../src/optionstostring";
 import { expect } from "chai";
 
diff --git a/test/parsestring.test.ts b/test/parsestring.test.ts
index ade2397e..65b4f7a4 100644
--- a/test/parsestring.test.ts
+++ b/test/parsestring.test.ts
@@ -1,4 +1,4 @@
-import RRule from '../src/rrule'
+import { RRule } from '../src/rrule'
 import { expect } from 'chai'
 import { parseString } from '../src/parsestring'
 import { Options, Frequency } from '../src/types';