Remove old
Move filename
Use new dvd class