Sync with folder inside of bucket

This builds on the work done in #33 - I think it works all over.