1st step to change project to use common lib