Some reorganization work.