2 big updates and a few tweaks here and there

Updating to reflect the changes I made in the S3 and local disk adapters-- normalizes filename/dirPath/id/dirname stuff into two things:  `dirname` and `fd` (and really it's just fd that matters)