Didn't think I'd need to merge...

...but apparently I do --- and there's still stuff in ./logo as well as ./branding/logo --- should all of the former be moved into the latter?