diff --git a/packages/css/src/util/fetch/SignedFetcher.ts b/packages/css/src/util/fetch/SignedFetcher.ts
index a1627bf0..5a14f4cc 100644
--- a/packages/css/src/util/fetch/SignedFetcher.ts
+++ b/packages/css/src/util/fetch/SignedFetcher.ts
@@ -1,9 +1,8 @@
 import { InternalServerError, type JwkGenerator } from '@solid/community-server';
-import { RequestInfo } from '@solidlab/ucp';
 import { getLoggerFor } from 'global-logger-factory';
 import { httpbis, type SigningKey } from 'http-message-signatures';
 import { BufferSource } from 'node:stream/web';
-import type { Fetcher } from './Fetcher';
+import type { Fetcher, FetchParams } from './Fetcher';
 
 const algMap = {
   'Ed25519': { name: 'Ed25519' },
@@ -33,7 +32,7 @@ export class SignedFetcher implements Fetcher {
     protected keyGen: JwkGenerator,
   ) {}
 
-  public async fetch(input: RequestInfo, init?: RequestInit): Promise<Response> {
+  public async fetch(...[ input, init ]: FetchParams): Promise<Response> {
     const jwk = await this.keyGen.getPrivateKey();
 
     const { alg, kid } = jwk;
diff --git a/packages/ucp/.componentsignore b/packages/ucp/.componentsignore
deleted file mode 100644
index 0d4f101c..00000000
--- a/packages/ucp/.componentsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/packages/ucp/.gitignore b/packages/ucp/.gitignore
deleted file mode 100644
index b2b5d0d0..00000000
--- a/packages/ucp/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-debug
\ No newline at end of file
diff --git a/packages/ucp/config/default.json b/packages/ucp/config/default.json
deleted file mode 100644
index a074b112..00000000
--- a/packages/ucp/config/default.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "@context": [
-    "https://linkedsoftwaredependencies.org/bundles/npm/@solidlab/ucp/^0.0.0/components/context.jsonld"
-  ]
-}
diff --git a/packages/ucp/package.json b/packages/ucp/package.json
deleted file mode 100644
index f6539ef6..00000000
--- a/packages/ucp/package.json
+++ /dev/null
@@ -1,70 +0,0 @@
-{
-  "name": "@solidlab/ucp",
-  "version": "0.3.0",
-  "description": "A Usage Control Policy decision/enforcement component.",
-  "keywords": [
-    "access control",
-    "usage control",
-    "authorization",
-    "policies",
-    "grants"
-  ],
-  "author": {
-    "name": "Wout Slabbinck",
-    "email": "wout.slabbinck@ugent.be",
-    "url": "https://woutslabbinck.com"
-  },
-  "license": "MIT",
-  "repository": "github:SolidLabResearch/user-managed-access",
-  "homepage": "https://github.com/SolidLabResearch/user-managed-access/README.md",
-  "bugs": "https://github.com/SolidLabResearch/user-managed-access/issues",
-  "contributors": [
-    {
-      "name": "Wout Slabbink",
-      "email": "wout.slabbink@ugent.be",
-      "url": "https://pod.woutslabbinck.com/profile/card#me"
-    },
-    {
-      "name": "Wouter Termont",
-      "email": "wouter.termont@ugent.be",
-      "url": "https://wouter.termont.online/"
-    }
-  ],
-  "private": true,
-  "packageManager": "yarn@4.9.2",
-  "engines": {
-    "node": ">=20.0",
-    "yarn": ">=4.0"
-  },
-  "type": "commonjs",
-  "main": "./dist/index.js",
-  "types": "./dist/index.d.ts",
-  "exports": {
-    "./package.json": "./package.json",
-    ".": "./dist/index.js"
-  },
-  "files": [
-    ".componentsignore",
-    "dist",
-    "config"
-  ],
-  "scripts": {
-    "build": "yarn build:ts && yarn build:components",
-    "build:ts": "yarn run -T tsc",
-    "build:components": "yarn run -T componentsjs-generator -r ucp -s src -c dist/components -i .componentsignore --lenient"
-  },
-  "dependencies": {
-    "@types/n3": "^1.16.4",
-    "n3": "^1.17.2"
-  },
-  "lsd:module": "https://linkedsoftwaredependencies.org/bundles/npm/@solidlab/ucp",
-  "lsd:components": "dist/components/components.jsonld",
-  "lsd:contexts": {
-    "https://linkedsoftwaredependencies.org/bundles/npm/@solidlab/ucp/^0.0.0/components/context.jsonld": "dist/components/context.jsonld"
-  },
-  "lsd:importPaths": {
-    "https://linkedsoftwaredependencies.org/bundles/npm/@solidlab/ucp/^0.0.0/components/": "dist/components/",
-    "https://linkedsoftwaredependencies.org/bundles/npm/@solidlab/ucp/^0.0.0/config/": "config/",
-    "https://linkedsoftwaredependencies.org/bundles/npm/@solidlab/ucp/^0.0.0/dist/": "dist/"
-  }
-}
diff --git a/packages/ucp/src/index.ts b/packages/ucp/src/index.ts
deleted file mode 100644
index 94830ead..00000000
--- a/packages/ucp/src/index.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-// storage
-export * from './storage/ContainerUCRulesStorage'
-export * from './storage/DirectoryUCRulesStorage'
-export * from './storage/MemoryUCRulesStorage'
-export * from './storage/UCRulesStorage'
-
-// policy
-export * from './policy/ODRL'
-export * from './policy/UsageControlPolicy'
-
-// util
-export * from './util/Util'
-export * from './util/Vocabularies'
diff --git a/packages/ucp/test/tsconfig.json b/packages/ucp/test/tsconfig.json
deleted file mode 100644
index f75e3dba..00000000
--- a/packages/ucp/test/tsconfig.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "extends": "../tsconfig.json",
-  "include": [
-    "."
-  ]
-}
diff --git a/packages/ucp/tsconfig.json b/packages/ucp/tsconfig.json
deleted file mode 100644
index c2aac31c..00000000
--- a/packages/ucp/tsconfig.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-  "compilerOptions": {
-    // "@tsconfig/node16/tsconfig.json"
-    "lib": ["es2021"],
-    "module": "node16",
-    "target": "es2021",
-    "strict": true,
-    "esModuleInterop": true,
-    "skipLibCheck": true,
-    "forceConsistentCasingInFileNames": true,
-    "moduleResolution": "node16",
-    "types": [ "vitest/globals" ],
-    "declaration": true,
-    "isolatedModules": true,
-    "inlineSourceMap": true,
-    "preserveConstEnums": true,
-    "outDir": "dist",
-    "noImplicitAny": true,
-    "experimentalDecorators": true,
-    "downlevelIteration": true,
-  },
-  "include": ["src"],
-  "exclude": ["node_modules"]
-}
diff --git a/packages/uma/config/demo.json b/packages/uma/config/demo.json
index 6171a3e7..d74fab6e 100644
--- a/packages/uma/config/demo.json
+++ b/packages/uma/config/demo.json
@@ -1,7 +1,6 @@
 {
   "@context": [
-    "https://linkedsoftwaredependencies.org/bundles/npm/@solidlab/uma/^0.0.0/components/context.jsonld",
-    "https://linkedsoftwaredependencies.org/bundles/npm/@solidlab/ucp/^0.0.0/components/context.jsonld"
+    "https://linkedsoftwaredependencies.org/bundles/npm/@solidlab/uma/^0.0.0/components/context.jsonld"
   ],
   "import": [
     "sai-uma:config/default.json"
diff --git a/packages/uma/config/policies/authorizers/default.json b/packages/uma/config/policies/authorizers/default.json
index 652b1a41..f5f71972 100644
--- a/packages/uma/config/policies/authorizers/default.json
+++ b/packages/uma/config/policies/authorizers/default.json
@@ -1,7 +1,6 @@
 {
   "@context": [
-    "https://linkedsoftwaredependencies.org/bundles/npm/@solidlab/uma/^0.0.0/components/context.jsonld",
-    "https://linkedsoftwaredependencies.org/bundles/npm/@solidlab/ucp/^0.0.0/components/context.jsonld"
+    "https://linkedsoftwaredependencies.org/bundles/npm/@solidlab/uma/^0.0.0/components/context.jsonld"
   ],
   "@graph": [
     {
diff --git a/packages/uma/package.json b/packages/uma/package.json
index cb606f2d..e0b4b997 100644
--- a/packages/uma/package.json
+++ b/packages/uma/package.json
@@ -62,7 +62,6 @@
     "@httpland/authorization-parser": "^1.1.0",
     "@solid/access-token-verifier": "^1.2.0",
     "@solid/community-server": "^8.0.0-alpha.1",
-    "@solidlab/ucp": "workspace:^",
     "@types/ms": "^2.1.0",
     "@types/n3": "^1.16.4",
     "asynchronous-handlers": "^1.0.2",
diff --git a/packages/uma/src/controller/AccessRequestController.ts b/packages/uma/src/controller/AccessRequestController.ts
index 0fd10b50..0848da35 100644
--- a/packages/uma/src/controller/AccessRequestController.ts
+++ b/packages/uma/src/controller/AccessRequestController.ts
@@ -1,11 +1,11 @@
-import { UCRulesStorage } from "@solidlab/ucp";
+import { UCRulesStorage } from "../ucp/storage/UCRulesStorage";
 import { BaseController } from "./BaseController";
-import { 
-    deleteAccessRequest, 
-    getAccessRequest, 
-    getAccessRequests, 
-    patchAccessRequest, 
-    postAccessRequest 
+import {
+    deleteAccessRequest,
+    getAccessRequest,
+    getAccessRequests,
+    patchAccessRequest,
+    postAccessRequest
 } from "../util/routeSpecific";
 
 /**
@@ -28,17 +28,17 @@ export class AccessRequestController extends BaseController {
 
     /**
      * Deletes are not allowed on access requests.
-     * 
+     *
      * @param entityID ID pointing to the policy or access request
      * @param clientID ID of the resource owner (RO) or requesting party (RP) making the deletion
      * @returns a status code: 403
      */
     public async deleteEntity(entityID: string, clientID: string): Promise<{ status: number }> {
-        return { status: 403 }; 
+        return { status: 403 };
     }
 
     public async putEntity(data: string, entityID: string, clientID: string): Promise<{ status: number }> {
-        return { status: 403 }; 
+        return { status: 403 };
     }
 
 }
diff --git a/packages/uma/src/controller/BaseController.ts b/packages/uma/src/controller/BaseController.ts
index 4e10d9b5..9cd99d41 100644
--- a/packages/uma/src/controller/BaseController.ts
+++ b/packages/uma/src/controller/BaseController.ts
@@ -1,4 +1,4 @@
-import { UCRulesStorage } from "@solidlab/ucp";
+import { UCRulesStorage } from "../ucp/storage/UCRulesStorage";
 import { getLoggerFor } from 'global-logger-factory';
 import { Parser, Store } from 'n3';
 import { writeStore } from "../util/ConvertUtil";
diff --git a/packages/uma/src/controller/PolicyRequestController.ts b/packages/uma/src/controller/PolicyRequestController.ts
index 3990311f..a6a0454a 100644
--- a/packages/uma/src/controller/PolicyRequestController.ts
+++ b/packages/uma/src/controller/PolicyRequestController.ts
@@ -1,11 +1,11 @@
-import { UCRulesStorage } from "@solidlab/ucp";
+import { UCRulesStorage } from "../ucp/storage/UCRulesStorage";
 import { BaseController } from "./BaseController";
-import { 
-    deletePolicy, 
-    getPolicies, 
-    getPolicy, 
-    patchPolicy, 
-    postPolicy 
+import {
+    deletePolicy,
+    getPolicies,
+    getPolicy,
+    patchPolicy,
+    postPolicy
 } from "../util/routeSpecific";
 
 /**
diff --git a/packages/uma/src/index.ts b/packages/uma/src/index.ts
index 4a22dceb..17443d33 100644
--- a/packages/uma/src/index.ts
+++ b/packages/uma/src/index.ts
@@ -79,6 +79,16 @@ export * from './util/http/validate/HttpMessageValidator';
 export * from './util/http/validate/PatRequestValidator';
 export * from './util/http/validate/RequestValidator';
 
+// UCP
+export * from './ucp/policy/ODRL';
+export * from './ucp/policy/UsageControlPolicy';
+export * from './ucp/storage/ContainerUCRulesStorage';
+export * from './ucp/storage/DirectoryUCRulesStorage';
+export * from './ucp/storage/MemoryUCRulesStorage';
+export * from './ucp/storage/UCRulesStorage';
+export * from './ucp/util/Util';
+export * from './ucp/util/Vocabularies';
+
 // Util
 export * from './util/ConvertUtil';
 export * from './util/HttpMessageSignatures';
diff --git a/packages/uma/src/policies/authorizers/OdrlAuthorizer.ts b/packages/uma/src/policies/authorizers/OdrlAuthorizer.ts
index 37b2deb9..7c750afb 100644
--- a/packages/uma/src/policies/authorizers/OdrlAuthorizer.ts
+++ b/packages/uma/src/policies/authorizers/OdrlAuthorizer.ts
@@ -1,12 +1,15 @@
 import { BadRequestHttpError, DC, NotImplementedHttpError, RDF } from '@solid/community-server';
-import { basicPolicy, ODRL, UCPConstraint, UCPPolicy, UCRulesStorage } from '@solidlab/ucp';
 import { getLoggerFor } from 'global-logger-factory';
-import { DataFactory, Literal, NamedNode, Quad, Quad_Subject, Store, Writer } from 'n3';
+import { DataFactory, Literal, NamedNode, Quad, Quad_Subject, Store } from 'n3';
 import { EyeReasoner, ODRLEngineMultipleSteps, ODRLEvaluator } from 'odrl-evaluator'
 import { createVocabulary } from 'rdf-vocabulary';
 import { CLIENTID, WEBID } from '../../credentials/Claims';
 import { ClaimSet } from '../../credentials/ClaimSet';
 import { Requirements } from '../../credentials/Requirements';
+import { basicPolicy } from '../../ucp/policy/ODRL';
+import { UCPPolicy } from '../../ucp/policy/UsageControlPolicy';
+import { UCRulesStorage } from '../../ucp/storage/UCRulesStorage';
+import { ODRL } from '../../ucp/util/Vocabularies';
 import { Permission } from '../../views/Permission';
 import { Authorizer } from './Authorizer';
 
diff --git a/packages/uma/src/routes/ResourceRegistration.ts b/packages/uma/src/routes/ResourceRegistration.ts
index 9dd3a4ca..63d666f2 100644
--- a/packages/uma/src/routes/ResourceRegistration.ts
+++ b/packages/uma/src/routes/ResourceRegistration.ts
@@ -6,12 +6,13 @@ import {
   InternalServerError,
   joinUrl,
   MethodNotAllowedHttpError,
-  NotFoundHttpError,
+  NotFoundHttpError, RDF,
 } from '@solid/community-server';
-import { ODRL, ODRL_P, OWL, RDF, UCRulesStorage } from '@solidlab/ucp';
 import { getLoggerFor } from 'global-logger-factory';
 import { DataFactory as DF, NamedNode, Quad, Quad_Subject, Store } from 'n3';
 import { randomUUID } from 'node:crypto';
+import { UCRulesStorage } from '../ucp/storage/UCRulesStorage';
+import { ODRL, ODRL_P, OWL } from '../ucp/util/Vocabularies';
 import {
   HttpHandler,
   HttpHandlerContext,
diff --git a/packages/ucp/src/policy/ODRL.ts b/packages/uma/src/ucp/policy/ODRL.ts
similarity index 97%
rename from packages/ucp/src/policy/ODRL.ts
rename to packages/uma/src/ucp/policy/ODRL.ts
index fda60e16..226e9fd0 100644
--- a/packages/ucp/src/policy/ODRL.ts
+++ b/packages/uma/src/ucp/policy/ODRL.ts
@@ -1,6 +1,7 @@
+import { RDF, XSD } from '@solid/community-server';
 import { DataFactory, Quad, Store } from "n3";
 import { randomUUID } from 'node:crypto';
-import { ODRL, RDF, XSD } from "../util/Vocabularies";
+import { ODRL } from "../util/Vocabularies";
 import { SimplePolicy, UCPConstraint, UCPPolicy, UCPRule } from "./UsageControlPolicy";
 const { quad, namedNode, literal } = DataFactory
 
diff --git a/packages/ucp/src/policy/UsageControlPolicy.ts b/packages/uma/src/ucp/policy/UsageControlPolicy.ts
similarity index 100%
rename from packages/ucp/src/policy/UsageControlPolicy.ts
rename to packages/uma/src/ucp/policy/UsageControlPolicy.ts
diff --git a/packages/ucp/src/storage/ContainerUCRulesStorage.ts b/packages/uma/src/ucp/storage/ContainerUCRulesStorage.ts
similarity index 100%
rename from packages/ucp/src/storage/ContainerUCRulesStorage.ts
rename to packages/uma/src/ucp/storage/ContainerUCRulesStorage.ts
diff --git a/packages/ucp/src/storage/DirectoryUCRulesStorage.ts b/packages/uma/src/ucp/storage/DirectoryUCRulesStorage.ts
similarity index 100%
rename from packages/ucp/src/storage/DirectoryUCRulesStorage.ts
rename to packages/uma/src/ucp/storage/DirectoryUCRulesStorage.ts
diff --git a/packages/ucp/src/storage/MemoryUCRulesStorage.ts b/packages/uma/src/ucp/storage/MemoryUCRulesStorage.ts
similarity index 100%
rename from packages/ucp/src/storage/MemoryUCRulesStorage.ts
rename to packages/uma/src/ucp/storage/MemoryUCRulesStorage.ts
diff --git a/packages/ucp/src/storage/UCRulesStorage.ts b/packages/uma/src/ucp/storage/UCRulesStorage.ts
similarity index 100%
rename from packages/ucp/src/storage/UCRulesStorage.ts
rename to packages/uma/src/ucp/storage/UCRulesStorage.ts
diff --git a/packages/ucp/src/util/Util.ts b/packages/uma/src/ucp/util/Util.ts
similarity index 100%
rename from packages/ucp/src/util/Util.ts
rename to packages/uma/src/ucp/util/Util.ts
diff --git a/packages/ucp/src/util/Vocabularies.ts b/packages/uma/src/ucp/util/Vocabularies.ts
similarity index 95%
rename from packages/ucp/src/util/Vocabularies.ts
rename to packages/uma/src/ucp/util/Vocabularies.ts
index d3557b81..4f109d5e 100644
--- a/packages/ucp/src/util/Vocabularies.ts
+++ b/packages/uma/src/ucp/util/Vocabularies.ts
@@ -103,11 +103,6 @@ export function extendVocabulary<TBase extends string, TLocal extends string, TN
   return createVocabulary(vocabulary.namespace, ...allNames);
 }
 
-export const RDF = createVocabulary(
-    'http://www.w3.org/1999/02/22-rdf-syntax-ns#',
-    'type',
-);
-
 
 export const ODRL = createVocabulary(
     'http://www.w3.org/ns/odrl/2/',
@@ -149,11 +144,3 @@ export const OWL = createVocabulary(
   'http://www.w3.org/2002/07/owl#',
   'inverseOf',
 );
-
-export const XSD = createVocabulary(
-    'http://www.w3.org/2001/XMLSchema#',
-    'dateTime',
-    'duration',
-    'integer',
-    'string',
-);
diff --git a/packages/uma/src/views/Contract.ts b/packages/uma/src/views/Contract.ts
index e476237a..852cf3ab 100644
--- a/packages/uma/src/views/Contract.ts
+++ b/packages/uma/src/views/Contract.ts
@@ -1,4 +1,4 @@
-import { ODRL } from "@solidlab/ucp";
+import { ODRL } from '../ucp/util/Vocabularies';
 import { Type, array, string, optional, any, union } from "../util/ReType";
 
 export const JsonLdIdentifier = {
@@ -61,9 +61,9 @@ export function convertStringOrJsonLdIdentifierToString(x : StringOrJsonLdIdenti
 
 /**
  * Note: This check makes the assumption of slash-semantics based resource ordering!
- * @param url 
- * @param policyTarget 
- * @returns 
+ * @param url
+ * @param policyTarget
+ * @returns
  */
 export function isPolicyTarget(url: string, policyTarget: ODRLTargetOrAssetCollection) {
     // AssetCollection
@@ -71,7 +71,7 @@ export function isPolicyTarget(url: string, policyTarget: ODRLTargetOrAssetColle
     if (assetCollectionType && assetCollectionType === ODRL.namespace + "AssetCollection") {
         return url.startsWith((policyTarget as ODRLAssetCollection).source)
     }
-    
+
     // @id identfier
     const id = (policyTarget as JsonLdIdentifier)["@id"]
     if (id && url === id) return true
@@ -87,11 +87,11 @@ export function getPolicyTargets(policyTarget: ODRLTargetOrAssetCollection): str
     if (assetCollectionType && assetCollectionType === ODRL.namespace + "AssetCollection") {
         return (policyTarget as ODRLAssetCollection).source
     }
-    
+
     // @id identfier
     const id = (policyTarget as JsonLdIdentifier)["@id"]
     if (id) return id
 
     // string
-    return policyTarget as string  
-}
\ No newline at end of file
+    return policyTarget as string
+}
diff --git a/packages/uma/test/unit/policies/authorizers/OdrlAuthorizer.test.ts b/packages/uma/test/unit/policies/authorizers/OdrlAuthorizer.test.ts
index 43af6681..73624033 100644
--- a/packages/uma/test/unit/policies/authorizers/OdrlAuthorizer.test.ts
+++ b/packages/uma/test/unit/policies/authorizers/OdrlAuthorizer.test.ts
@@ -1,15 +1,16 @@
 import { NotImplementedHttpError, RDF, XSD } from '@solid/community-server';
-import { basicPolicy, UCRulesStorage } from '@solidlab/ucp';
 import { DataFactory as DF, Parser, Store } from 'n3';
 import { ODRLEvaluator } from 'odrl-evaluator';
 import { Mocked } from 'vitest';
 import { OdrlAuthorizer } from '../../../../src/policies/authorizers/OdrlAuthorizer';
+import { basicPolicy } from '../../../../src/ucp/policy/ODRL';
+import { UCRulesStorage } from '../../../../src/ucp/storage/UCRulesStorage';
 import { Permission } from '../../../../src/views/Permission';
 
 const now = new Date();
 vi.useFakeTimers({ now });
 
-vi.mock('@solidlab/ucp', async(importOriginal) => ({
+vi.mock('../../../../src/ucp/policy/ODRL', async(importOriginal) => ({
     ...await importOriginal(),
     basicPolicy: vi.fn(),
 }));
diff --git a/packages/uma/test/unit/routes/ResourceRegistration.test.ts b/packages/uma/test/unit/routes/ResourceRegistration.test.ts
index d43b313d..acd2bdfc 100644
--- a/packages/uma/test/unit/routes/ResourceRegistration.test.ts
+++ b/packages/uma/test/unit/routes/ResourceRegistration.test.ts
@@ -6,10 +6,12 @@ import {
   NotFoundHttpError,
   RDF
 } from '@solid/community-server';
-import { ODRL, ODRL_P, OWL, UCRulesStorage } from '@solidlab/ucp';
 import { DataFactory as DF, Store } from 'n3';
+import { ODRL } from 'odrl-evaluator';
 import { Mocked } from 'vitest';
 import { ResourceRegistrationRequestHandler } from '../../../src/routes/ResourceRegistration';
+import { UCRulesStorage } from '../../../src/ucp/storage/UCRulesStorage';
+import { ODRL_P, OWL } from '../../../src/ucp/util/Vocabularies';
 import { HttpHandlerContext } from '../../../src/util/http/models/HttpHandler';
 import { RequestValidator } from '../../../src/util/http/validate/RequestValidator';
 import { RegistrationStore } from '../../../src/util/RegistrationStore';
diff --git a/packages/ucp/test/unit/policy/ODRL.test.ts b/packages/uma/test/unit/ucp/policy/ODRL.test.ts
similarity index 88%
rename from packages/ucp/test/unit/policy/ODRL.test.ts
rename to packages/uma/test/unit/ucp/policy/ODRL.test.ts
index 73d43947..a8546318 100644
--- a/packages/ucp/test/unit/policy/ODRL.test.ts
+++ b/packages/uma/test/unit/ucp/policy/ODRL.test.ts
@@ -1,7 +1,8 @@
-import { DataFactory as DF, Writer } from 'n3';
-import { basicPolicy } from '../../../src/policy/ODRL';
-import { UCPPolicy } from '../../../src/policy/UsageControlPolicy';
-import { ODRL, RDF, XSD } from '../../../src/util/Vocabularies';
+import { RDF, XSD } from '@solid/community-server';
+import { DataFactory as DF } from 'n3';
+import { basicPolicy } from '../../../../src/ucp/policy/ODRL';
+import { UCPPolicy } from '../../../../src/ucp/policy/UsageControlPolicy';
+import { ODRL } from '../../../../src/ucp/util/Vocabularies';
 
 const now = new Date();
 vi.useFakeTimers({ now });
diff --git a/packages/ucp/test/unit/storage/ContainerUCRulesStorage.test.ts b/packages/uma/test/unit/ucp/storage/ContainerUCRulesStorage.test.ts
similarity index 98%
rename from packages/ucp/test/unit/storage/ContainerUCRulesStorage.test.ts
rename to packages/uma/test/unit/ucp/storage/ContainerUCRulesStorage.test.ts
index b49d2698..16a123d5 100644
--- a/packages/ucp/test/unit/storage/ContainerUCRulesStorage.test.ts
+++ b/packages/uma/test/unit/ucp/storage/ContainerUCRulesStorage.test.ts
@@ -1,8 +1,8 @@
 import 'jest-rdf';
+import { RDF } from '@solid/community-server';
 import { DataFactory as DF, NamedNode, Parser, Store } from 'n3';
 import { Mock, vi } from 'vitest';
-import { ContainerUCRulesStorage } from '../../../src/storage/ContainerUCRulesStorage';
-import { RDF } from '../../../src/util/Vocabularies';
+import { ContainerUCRulesStorage } from '../../../../src/ucp/storage/ContainerUCRulesStorage';
 
 describe('ContainerUCRulesStorage', (): void => {
   const containerTtl = `
diff --git a/packages/ucp/test/unit/storage/DirectoryUCRulesStorage.test.ts b/packages/uma/test/unit/ucp/storage/DirectoryUCRulesStorage.test.ts
similarity index 97%
rename from packages/ucp/test/unit/storage/DirectoryUCRulesStorage.test.ts
rename to packages/uma/test/unit/ucp/storage/DirectoryUCRulesStorage.test.ts
index 2275499f..c6d6d2c4 100644
--- a/packages/ucp/test/unit/storage/DirectoryUCRulesStorage.test.ts
+++ b/packages/uma/test/unit/ucp/storage/DirectoryUCRulesStorage.test.ts
@@ -1,9 +1,9 @@
 import 'jest-rdf';
+import { RDF } from '@solid/community-server';
 import { DataFactory as DF, Store } from 'n3';
 import * as fs from 'node:fs';
 import path from 'node:path';
-import { DirectoryUCRulesStorage } from '../../../src/storage/DirectoryUCRulesStorage';
-import { RDF } from '../../../src/util/Vocabularies';
+import { DirectoryUCRulesStorage } from '../../../../src/ucp/storage/DirectoryUCRulesStorage';
 
 vi.mock('fs', () => ({
   lstatSync: vi.fn().mockReturnValue({ isDirectory: vi.fn().mockReturnValue(true) }),
diff --git a/packages/ucp/test/unit/storage/MemoryUCRulesStorage.test.ts b/packages/uma/test/unit/ucp/storage/MemoryUCRulesStorage.test.ts
similarity index 97%
rename from packages/ucp/test/unit/storage/MemoryUCRulesStorage.test.ts
rename to packages/uma/test/unit/ucp/storage/MemoryUCRulesStorage.test.ts
index c243cf21..2c647766 100644
--- a/packages/ucp/test/unit/storage/MemoryUCRulesStorage.test.ts
+++ b/packages/uma/test/unit/ucp/storage/MemoryUCRulesStorage.test.ts
@@ -1,5 +1,5 @@
 import { Parser, Store } from 'n3';
-import { MemoryUCRulesStorage } from '../../../src/storage/MemoryUCRulesStorage'
+import { MemoryUCRulesStorage } from '../../../../src/ucp/storage/MemoryUCRulesStorage'
 import "jest-rdf";
 
 describe('A MemoryUCRulesStorage', () => {
diff --git a/packages/ucp/test/unit/util/Util.test.ts b/packages/uma/test/unit/ucp/util/Util.test.ts
similarity index 95%
rename from packages/ucp/test/unit/util/Util.test.ts
rename to packages/uma/test/unit/ucp/util/Util.test.ts
index f8247390..fb8e66be 100644
--- a/packages/ucp/test/unit/util/Util.test.ts
+++ b/packages/uma/test/unit/ucp/util/Util.test.ts
@@ -1,6 +1,6 @@
 import 'jest-rdf';
 import { DataFactory as DF, Store } from 'n3';
-import { extractQuadsRecursive } from '../../../src/util/Util';
+import { extractQuadsRecursive } from '../../../../src/ucp/util/Util';
 
 describe('Util', (): void => {
   describe('#extractQuadsRecursive', (): void => {
diff --git a/test/integration/Policies.test.ts b/test/integration/Policies.test.ts
index 2f639120..98c51123 100644
--- a/test/integration/Policies.test.ts
+++ b/test/integration/Policies.test.ts
@@ -1,5 +1,5 @@
 import { App } from '@solid/community-server';
-import { ODRL } from '@solidlab/ucp';
+import { ODRL } from '@solidlab/uma';
 import { setGlobalLoggerFactory, WinstonLoggerFactory } from 'global-logger-factory';
 import { DataFactory as DF, Parser, Store } from 'n3';
 import path from 'node:path';
diff --git a/yarn.lock b/yarn.lock
index a7d82c3c..970d5445 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5619,15 +5619,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@solidlab/ucp@workspace:^, @solidlab/ucp@workspace:packages/ucp":
-  version: 0.0.0-use.local
-  resolution: "@solidlab/ucp@workspace:packages/ucp"
-  dependencies:
-    "@types/n3": "npm:^1.16.4"
-    n3: "npm:^1.17.2"
-  languageName: unknown
-  linkType: soft
-
 "@solidlab/uma-css@workspace:packages/css":
   version: 0.0.0-use.local
   resolution: "@solidlab/uma-css@workspace:packages/css"
@@ -5654,7 +5645,6 @@ __metadata:
     "@httpland/authorization-parser": "npm:^1.1.0"
     "@solid/access-token-verifier": "npm:^1.2.0"
     "@solid/community-server": "npm:^8.0.0-alpha.1"
-    "@solidlab/ucp": "workspace:^"
     "@types/ms": "npm:^2.1.0"
     "@types/n3": "npm:^1.16.4"
     asynchronous-handlers: "npm:^1.0.2"