Reorganize folders again.