no sinatra
reorg
more cleanup