Reorganize files into correct dir