Refactored movie into separate model file