Simplify schema a bit.
Refine project JSON serializations.