Patched up reorganization changes.

Program should now work.