Better folder structure and naming