Moved movie image class properties down into Movie