add better folder structure
add tests for #categories and #search