Cleanup.
Switch to modular-style Sinatra

A bit cleaner, and interesting to try.