Item refactoring

Combined items and yesterday items into a single entity, added scopes for differentiation. 
Fix indentation in the whole file.