Restructured Sinatra interface