Initial commit of removing es6 modules