Some minor organizational changes.