diff --git a/src/cleartext.js b/src/cleartext.js
index d0987057..c8064ac8 100644
--- a/src/cleartext.js
+++ b/src/cleartext.js
@@ -25,10 +25,10 @@
 
 'use strict';
 
-var config = require('./config'),
-  packet = require('./packet'),
-  enums = require('./enums.js'),
-  armor = require('./encoding/armor.js');
+import config from './config';
+import packet from './packet';
+import enums from './enums.js';
+import armor from './encoding/armor.js';
 
 /**
  * @class
diff --git a/src/crypto/cipher/aes.js b/src/crypto/cipher/aes.js
index 1b776bbf..5303f2aa 100644
--- a/src/crypto/cipher/aes.js
+++ b/src/crypto/cipher/aes.js
@@ -507,10 +507,8 @@ function makeClass(length) {
   return c;
 }
 
-module.exports = {};
-
-var types = [128, 192, 256];
-
-for (var i in types) {
-  module.exports[types[i]] = makeClass(types[i]);
-}
+export default {
+  128: makeClass(128),
+  192: makeClass(192),
+  256: makeClass(256)
+}
\ No newline at end of file
diff --git a/src/crypto/cipher/index.js b/src/crypto/cipher/index.js
index 51495141..1400695b 100644
--- a/src/crypto/cipher/index.js
+++ b/src/crypto/cipher/index.js
@@ -8,9 +8,14 @@
 
 'use strict';
 
-var desModule = require('./des.js');
+import desModule from './des.js';
+import aes from'./aes.js';
 
 module.exports = {
+  /** @see module:crypto/cipher/aes */
+  aes128: aes[128],
+  aes192: aes[192],
+  aes256: aes[256],
   /** @see module:crypto/cipher/des.originalDes */
   des: desModule.originalDes,
   /** @see module:crypto/cipher/des.des */
@@ -25,10 +30,4 @@ module.exports = {
   idea: function() {
     throw new Error('IDEA symmetric-key algorithm not implemented');
   }
-};
-
-var aes = require('./aes.js');
-
-for (var i in aes) {
-  module.exports['aes' + i] = aes[i];
-}
+};
\ No newline at end of file
diff --git a/src/key.js b/src/key.js
index 7d565dcc..b26f5bbc 100644
--- a/src/key.js
+++ b/src/key.js
@@ -25,11 +25,11 @@
 
 'use strict';
 
-var packet = require('./packet'),
-  enums = require('./enums.js'),
-  armor = require('./encoding/armor.js'),
-  config = require('./config'),
-  util = require('./util');
+import packet from './packet';
+import enums from './enums.js';
+import armor from './encoding/armor.js';
+import config from './config';
+import util from './util';
 
 /**
  * @class
diff --git a/src/message.js b/src/message.js
index 618e0e66..ca66a3f6 100644
--- a/src/message.js
+++ b/src/message.js
@@ -26,13 +26,13 @@
 
 'use strict';
 
-var util = require('./util.js'),
-  packet = require('./packet'),
-  enums = require('./enums.js'),
-  armor = require('./encoding/armor.js'),
-  config = require('./config'),
-  crypto = require('./crypto'),
-  keyModule = require('./key.js');
+import util from './util.js';
+import packet from './packet';
+import enums from './enums.js';
+import armor from './encoding/armor.js';
+import config from './config';
+import crypto from './crypto';
+import keyModule from './key.js';
 
 /**
  * @class
diff --git a/src/openpgp.js b/src/openpgp.js
index 8f94028b..8b525968 100644
--- a/src/openpgp.js
+++ b/src/openpgp.js
@@ -33,16 +33,17 @@
 
 'use strict';
 
-var armor = require('./encoding/armor.js'),
-  enums = require('./enums.js'),
-  message = require('./message.js'),
-  cleartext = require('./cleartext.js'),
-  config = require('./config/config.js'),
-  key = require('./key.js'),
-  util = require('./util'),
-  AsyncProxy = require('./worker/async_proxy.js');
+import armor from './encoding/armor.js';
+import enums from './enums.js';
+import message from './message.js';
+import cleartext from './cleartext.js';
+import config from './config/config.js';
+import key from './key.js';
+import util from './util';
+import AsyncProxy from './worker/async_proxy.js';
+import es6Promise from 'es6-promise';
 
-require('es6-promise').polyfill(); // load ES6 Promises polyfill
+es6Promise.polyfill(); // load ES6 Promises polyfill
 
 var asyncProxy = null; // instance of the asyncproxy
 
diff --git a/src/util.js b/src/util.js
index 107bcf29..573f5a1e 100644
--- a/src/util.js
+++ b/src/util.js
@@ -23,7 +23,7 @@
 
 'use strict';
 
-var config = require('./config');
+import config from './config';
 
 module.exports = {
   readNumber: function (bytes) {