updated folder naming