rearranged folder layout