Move GenericFund to DefaultFund.

Annotation clean up.

Test relationships