Moved files to separate folders