folder structure improvements