Finish /direct2experiment/ and fix /client/