More ES6 Refactoring

This finalizes the refactor of this package to use ES6 modules and align with the rest of the infrastructure.