refactor: Restructure source code folder

This way the location of certain classes should make more sense

src/authentication/DPoPWebIdExtractor.ts

@@ -1,6 +1,6 @@
 import type { RequestMethod } from '@solid/access-token-verifier';
 import { createSolidTokenVerifier } from '@solid/access-token-verifier';
-import type { TargetExtractor } from '../ldp/http/TargetExtractor';
+import type { TargetExtractor } from '../http/input/identifier/TargetExtractor';
 import { getLoggerFor } from '../logging/LogUtil';
 import type { HttpRequest } from '../server/HttpRequest';
 import { BadRequestHttpError } from '../util/errors/BadRequestHttpError';

src/authorization/AllStaticReader.ts

@@ -1,7 +1,7 @@
 import type { CredentialGroup } from '../authentication/Credentials';
-import type { Permission, PermissionSet } from '../ldp/permissions/Permissions';
 import type { PermissionReaderInput } from './PermissionReader';
 import { PermissionReader } from './PermissionReader';
+import type { Permission, PermissionSet } from './permissions/Permissions';
 
 /**
  * PermissionReader which sets all permissions to true or false

src/authorization/Authorizer.ts

@@ -1,7 +1,7 @@
 import type { CredentialSet } from '../authentication/Credentials';
-import type { AccessMode, PermissionSet } from '../ldp/permissions/Permissions';
-import type { ResourceIdentifier } from '../ldp/representation/ResourceIdentifier';
+import type { ResourceIdentifier } from '../http/representation/ResourceIdentifier';
 import { AsyncHandler } from '../util/handlers/AsyncHandler';
+import type { AccessMode, PermissionSet } from './permissions/Permissions';
 
 export interface AuthorizerInput {
   /**

src/authorization/AuxiliaryReader.ts

@@ -1,10 +1,9 @@
-import type { AuxiliaryStrategy } from '../ldp/auxiliary/AuxiliaryStrategy';
-import type { PermissionSet } from '../ldp/permissions/Permissions';
+import type { AuxiliaryStrategy } from '../http/auxiliary/AuxiliaryStrategy';
 import { getLoggerFor } from '../logging/LogUtil';
 import { NotImplementedHttpError } from '../util/errors/NotImplementedHttpError';
-
 import type { PermissionReaderInput } from './PermissionReader';
 import { PermissionReader } from './PermissionReader';
+import type { PermissionSet } from './permissions/Permissions';
 
 /**
  * A PermissionReader for auxiliary resources such as acl or shape resources.

src/authorization/OwnerPermissionReader.ts

@@ -1,13 +1,13 @@
 import { CredentialGroup } from '../authentication/Credentials';
+import type { AuxiliaryIdentifierStrategy } from '../http/auxiliary/AuxiliaryIdentifierStrategy';
 import type { AccountSettings, AccountStore } from '../identity/interaction/email-password/storage/AccountStore';
-import type { AuxiliaryIdentifierStrategy } from '../ldp/auxiliary/AuxiliaryIdentifierStrategy';
-import type { AclPermission } from '../ldp/permissions/AclPermission';
-import type { PermissionSet } from '../ldp/permissions/Permissions';
 import { getLoggerFor } from '../logging/LogUtil';
 import { createErrorMessage } from '../util/errors/ErrorUtil';
 import { NotImplementedHttpError } from '../util/errors/NotImplementedHttpError';
 import type { PermissionReaderInput } from './PermissionReader';
 import { PermissionReader } from './PermissionReader';
+import type { AclPermission } from './permissions/AclPermission';
+import type { PermissionSet } from './permissions/Permissions';
 
 /**
  * Allows control access if the request is being made by the owner of the pod containing the resource.

src/authorization/PathBasedReader.ts

@@ -1,9 +1,9 @@
-import type { PermissionSet } from '../ldp/permissions/Permissions';
 import { NotImplementedHttpError } from '../util/errors/NotImplementedHttpError';
 import { ensureTrailingSlash, trimTrailingSlashes } from '../util/PathUtil';
 
 import type { PermissionReaderInput } from './PermissionReader';
 import { PermissionReader } from './PermissionReader';
+import type { PermissionSet } from './permissions/Permissions';
 
 /**
  * Redirects requests to specific PermissionReaders based on their identifier.

src/authorization/PermissionBasedAuthorizer.ts

@@ -1,10 +1,10 @@
 import type { CredentialSet } from '../authentication/Credentials';
-import type { AccessMode, PermissionSet } from '../ldp/permissions/Permissions';
 import { getLoggerFor } from '../logging/LogUtil';
 import { ForbiddenHttpError } from '../util/errors/ForbiddenHttpError';
 import { UnauthorizedHttpError } from '../util/errors/UnauthorizedHttpError';
 import type { AuthorizerInput } from './Authorizer';
 import { Authorizer } from './Authorizer';
+import type { AccessMode, PermissionSet } from './permissions/Permissions';
 
 /**
  * Authorizer that bases its decision on the output it gets from its PermissionReader.

src/authorization/PermissionReader.ts

@@ -1,7 +1,7 @@
 import type { CredentialSet } from '../authentication/Credentials';
-import type { PermissionSet } from '../ldp/permissions/Permissions';
-import type { ResourceIdentifier } from '../ldp/representation/ResourceIdentifier';
+import type { ResourceIdentifier } from '../http/representation/ResourceIdentifier';
 import { AsyncHandler } from '../util/handlers/AsyncHandler';
+import type { PermissionSet } from './permissions/Permissions';
 
 export interface PermissionReaderInput {
   /**

src/authorization/UnionPermissionReader.ts

@@ -1,7 +1,7 @@
 import type { CredentialGroup } from '../authentication/Credentials';
-import type { Permission, PermissionSet } from '../ldp/permissions/Permissions';
 import { UnionHandler } from '../util/handlers/UnionHandler';
 import type { PermissionReader } from './PermissionReader';
+import type { Permission, PermissionSet } from './permissions/Permissions';
 
 /**
  * Combines the results of multiple PermissionReaders.

src/authorization/WebAclReader.ts

@@ -2,13 +2,9 @@ import type { Quad, Term } from 'n3';
 import { Store } from 'n3';
 import { CredentialGroup } from '../authentication/Credentials';
 import type { Credential, CredentialSet } from '../authentication/Credentials';
-import type { AuxiliaryIdentifierStrategy } from '../ldp/auxiliary/AuxiliaryIdentifierStrategy';
-import { AclMode } from '../ldp/permissions/AclPermission';
-import type { AclPermission } from '../ldp/permissions/AclPermission';
-import type { PermissionSet } from '../ldp/permissions/Permissions';
-import { AccessMode } from '../ldp/permissions/Permissions';
-import type { Representation } from '../ldp/representation/Representation';
-import type { ResourceIdentifier } from '../ldp/representation/ResourceIdentifier';
+import type { AuxiliaryIdentifierStrategy } from '../http/auxiliary/AuxiliaryIdentifierStrategy';
+import type { Representation } from '../http/representation/Representation';
+import type { ResourceIdentifier } from '../http/representation/ResourceIdentifier';
 import { getLoggerFor } from '../logging/LogUtil';
 import type { ResourceStore } from '../storage/ResourceStore';
 import { INTERNAL_QUADS } from '../util/ContentTypes';
@@ -19,9 +15,13 @@ import { NotFoundHttpError } from '../util/errors/NotFoundHttpError';
 import type { IdentifierStrategy } from '../util/identifiers/IdentifierStrategy';
 import { readableToQuads } from '../util/StreamUtil';
 import { ACL, RDF } from '../util/Vocabularies';
-import type { AccessChecker } from './access-checkers/AccessChecker';
+import type { AccessChecker } from './access/AccessChecker';
 import type { PermissionReaderInput } from './PermissionReader';
 import { PermissionReader } from './PermissionReader';
+import type { AclPermission } from './permissions/AclPermission';
+import { AclMode } from './permissions/AclPermission';
+import { AccessMode } from './permissions/Permissions';
+import type { PermissionSet } from './permissions/Permissions';
 
 const modesMap: Record<string, keyof AclPermission> = {
   [ACL.Read]: AccessMode.read,

src/authorization/access/AgentGroupAccessChecker.ts

@@ -1,6 +1,5 @@
 import type { Store, Term } from 'n3';
-
-import type { ResourceIdentifier } from '../../ldp/representation/ResourceIdentifier';
+import type { ResourceIdentifier } from '../../http/representation/ResourceIdentifier';
 import type { RepresentationConverter } from '../../storage/conversion/RepresentationConverter';
 import type { ExpiringStorage } from '../../storage/keyvalue/ExpiringStorage';
 import { fetchDataset } from '../../util/FetchUtil';

src/authorization/permissions/MethodModesExtractor.ts

@@ -1,5 +1,5 @@
+import type { Operation } from '../../http/Operation';
 import { NotImplementedHttpError } from '../../util/errors/NotImplementedHttpError';
-import type { Operation } from '../operations/Operation';
 import { ModesExtractor } from './ModesExtractor';
 import { AccessMode } from './Permissions';
 

src/authorization/permissions/ModesExtractor.ts

@@ -1,5 +1,5 @@
+import type { Operation } from '../../http/Operation';
 import { AsyncHandler } from '../../util/handlers/AsyncHandler';
-import type { Operation } from '../operations/Operation';
 import type { AccessMode } from './Permissions';
 
 export abstract class ModesExtractor extends AsyncHandler<Operation, Set<AccessMode>> {}

src/authorization/permissions/SparqlPatchModesExtractor.ts

@@ -1,8 +1,8 @@
 import { Algebra } from 'sparqlalgebrajs';
+import type { Operation } from '../../http/Operation';
+import type { Representation } from '../../http/representation/Representation';
+import type { SparqlUpdatePatch } from '../../http/representation/SparqlUpdatePatch';
 import { NotImplementedHttpError } from '../../util/errors/NotImplementedHttpError';
-import type { SparqlUpdatePatch } from '../http/SparqlUpdatePatch';
-import type { Operation } from '../operations/Operation';
-import type { Representation } from '../representation/Representation';
 import { ModesExtractor } from './ModesExtractor';
 import { AccessMode } from './Permissions';
 

src/http/Operation.ts

@@ -1,8 +1,8 @@
-import type { Conditions } from '../../storage/Conditions';
-import type { PermissionSet } from '../permissions/Permissions';
-import type { Representation } from '../representation/Representation';
-import type { RepresentationPreferences } from '../representation/RepresentationPreferences';
-import type { ResourceIdentifier } from '../representation/ResourceIdentifier';
+import type { PermissionSet } from '../authorization/permissions/Permissions';
+import type { Conditions } from '../storage/Conditions';
+import type { Representation } from './representation/Representation';
+import type { RepresentationPreferences } from './representation/RepresentationPreferences';
+import type { ResourceIdentifier } from './representation/ResourceIdentifier';
 
 /**
  * A single REST operation.

src/http/input/BasicRequestParser.ts

@@ -1,13 +1,13 @@
 import type { HttpRequest } from '../../server/HttpRequest';
 import { InternalServerError } from '../../util/errors/InternalServerError';
-import type { Operation } from '../operations/Operation';
+import type { Operation } from '../Operation';
 import { RepresentationMetadata } from '../representation/RepresentationMetadata';
-import type { BodyParser } from './BodyParser';
+import type { BodyParser } from './body/BodyParser';
 import type { ConditionsParser } from './conditions/ConditionsParser';
+import type { TargetExtractor } from './identifier/TargetExtractor';
 import type { MetadataParser } from './metadata/MetadataParser';
-import type { PreferenceParser } from './PreferenceParser';
+import type { PreferenceParser } from './preferences/PreferenceParser';
 import { RequestParser } from './RequestParser';
-import type { TargetExtractor } from './TargetExtractor';
 
 /**
  * Input parsers required for a {@link BasicRequestParser}.

src/http/input/RequestParser.ts

@@ -1,6 +1,6 @@
 import type { HttpRequest } from '../../server/HttpRequest';
 import { AsyncHandler } from '../../util/handlers/AsyncHandler';
-import type { Operation } from '../operations/Operation';
+import type { Operation } from '../Operation';
 
 /**
  * Converts an incoming HttpRequest to an Operation.

src/http/input/body/BodyParser.ts

@@ -1,7 +1,7 @@
-import type { HttpRequest } from '../../server/HttpRequest';
-import { AsyncHandler } from '../../util/handlers/AsyncHandler';
-import type { Representation } from '../representation/Representation';
-import type { RepresentationMetadata } from '../representation/RepresentationMetadata';
+import type { HttpRequest } from '../../../server/HttpRequest';
+import { AsyncHandler } from '../../../util/handlers/AsyncHandler';
+import type { Representation } from '../../representation/Representation';
+import type { RepresentationMetadata } from '../../representation/RepresentationMetadata';
 
 export interface BodyParserArgs {
   /**

src/http/input/body/RawBodyParser.ts

@@ -1,7 +1,7 @@
-import { getLoggerFor } from '../../logging/LogUtil';
-import { BadRequestHttpError } from '../../util/errors/BadRequestHttpError';
-import { BasicRepresentation } from '../representation/BasicRepresentation';
-import type { Representation } from '../representation/Representation';
+import { getLoggerFor } from '../../../logging/LogUtil';
+import { BadRequestHttpError } from '../../../util/errors/BadRequestHttpError';
+import { BasicRepresentation } from '../../representation/BasicRepresentation';
+import type { Representation } from '../../representation/Representation';
 import type { BodyParserArgs } from './BodyParser';
 import { BodyParser } from './BodyParser';
 

src/http/input/body/SparqlUpdateBodyParser.ts

@@ -1,14 +1,14 @@
 import type { Algebra } from 'sparqlalgebrajs';
 import { translate } from 'sparqlalgebrajs';
-import { getLoggerFor } from '../../logging/LogUtil';
-import { APPLICATION_SPARQL_UPDATE } from '../../util/ContentTypes';
-import { BadRequestHttpError } from '../../util/errors/BadRequestHttpError';
-import { createErrorMessage } from '../../util/errors/ErrorUtil';
-import { UnsupportedMediaTypeHttpError } from '../../util/errors/UnsupportedMediaTypeHttpError';
-import { guardedStreamFrom, readableToString } from '../../util/StreamUtil';
+import { getLoggerFor } from '../../../logging/LogUtil';
+import { APPLICATION_SPARQL_UPDATE } from '../../../util/ContentTypes';
+import { BadRequestHttpError } from '../../../util/errors/BadRequestHttpError';
+import { createErrorMessage } from '../../../util/errors/ErrorUtil';
+import { UnsupportedMediaTypeHttpError } from '../../../util/errors/UnsupportedMediaTypeHttpError';
+import { guardedStreamFrom, readableToString } from '../../../util/StreamUtil';
+import type { SparqlUpdatePatch } from '../../representation/SparqlUpdatePatch';
 import type { BodyParserArgs } from './BodyParser';
 import { BodyParser } from './BodyParser';
-import type { SparqlUpdatePatch } from './SparqlUpdatePatch';
 /**
  * {@link BodyParser} that supports `application/sparql-update` content.
  * Will convert the incoming update string to algebra in a {@link SparqlUpdatePatch}.

src/http/input/identifier/OriginalUrlExtractor.ts

@@ -1,10 +1,10 @@
 import type { TLSSocket } from 'tls';
-import type { HttpRequest } from '../../server/HttpRequest';
-import { BadRequestHttpError } from '../../util/errors/BadRequestHttpError';
-import { InternalServerError } from '../../util/errors/InternalServerError';
-import { parseForwarded } from '../../util/HeaderUtil';
-import { toCanonicalUriPath } from '../../util/PathUtil';
-import type { ResourceIdentifier } from '../representation/ResourceIdentifier';
+import type { HttpRequest } from '../../../server/HttpRequest';
+import { BadRequestHttpError } from '../../../util/errors/BadRequestHttpError';
+import { InternalServerError } from '../../../util/errors/InternalServerError';
+import { parseForwarded } from '../../../util/HeaderUtil';
+import { toCanonicalUriPath } from '../../../util/PathUtil';
+import type { ResourceIdentifier } from '../../representation/ResourceIdentifier';
 import { TargetExtractor } from './TargetExtractor';
 
 /**

src/http/input/identifier/TargetExtractor.ts

@@ -0,0 +1,8 @@
+import type { HttpRequest } from '../../../server/HttpRequest';
+import { AsyncHandler } from '../../../util/handlers/AsyncHandler';
+import type { ResourceIdentifier } from '../../representation/ResourceIdentifier';
+
+/**
+ * Extracts a {@link ResourceIdentifier} from an incoming {@link HttpRequest}.
+ */
+export abstract class TargetExtractor extends AsyncHandler<{ request: HttpRequest }, ResourceIdentifier> {}

