Though slightly less efficient, adding everything (as before) and just removing the one folder might make the code more straightforward.