File reorganization
Added fields for computed stats for projections that use them directly; added is_actual