Reorganization
Odds and ends.