Add underscore.js, rearrange some files.