Change MovieEntries to MovieEntry; switch class relationships