fix folders structure
mend