Minor changes: check folders exist, renamed props