updated folder layout