Deferring instantiation of guards into an own factory

Hotfix for #124

Aims at moving instantiation of guards and providers into own factories