Added structure for media files.
Merge branch 'development' into x