[Portland 2013] Fix incorrect metadata and move into correct subfolders
Merge pull request #527 from webframp/fix-dupe-pdx

[Portland 2013] Fix incorrect metadata and move into correct subfolders