Client and Monitor merged in one repository