Cohort filter added to Menu
Refactored and name filters added to menu.
refactored directory again
Merge branch 'shrinkdirectory'