Adjusted file structure.