Convert modules to load from es6