<Res> Improving server-side

Trying to figure out how to organize the whole thing ...