Some organizing changes.