reflection of cdii main project refactoring
repo update