src/http/input/preferences/AcceptPreferenceParser.ts

@@ -1,13 +1,13 @@
-import type { HttpRequest } from '../../server/HttpRequest';
-import type { AcceptHeader } from '../../util/HeaderUtil';
+import type { HttpRequest } from '../../../server/HttpRequest';
+import type { AcceptHeader } from '../../../util/HeaderUtil';
 import {
   parseAccept,
   parseAcceptCharset,
   parseAcceptEncoding,
   parseAcceptLanguage,
   parseAcceptDateTime,
-} from '../../util/HeaderUtil';
-import type { RepresentationPreferences } from '../representation/RepresentationPreferences';
+} from '../../../util/HeaderUtil';
+import type { RepresentationPreferences } from '../../representation/RepresentationPreferences';
 import { PreferenceParser } from './PreferenceParser';
 
 const parsers: {

src/http/input/preferences/PreferenceParser.ts

@@ -1,6 +1,6 @@
-import type { HttpRequest } from '../../server/HttpRequest';
-import { AsyncHandler } from '../../util/handlers/AsyncHandler';
-import type { RepresentationPreferences } from '../representation/RepresentationPreferences';
+import type { HttpRequest } from '../../../server/HttpRequest';
+import { AsyncHandler } from '../../../util/handlers/AsyncHandler';
+import type { RepresentationPreferences } from '../../representation/RepresentationPreferences';
 
 /**
  * Creates {@link RepresentationPreferences} based on the incoming HTTP headers in a {@link HttpRequest}.

src/http/ldp/DeleteOperationHandler.ts

@@ -1,7 +1,7 @@
 import type { ResourceStore } from '../../storage/ResourceStore';
 import { NotImplementedHttpError } from '../../util/errors/NotImplementedHttpError';
-import { ResetResponseDescription } from '../http/response/ResetResponseDescription';
-import type { ResponseDescription } from '../http/response/ResponseDescription';
+import { ResetResponseDescription } from '../output/response/ResetResponseDescription';
+import type { ResponseDescription } from '../output/response/ResponseDescription';
 import type { OperationHandlerInput } from './OperationHandler';
 import { OperationHandler } from './OperationHandler';
 

src/http/ldp/GetOperationHandler.ts

@@ -1,7 +1,7 @@
 import type { ResourceStore } from '../../storage/ResourceStore';
 import { NotImplementedHttpError } from '../../util/errors/NotImplementedHttpError';
-import { OkResponseDescription } from '../http/response/OkResponseDescription';
-import type { ResponseDescription } from '../http/response/ResponseDescription';
+import { OkResponseDescription } from '../output/response/OkResponseDescription';
+import type { ResponseDescription } from '../output/response/ResponseDescription';
 import type { OperationHandlerInput } from './OperationHandler';
 import { OperationHandler } from './OperationHandler';
 

src/http/ldp/HeadOperationHandler.ts

@@ -1,7 +1,7 @@
 import type { ResourceStore } from '../../storage/ResourceStore';
 import { NotImplementedHttpError } from '../../util/errors/NotImplementedHttpError';
-import { OkResponseDescription } from '../http/response/OkResponseDescription';
-import type { ResponseDescription } from '../http/response/ResponseDescription';
+import { OkResponseDescription } from '../output/response/OkResponseDescription';
+import type { ResponseDescription } from '../output/response/ResponseDescription';
 import type { OperationHandlerInput } from './OperationHandler';
 import { OperationHandler } from './OperationHandler';
 

src/http/ldp/OperationHandler.ts

@@ -1,6 +1,6 @@
 import { AsyncHandler } from '../../util/handlers/AsyncHandler';
-import type { ResponseDescription } from '../http/response/ResponseDescription';
-import type { Operation } from './Operation';
+import type { Operation } from '../Operation';
+import type { ResponseDescription } from '../output/response/ResponseDescription';
 
 export interface OperationHandlerInput {
   operation: Operation;

src/http/ldp/PatchOperationHandler.ts

@@ -2,9 +2,9 @@ import { getLoggerFor } from '../../logging/LogUtil';
 import type { ResourceStore } from '../../storage/ResourceStore';
 import { BadRequestHttpError } from '../../util/errors/BadRequestHttpError';
 import { NotImplementedHttpError } from '../../util/errors/NotImplementedHttpError';
-import type { Patch } from '../http/Patch';
-import { ResetResponseDescription } from '../http/response/ResetResponseDescription';
-import type { ResponseDescription } from '../http/response/ResponseDescription';
+import { ResetResponseDescription } from '../output/response/ResetResponseDescription';
+import type { ResponseDescription } from '../output/response/ResponseDescription';
+import type { Patch } from '../representation/Patch';
 import type { OperationHandlerInput } from './OperationHandler';
 import { OperationHandler } from './OperationHandler';
 

src/http/ldp/PostOperationHandler.ts

@@ -2,8 +2,8 @@ import { getLoggerFor } from '../../logging/LogUtil';
 import type { ResourceStore } from '../../storage/ResourceStore';
 import { BadRequestHttpError } from '../../util/errors/BadRequestHttpError';
 import { NotImplementedHttpError } from '../../util/errors/NotImplementedHttpError';
-import { CreatedResponseDescription } from '../http/response/CreatedResponseDescription';
-import type { ResponseDescription } from '../http/response/ResponseDescription';
+import { CreatedResponseDescription } from '../output/response/CreatedResponseDescription';
+import type { ResponseDescription } from '../output/response/ResponseDescription';
 import type { OperationHandlerInput } from './OperationHandler';
 import { OperationHandler } from './OperationHandler';
 

src/http/ldp/PutOperationHandler.ts

@@ -2,8 +2,8 @@ import { getLoggerFor } from '../../logging/LogUtil';
 import type { ResourceStore } from '../../storage/ResourceStore';
 import { BadRequestHttpError } from '../../util/errors/BadRequestHttpError';
 import { NotImplementedHttpError } from '../../util/errors/NotImplementedHttpError';
-import { ResetResponseDescription } from '../http/response/ResetResponseDescription';
-import type { ResponseDescription } from '../http/response/ResponseDescription';
+import { ResetResponseDescription } from '../output/response/ResetResponseDescription';
+import type { ResponseDescription } from '../output/response/ResponseDescription';
 import type { OperationHandlerInput } from './OperationHandler';
 import { OperationHandler } from './OperationHandler';
 

src/http/ldp/metadata/OperationMetadataCollector.ts

@@ -1,6 +1,6 @@
 import { AsyncHandler } from '../../../util/handlers/AsyncHandler';
+import type { Operation } from '../../Operation';
 import type { RepresentationMetadata } from '../../representation/RepresentationMetadata';
-import type { Operation } from '../Operation';
 
 export interface OperationMetadataCollectorInput {
   /**

src/http/ldp/metadata/WebAclMetadataCollector.ts

@@ -1,7 +1,7 @@
+import { AclMode } from '../../../authorization/permissions/AclPermission';
+import type { AclPermission } from '../../../authorization/permissions/AclPermission';
+import { AccessMode } from '../../../authorization/permissions/Permissions';
 import { ACL, AUTH } from '../../../util/Vocabularies';
-import { AclMode } from '../../permissions/AclPermission';
-import type { AclPermission } from '../../permissions/AclPermission';
-import { AccessMode } from '../../permissions/Permissions';
 
 import type { OperationMetadataCollectorInput } from './OperationMetadataCollector';
 import { OperationMetadataCollector } from './OperationMetadataCollector';

src/http/output/error/ConvertingErrorHandler.ts

@@ -1,17 +1,17 @@
 import type {
   RepresentationConverter,
   RepresentationConverterArgs,
-} from '../../storage/conversion/RepresentationConverter';
-import { INTERNAL_ERROR } from '../../util/ContentTypes';
-import { getStatusCode } from '../../util/errors/ErrorUtil';
-import { toLiteral } from '../../util/TermUtil';
-import { HTTP, XSD } from '../../util/Vocabularies';
-import { BasicRepresentation } from '../representation/BasicRepresentation';
-import type { Representation } from '../representation/Representation';
-import { RepresentationMetadata } from '../representation/RepresentationMetadata';
+} from '../../../storage/conversion/RepresentationConverter';
+import { INTERNAL_ERROR } from '../../../util/ContentTypes';
+import { getStatusCode } from '../../../util/errors/ErrorUtil';
+import { toLiteral } from '../../../util/TermUtil';
+import { HTTP, XSD } from '../../../util/Vocabularies';
+import { BasicRepresentation } from '../../representation/BasicRepresentation';
+import type { Representation } from '../../representation/Representation';
+import { RepresentationMetadata } from '../../representation/RepresentationMetadata';
+import type { ResponseDescription } from '../response/ResponseDescription';
 import type { ErrorHandlerArgs } from './ErrorHandler';
 import { ErrorHandler } from './ErrorHandler';
-import type { ResponseDescription } from './response/ResponseDescription';
 
 // Used by internal helper function
 type PreparedArguments = {

src/http/output/error/ErrorHandler.ts

@@ -1,6 +1,6 @@
-import { AsyncHandler } from '../../util/handlers/AsyncHandler';
-import type { RepresentationPreferences } from '../representation/RepresentationPreferences';
-import type { ResponseDescription } from './response/ResponseDescription';
+import { AsyncHandler } from '../../../util/handlers/AsyncHandler';
+import type { RepresentationPreferences } from '../../representation/RepresentationPreferences';
+import type { ResponseDescription } from '../response/ResponseDescription';
 
 export interface ErrorHandlerArgs {
   error: Error;

src/http/output/error/SafeErrorHandler.ts

@@ -1,12 +1,12 @@
-import { getLoggerFor } from '../../logging/LogUtil';
-import { createErrorMessage, getStatusCode } from '../../util/errors/ErrorUtil';
-import { guardedStreamFrom } from '../../util/StreamUtil';
-import { toLiteral } from '../../util/TermUtil';
-import { HTTP, XSD } from '../../util/Vocabularies';
-import { RepresentationMetadata } from '../representation/RepresentationMetadata';
+import { getLoggerFor } from '../../../logging/LogUtil';
+import { createErrorMessage, getStatusCode } from '../../../util/errors/ErrorUtil';
+import { guardedStreamFrom } from '../../../util/StreamUtil';
+import { toLiteral } from '../../../util/TermUtil';
+import { HTTP, XSD } from '../../../util/Vocabularies';
+import { RepresentationMetadata } from '../../representation/RepresentationMetadata';
+import type { ResponseDescription } from '../response/ResponseDescription';
 import type { ErrorHandlerArgs } from './ErrorHandler';
 import { ErrorHandler } from './ErrorHandler';
-import type { ResponseDescription } from './response/ResponseDescription';
 
 /**
  * Returns a simple text description of an error.

src/http/representation/Patch.ts

@@ -1,4 +1,4 @@
-import type { Representation } from '../representation/Representation';
+import type { Representation } from './Representation';
 
 /**
  * Represents the changes needed for a PATCH request.

src/identity/IdentityProviderHttpHandler.ts

@@ -1,9 +1,9 @@
-import type { ErrorHandler } from '../ldp/http/ErrorHandler';
-import { RedirectResponseDescription } from '../ldp/http/response/RedirectResponseDescription';
-import { ResponseDescription } from '../ldp/http/response/ResponseDescription';
-import type { Operation } from '../ldp/operations/Operation';
-import { BasicRepresentation } from '../ldp/representation/BasicRepresentation';
-import type { Representation } from '../ldp/representation/Representation';
+import type { Operation } from '../http/Operation';
+import type { ErrorHandler } from '../http/output/error/ErrorHandler';
+import { RedirectResponseDescription } from '../http/output/response/RedirectResponseDescription';
+import { ResponseDescription } from '../http/output/response/ResponseDescription';
+import { BasicRepresentation } from '../http/representation/BasicRepresentation';
+import type { Representation } from '../http/representation/Representation';
 import { getLoggerFor } from '../logging/LogUtil';
 import type { HttpRequest } from '../server/HttpRequest';
 import type { OperationHttpHandlerInput } from '../server/OperationHttpHandler';

src/identity/configuration/IdentityProviderFactory.ts

@@ -10,10 +10,11 @@ import type { AnyObject,
   KoaContextWithOIDC,
   Configuration,
   Account,
-  ErrorOut, Adapter } from 'oidc-provider';
+  ErrorOut,
+  Adapter } from 'oidc-provider';
 import { Provider } from 'oidc-provider';
-import type { ErrorHandler } from '../../ldp/http/ErrorHandler';
-import type { ResponseWriter } from '../../ldp/http/ResponseWriter';
+import type { ErrorHandler } from '../../http/output/error/ErrorHandler';
+import type { ResponseWriter } from '../../http/output/ResponseWriter';
 import type { KeyValueStorage } from '../../storage/keyvalue/KeyValueStorage';
 import { ensureTrailingSlash, joinUrl } from '../../util/PathUtil';
 import type { AdapterFactory } from '../storage/AdapterFactory';

src/identity/interaction/email-password/handler/InteractionHandler.ts

@@ -1,5 +1,5 @@
 import type { KoaContextWithOIDC } from 'oidc-provider';
-import type { Operation } from '../../../../ldp/operations/Operation';
+import type { Operation } from '../../../../http/Operation';
 import { APPLICATION_JSON } from '../../../../util/ContentTypes';
 import { NotImplementedHttpError } from '../../../../util/errors/NotImplementedHttpError';
 import { AsyncHandler } from '../../../../util/handlers/AsyncHandler';

src/identity/interaction/email-password/handler/LoginHandler.ts

@@ -1,5 +1,5 @@
 import assert from 'assert';
-import type { Operation } from '../../../../ldp/operations/Operation';
+import type { Operation } from '../../../../http/Operation';
 import { getLoggerFor } from '../../../../logging/LogUtil';
 import { BadRequestHttpError } from '../../../../util/errors/BadRequestHttpError';
 import { readJsonStream } from '../../../../util/StreamUtil';

src/identity/interaction/email-password/util/RegistrationManager.ts

@@ -1,5 +1,5 @@
 import assert from 'assert';
-import type { ResourceIdentifier } from '../../../../ldp/representation/ResourceIdentifier';
+import type { ResourceIdentifier } from '../../../../http/representation/ResourceIdentifier';
 import { getLoggerFor } from '../../../../logging/LogUtil';
 import type { IdentifierGenerator } from '../../../../pods/generate/IdentifierGenerator';
 import type { PodManager } from '../../../../pods/PodManager';

src/identity/interaction/routing/BasicInteractionRoute.ts

@@ -1,4 +1,4 @@
-import type { Operation } from '../../../ldp/operations/Operation';
+import type { Operation } from '../../../http/Operation';
 import { BadRequestHttpError } from '../../../util/errors/BadRequestHttpError';
 import { createErrorMessage, isError } from '../../../util/errors/ErrorUtil';
 import { InternalServerError } from '../../../util/errors/InternalServerError';

src/identity/interaction/routing/InteractionRoute.ts

@@ -1,4 +1,4 @@
-import type { Operation } from '../../../ldp/operations/Operation';
+import type { Operation } from '../../../http/Operation';
 import type { Interaction, InteractionHandlerResult } from '../email-password/handler/InteractionHandler';
 
 export type TemplatedInteractionResult<T extends InteractionHandlerResult = InteractionHandlerResult> = T & {

src/index.ts

@@ -8,11 +8,17 @@ export * from './authentication/UnionCredentialsExtractor';
 export * from './authentication/UnsecureConstantCredentialsExtractor';
 export * from './authentication/UnsecureWebIdExtractor';
 
-// Authorization/Access-Checkers
-export * from './authorization/access-checkers/AccessChecker';
-export * from './authorization/access-checkers/AgentAccessChecker';
-export * from './authorization/access-checkers/AgentClassAccessChecker';
-export * from './authorization/access-checkers/AgentGroupAccessChecker';
+// Authorization/Access
+export * from './authorization/access/AccessChecker';
+export * from './authorization/access/AgentAccessChecker';
+export * from './authorization/access/AgentClassAccessChecker';
+export * from './authorization/access/AgentGroupAccessChecker';
+
+// Authorization/Permissions
+export * from './authorization/permissions/Permissions';
+export * from './authorization/permissions/ModesExtractor';
+export * from './authorization/permissions/MethodModesExtractor';
+export * from './authorization/permissions/SparqlPatchModesExtractor';
 
 // Authorization
 export * from './authorization/OwnerPermissionReader';
@@ -25,6 +31,95 @@ export * from './authorization/PermissionReader';
 export * from './authorization/UnionPermissionReader';
 export * from './authorization/WebAclReader';
 
+// HTTP/Auxiliary
+export * from './http/auxiliary/AuxiliaryIdentifierStrategy';
+export * from './http/auxiliary/AuxiliaryStrategy';
+export * from './http/auxiliary/ComposedAuxiliaryStrategy';
+export * from './http/auxiliary/LinkMetadataGenerator';
+export * from './http/auxiliary/MetadataGenerator';
+export * from './http/auxiliary/RdfValidator';
+export * from './http/auxiliary/RoutingAuxiliaryIdentifierStrategy';
+export * from './http/auxiliary/RoutingAuxiliaryStrategy';
+export * from './http/auxiliary/SuffixAuxiliaryIdentifierStrategy';
+export * from './http/auxiliary/Validator';
+
+// HTTP/Input/Body
+export * from './http/input/body/BodyParser';
+export * from './http/input/body/RawBodyParser';
+export * from './http/input/body/SparqlUpdateBodyParser';
+
+// HTTP/Input/Conditions
+export * from './http/input/conditions/BasicConditionsParser';
+export * from './http/input/conditions/ConditionsParser';
+
+// HTTP/Input/Identifier
+export * from './http/input/identifier/OriginalUrlExtractor';
+export * from './http/input/identifier/TargetExtractor';
+
+// HTTP/Input/Metadata
+export * from './http/input/metadata/ContentTypeParser';
+export * from './http/input/metadata/LinkRelParser';
+export * from './http/input/metadata/MetadataParser';
+export * from './http/input/metadata/SlugParser';
+
+// HTTP/Input/Preferences
+export * from './http/input/preferences/AcceptPreferenceParser';
+export * from './http/input/preferences/PreferenceParser';
+
+// HTTP/Input
+export * from './http/input/BasicRequestParser';
+export * from './http/input/RequestParser';
+
+// HTTP/LDP/Metadata
+export * from './http/ldp/metadata/OperationMetadataCollector';
+export * from './http/ldp/metadata/WebAclMetadataCollector';
+
+// HTTP/LDP
+export * from './http/ldp/DeleteOperationHandler';
+export * from './http/ldp/GetOperationHandler';
+export * from './http/ldp/HeadOperationHandler';
+export * from './http/ldp/OperationHandler';
+export * from './http/ldp/PatchOperationHandler';
+export * from './http/ldp/PostOperationHandler';
+export * from './http/ldp/PutOperationHandler';
+
+// HTTP/Output/Error
+export * from './http/output/error/ConvertingErrorHandler';
+export * from './http/output/error/ErrorHandler';
+export * from './http/output/error/SafeErrorHandler';
+
+// HTTP/Output/Metadata
+export * from './http/output/metadata/ConstantMetadataWriter';
+export * from './http/output/metadata/LinkRelMetadataWriter';
+export * from './http/output/metadata/MappedMetadataWriter';
+export * from './http/output/metadata/MetadataWriter';
+export * from './http/output/metadata/ModifiedMetadataWriter';
+export * from './http/output/metadata/WacAllowMetadataWriter';
+export * from './http/output/metadata/WwwAuthMetadataWriter';
+
+// HTTP/Output/Response
+export * from './http/output/response/CreatedResponseDescription';
+export * from './http/output/response/OkResponseDescription';
+export * from './http/output/response/ResetResponseDescription';
+export * from './http/output/response/ResponseDescription';
+
+// HTTP/Output
+export * from './http/output/BasicResponseWriter';
+export * from './http/output/ResponseWriter';
+
+// HTTP/Representation
+export * from './http/representation/BasicRepresentation';
+export * from './http/representation/Patch';
+export * from './http/representation/Representation';
+export * from './http/representation/RepresentationMetadata';
+export * from './http/representation/RepresentationPreferences';
+export * from './http/representation/ResourceIdentifier';
+export * from './http/representation/SparqlUpdatePatch';
+
+// HTTP
+export * from './http/Operation';
+export * from './http/UnsecureWebSocketsProtocol';
+
 // Identity/Configuration
 export * from './identity/configuration/IdentityProviderFactory';
 export * from './identity/configuration/ProviderFactory';
@@ -87,89 +182,6 @@ export * from './init/Initializer';
 export * from './init/LoggerInitializer';
 export * from './init/ServerInitializer';
 
-// LDP/Authorization
-export * from './ldp/auxiliary/AuxiliaryIdentifierStrategy';
-export * from './ldp/auxiliary/AuxiliaryStrategy';
-export * from './ldp/auxiliary/ComposedAuxiliaryStrategy';
-export * from './ldp/auxiliary/LinkMetadataGenerator';
-export * from './ldp/auxiliary/MetadataGenerator';
-export * from './ldp/auxiliary/RdfValidator';
-export * from './ldp/auxiliary/RoutingAuxiliaryIdentifierStrategy';
-export * from './ldp/auxiliary/RoutingAuxiliaryStrategy';
-export * from './ldp/auxiliary/SuffixAuxiliaryIdentifierStrategy';
-export * from './ldp/auxiliary/Validator';
-
-// LDP/HTTP/Conditions
-export * from './ldp/http/conditions/BasicConditionsParser';
-export * from './ldp/http/conditions/ConditionsParser';
-
-// LDP/HTTP/Metadata
-export * from './ldp/http/metadata/ConstantMetadataWriter';
-export * from './ldp/http/metadata/ContentTypeParser';
-export * from './ldp/http/metadata/LinkRelMetadataWriter';
-export * from './ldp/http/metadata/LinkRelParser';
-export * from './ldp/http/metadata/MappedMetadataWriter';
-export * from './ldp/http/metadata/MetadataParser';
-export * from './ldp/http/metadata/MetadataWriter';
-export * from './ldp/http/metadata/ModifiedMetadataWriter';
-export * from './ldp/http/metadata/SlugParser';
-export * from './ldp/http/metadata/WacAllowMetadataWriter';
-export * from './ldp/http/metadata/WwwAuthMetadataWriter';
-
-// LDP/HTTP/Response
-export * from './ldp/http/response/CreatedResponseDescription';
-export * from './ldp/http/response/OkResponseDescription';
-export * from './ldp/http/response/ResetResponseDescription';
-export * from './ldp/http/response/ResponseDescription';
-
-// LDP/HTTP
-export * from './ldp/http/AcceptPreferenceParser';
-export * from './ldp/http/BasicRequestParser';
-export * from './ldp/http/BasicResponseWriter';
-export * from './ldp/http/BodyParser';
-export * from './ldp/http/ConvertingErrorHandler';
-export * from './ldp/http/ErrorHandler';
-export * from './ldp/http/OriginalUrlExtractor';
-export * from './ldp/http/Patch';
-export * from './ldp/http/PreferenceParser';
-export * from './ldp/http/RawBodyParser';
-export * from './ldp/http/RequestParser';
-export * from './ldp/http/ResponseWriter';
-export * from './ldp/http/SafeErrorHandler';
-export * from './ldp/http/SparqlUpdateBodyParser';
-export * from './ldp/http/SparqlUpdatePatch';
-export * from './ldp/http/TargetExtractor';
-
-// LDP/Operations/Metadata
-export * from './ldp/operations/metadata/OperationMetadataCollector';
-export * from './ldp/operations/metadata/WebAclMetadataCollector';
-
-// LDP/Operations
-export * from './ldp/operations/DeleteOperationHandler';
-export * from './ldp/operations/GetOperationHandler';
-export * from './ldp/operations/HeadOperationHandler';
-export * from './ldp/operations/Operation';
-export * from './ldp/operations/OperationHandler';
-export * from './ldp/operations/PatchOperationHandler';
-export * from './ldp/operations/PostOperationHandler';
-export * from './ldp/operations/PutOperationHandler';
-
-// LDP/Permissions
-export * from './ldp/permissions/Permissions';
-export * from './ldp/permissions/ModesExtractor';
-export * from './ldp/permissions/MethodModesExtractor';
-export * from './ldp/permissions/SparqlPatchModesExtractor';
-
-// LDP/Representation
-export * from './ldp/representation/BasicRepresentation';
-export * from './ldp/representation/Representation';
-export * from './ldp/representation/RepresentationMetadata';
-export * from './ldp/representation/RepresentationPreferences';
-export * from './ldp/representation/ResourceIdentifier';
-
-// LDP
-export * from './ldp/UnsecureWebSocketsProtocol';
-
 // Logging
 export * from './logging/LazyLogger';
 export * from './logging/LazyLoggerFactory';

src/init/ContainerInitializer.ts

@@ -1,4 +1,4 @@
-import type { ResourceIdentifier } from '../ldp/representation/ResourceIdentifier';
+import type { ResourceIdentifier } from '../http/representation/ResourceIdentifier';
 import { getLoggerFor } from '../logging/LogUtil';
 import type { ResourcesGenerator } from '../pods/generate/ResourcesGenerator';
 import type { KeyValueStorage } from '../storage/keyvalue/KeyValueStorage';

src/init/setup/SetupHttpHandler.ts

@@ -1,9 +1,9 @@
+import type { Operation } from '../../http/Operation';
+import type { ErrorHandler } from '../../http/output/error/ErrorHandler';
+import { ResponseDescription } from '../../http/output/response/ResponseDescription';
+import { BasicRepresentation } from '../../http/representation/BasicRepresentation';
 import type { RegistrationParams,
   RegistrationManager } from '../../identity/interaction/email-password/util/RegistrationManager';
-import type { ErrorHandler } from '../../ldp/http/ErrorHandler';
-import { ResponseDescription } from '../../ldp/http/response/ResponseDescription';
-import type { Operation } from '../../ldp/operations/Operation';
-import { BasicRepresentation } from '../../ldp/representation/BasicRepresentation';
 import { getLoggerFor } from '../../logging/LogUtil';
 import type { OperationHttpHandlerInput } from '../../server/OperationHttpHandler';
 import { OperationHttpHandler } from '../../server/OperationHttpHandler';

src/ldp/http/TargetExtractor.ts

@@ -1,8 +0,0 @@
-import type { HttpRequest } from '../../server/HttpRequest';
-import { AsyncHandler } from '../../util/handlers/AsyncHandler';
-import type { ResourceIdentifier } from '../representation/ResourceIdentifier';
-
-/**
- * Extracts a {@link ResourceIdentifier} from an incoming {@link HttpRequest}.
- */
-export abstract class TargetExtractor extends AsyncHandler<{ request: HttpRequest }, ResourceIdentifier> {}

src/pods/ConfigPodManager.ts

@@ -1,4 +1,4 @@
-import type { ResourceIdentifier } from '../ldp/representation/ResourceIdentifier';
+import type { ResourceIdentifier } from '../http/representation/ResourceIdentifier';
 import { getLoggerFor } from '../logging/LogUtil';
 import type { KeyValueStorage } from '../storage/keyvalue/KeyValueStorage';
 import type { ResourceStore } from '../storage/ResourceStore';

src/pods/GeneratedPodManager.ts

@@ -1,4 +1,4 @@
-import type { ResourceIdentifier } from '../ldp/representation/ResourceIdentifier';
+import type { ResourceIdentifier } from '../http/representation/ResourceIdentifier';
 import { getLoggerFor } from '../logging/LogUtil';
 import type { ResourceStore } from '../storage/ResourceStore';
 import { ConflictHttpError } from '../util/errors/ConflictHttpError';

src/pods/PodManager.ts

@@ -1,4 +1,4 @@
-import type { ResourceIdentifier } from '../ldp/representation/ResourceIdentifier';
+import type { ResourceIdentifier } from '../http/representation/ResourceIdentifier';
 import type { PodSettings } from './settings/PodSettings';
 
 /**

src/pods/generate/GenerateUtil.ts

@@ -1,4 +1,4 @@
-import type { ResourceIdentifier } from '../../ldp/representation/ResourceIdentifier';
+import type { ResourceIdentifier } from '../../http/representation/ResourceIdentifier';
 import type { ResourceStore } from '../../storage/ResourceStore';
 import type { ResourcesGenerator } from './ResourcesGenerator';
 

src/pods/generate/IdentifierGenerator.ts

@@ -1,4 +1,4 @@
-import type { ResourceIdentifier } from '../../ldp/representation/ResourceIdentifier';
+import type { ResourceIdentifier } from '../../http/representation/ResourceIdentifier';
 
 /**
  * Utility class for generating container identifiers.

src/pods/generate/PodGenerator.ts

@@ -1,4 +1,4 @@
-import type { ResourceIdentifier } from '../../ldp/representation/ResourceIdentifier';
+import type { ResourceIdentifier } from '../../http/representation/ResourceIdentifier';
 import type { ResourceStore } from '../../storage/ResourceStore';
 import type { PodSettings } from '../settings/PodSettings';
 

src/pods/generate/ResourcesGenerator.ts

@@ -1,5 +1,5 @@
-import type { Representation } from '../../ldp/representation/Representation';
-import type { ResourceIdentifier } from '../../ldp/representation/ResourceIdentifier';
+import type { Representation } from '../../http/representation/Representation';
+import type { ResourceIdentifier } from '../../http/representation/ResourceIdentifier';
 import Dict = NodeJS.Dict;
 
 export interface Resource {

src/pods/generate/SubdomainIdentifierGenerator.ts

@@ -1,4 +1,4 @@
-import type { ResourceIdentifier } from '../../ldp/representation/ResourceIdentifier';
+import type { ResourceIdentifier } from '../../http/representation/ResourceIdentifier';
 import { ensureTrailingSlash, extractScheme } from '../../util/PathUtil';
 import type { IdentifierGenerator } from './IdentifierGenerator';
 

src/pods/generate/SuffixIdentifierGenerator.ts

@@ -1,4 +1,4 @@
-import type { ResourceIdentifier } from '../../ldp/representation/ResourceIdentifier';
+import type { ResourceIdentifier } from '../../http/representation/ResourceIdentifier';
 import { ensureTrailingSlash } from '../../util/PathUtil';
 import type { IdentifierGenerator } from './IdentifierGenerator';
 

src/pods/generate/TemplatedPodGenerator.ts

@@ -1,4 +1,4 @@
-import type { ResourceIdentifier } from '../../ldp/representation/ResourceIdentifier';
+import type { ResourceIdentifier } from '../../http/representation/ResourceIdentifier';
 import { getLoggerFor } from '../../logging/LogUtil';
 import type { KeyValueStorage } from '../../storage/keyvalue/KeyValueStorage';
 import type { ResourceStore } from '../../storage/ResourceStore';