Added media and reorganized