Restructured directory layout for media.  #19