Update deps
Relocated and moduled server