Restructure files.