folders rearranged to match actual usage