Refactoring Items/MediaItems in mmdemo