restructured sinatra app