Resolve file layout issues.