Another wave of reorganization/fixes.