Moving class generators to own namespace