Tidy up so that both trees use the same library dependencies
Attach a file by drag & drop or click to upload
