Reorg js for concat + minify