Make folder structure clearer