Moved infrastructural classes into Kernel-Infrastructure, mk II
Merge pull request #590 from herby/gh-568-2

Moved infrastructural classes into Kernel-Infrastructure, mk II