Clean up object directory organization for fat merging.