Add Fetchable::Decorator

And rearrange a few things.