IW: Finish converting modules to ES6 style