Restructure of files, work on machines