tidying up folder structure for design