Fix #43 - Remove Manager and ManagerClient modules