Better organize Media & Audio files

Change-Id: I42559ee5645c95b35d063761151172a9f04115bc