Remove archive and draft folders.
Merge 2013 diff base into official branch.