Reorganizing, mostly.  Need to do more yet...