Finish reorganization