Updates to metadata
Fix duplicate folders
Test for the case of a folder thats a key
Clean up