Simplified folder structure - less nesting.