LiftedKc: move some internal classes to source file