reorganize movie class