Refactoring of ccore module