Reorganize anf publish on NPM