bug fixes, folder and npm clean up