Fix and organize files