First round of overhaul
Remove underscore dependency
Move things around and update documentation