Better file layout, folder navigation