and moved files to their correct dir