Item refactoring

Combined items and yesterday items into a single entity, added scopes for differentiation. 
correct the indentation in the file, and use hash rocket style