Prep for upstream

This is part one of prepping. It basically just puts everything in one file, as per Sequel's conventions.