Relocate some classes and added new client class