Extract server part to separate module (continue2)