updated folder  structure