Refactor Uploader#directory_content

I feel the new version shows intent better. Thoughts?