folders restructurisation