changed ffolder structure