issue #1758: adjusted folder structure for NPM

issue #1758: adjusted folder structure for NPM