Isolating treksFilters + moving back to trek/map independant modules