Changed module and class structure for sinatra