modularisation and browserify
push old fixes