Less folder structure updates