Update to reorganize code.
Update for latest sitecode_key.
Finalize rgr calculations.