Update directory structure to match that of the new content repo format.