Add server stuffs
Move around dependencies