Moving to client/server dirs