[IMP-dev] Moving base classes to kernel