More folder structure improvements