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

This should fix the duplicate proposal listing