Refacotring for folder add