worked on filter and refactored app structure
merge conflict solved