Move some file names for ticket:8 OPD stuff