Minor change to prop names&check folder exists