Create package cdsp for all logic, refactoring of classes