Update underscore
Rearange files.

Put files in a more standard layout. I should have done this from the
beginning but I was used to django and didn't really think about it.