Start refactoring movies in preparation for proper cli