Just declared and few methods in factory.cpp
Merge client.h