Better file structure and naming