reorg and move more towards browserify