refacting folders