updated folder structure