[Metrix_1080] re-arrange folders