Moves some classes out of Kernel-Objects. Fixes #568.