Moved files to each own group