some clean up
removed old media
changed locations