Seperate files, better media support