Restructure of files