change folder structure and add roles