Fix NPM modules bin path and make paths more modular