functions folder structure upgraded