Add dirs at the end.

Now necessary as we are carrying files forward from buildset to minimal.
Tidy up