-making the folder code more idiomatic