Prepare some changes in the file layout.