Split httpkernel and kernel out to own classes