[Client] Bootstrap dependency moved at its own place