Upgrade to latest es6 module syntax