new wfh-common dependency structure