refacting the folder