Small architecture changes.

Now cinc uses constructors instead of factory functions if any.