Separate out files and add media