Some reorganization and updates.