restructure folders again