rearranged folder structure