Better folder hierarchy.