refactor folders again
folders mess
again folder fix