RAZ-2242: Changed the way how we move files and notify users