source folder rearranged