Rearranged folder structure according to Carlos folder structure