Better file hierarchy.