Refactor movies to move logic to repository