clearer folder structure