Update to current ES6 module syntax