Fix generators up till content spec

Refactor generators from fixed set implementation.
Stopped at generator for content spec. that generator is still failing

Author: ozimos