Moved recently added media and template files to their new place.
Merge branch 'coco_live' into test_integration. Directory structure fixed.