cdii main project refactoring