-import { LinkResource, LinkClass } from "~/models/link";
-import { FilterBuilder } from "~/common/api/filter-builder";
-import { ListResults } from "~/common/api/common-resource-service";
-import { FavoriteOrderBuilder } from "./favorite-order-builder";
-import { OrderBuilder } from "~/common/api/order-builder";
+import { LinkClass } from "~/models/link";
+import { FilterBuilder, joinFilters } from "~/services/api/filter-builder";
+import { ListResults } from '~/services/common-service/common-service';