Restructures folder structure