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