Apparently, I didn't branch that last time.
We are now willing to add directory structure.  The delete from the master branch has been rendered unnecessary.  Merge conflicts resolved by re-adding files.