Implemented refactoring of core classes for CI