updated folder structure models