folders restructurization