Item refactoring

Combined today items and yesterday items into a single entity, added scopes for differentiation. 
uncomment