Upgrade to latest es6 module syntax
Fix export default syntax