Major refactoring of Items/MediaItems. 
(This will affect other modules too)