Move to module bundler friendly process