Reorganize and sync.