Begin restructure to ES6 Modules