diff --git a/index.ts b/index.ts
deleted file mode 100644
index 5c42ec6f0..000000000
--- a/index.ts
+++ /dev/null
@@ -1,187 +0,0 @@
-// Authentication
-export * from './src/authentication/Credentials';
-export * from './src/authentication/CredentialsExtractor';
-export * from './src/authentication/DPoPWebIdExtractor';
-export * from './src/authentication/EmptyCredentialsExtractor';
-export * from './src/authentication/UnsecureWebIdExtractor';
-
-// Authorization
-export * from './src/authorization/AllowEverythingAuthorizer';
-export * from './src/authorization/AclManager';
-export * from './src/authorization/Authorizer';
-export * from './src/authorization/UrlBasedAclManager';
-export * from './src/authorization/WebAclAuthorizer';
-
-// Init
-export * from './src/init/CliRunner';
-export * from './src/init/Setup';
-
-// LDP/HTTP/Metadata
-export * from './src/ldp/http/metadata/BasicMetadataExtractor';
-export * from './src/ldp/http/metadata/ContentTypeParser';
-export * from './src/ldp/http/metadata/LinkRelMetadataWriter';
-export * from './src/ldp/http/metadata/LinkTypeParser';
-export * from './src/ldp/http/metadata/MappedMetadataWriter';
-export * from './src/ldp/http/metadata/MetadataExtractor';
-export * from './src/ldp/http/metadata/MetadataParser';
-export * from './src/ldp/http/metadata/MetadataWriter';
-export * from './src/ldp/http/metadata/SlugParser';
-
-// LDP/HTTP/Response
-export * from './src/ldp/http/response/CreatedResponseDescription';
-export * from './src/ldp/http/response/OkResponseDescription';
-export * from './src/ldp/http/response/ResetResponseDescription';
-export * from './src/ldp/http/response/ResponseDescription';
-
-// LDP/HTTP
-export * from './src/ldp/http/AcceptPreferenceParser';
-export * from './src/ldp/http/BasicRequestParser';
-export * from './src/ldp/http/BasicResponseWriter';
-export * from './src/ldp/http/BasicTargetExtractor';
-export * from './src/ldp/http/BodyParser';
-export * from './src/ldp/http/ErrorResponseWriter';
-export * from './src/ldp/http/Patch';
-export * from './src/ldp/http/PreferenceParser';
-export * from './src/ldp/http/RawBodyParser';
-export * from './src/ldp/http/RequestParser';
-export * from './src/ldp/http/ResponseWriter';
-export * from './src/ldp/http/SparqlUpdateBodyParser';
-export * from './src/ldp/http/SparqlUpdatePatch';
-export * from './src/ldp/http/TargetExtractor';
-
-// LDP/Operations
-export * from './src/ldp/operations/DeleteOperationHandler';
-export * from './src/ldp/operations/GetOperationHandler';
-export * from './src/ldp/operations/HeadOperationHandler';
-export * from './src/ldp/operations/Operation';
-export * from './src/ldp/operations/OperationHandler';
-export * from './src/ldp/operations/PatchOperationHandler';
-export * from './src/ldp/operations/PostOperationHandler';
-export * from './src/ldp/operations/PutOperationHandler';
-
-// LDP/Permissions
-export * from './src/ldp/permissions/PermissionSet';
-export * from './src/ldp/permissions/PermissionsExtractor';
-export * from './src/ldp/permissions/MethodPermissionsExtractor';
-export * from './src/ldp/permissions/SparqlPatchPermissionsExtractor';
-
-// LDP/Representation
-export * from './src/ldp/representation/Representation';
-export * from './src/ldp/representation/RepresentationMetadata';
-export * from './src/ldp/representation/RepresentationPreference';
-export * from './src/ldp/representation/RepresentationPreferences';
-export * from './src/ldp/representation/ResourceIdentifier';
-
-// LDP
-export * from './src/ldp/AuthenticatedLdpHandler';
-export * from './src/ldp/UnsecureWebSocketsProtocol';
-
-// Logging
-export * from './src/logging/LazyLogger';
-export * from './src/logging/LazyLoggerFactory';
-export * from './src/logging/Logger';
-export * from './src/logging/LoggerFactory';
-export * from './src/logging/LogLevel';
-export * from './src/logging/LogUtil';
-export * from './src/logging/VoidLoggerFactory';
-export * from './src/logging/WinstonLoggerFactory';
-
-// Pods/Agent
-export * from './src/pods/agent/Agent';
-export * from './src/pods/agent/AgentJsonParser';
-export * from './src/pods/agent/AgentParser';
-
-// Pods/Generate
-export * from './src/pods/generate/HandlebarsTemplateEngine';
-export * from './src/pods/generate/IdentifierGenerator';
-export * from './src/pods/generate/ResourcesGenerator';
-export * from './src/pods/generate/SuffixIdentifierGenerator';
-export * from './src/pods/generate/TemplateEngine';
-export * from './src/pods/generate/TemplatedResourcesGenerator';
-
-// Pods
-export * from './src/pods/GeneratedPodManager';
-export * from './src/pods/PodManager';
-export * from './src/pods/PodManagerHttpHandler';
-
-// Server
-export * from './src/server/ExpressHttpServerFactory';
-export * from './src/server/HttpHandler';
-export * from './src/server/HttpRequest';
-export * from './src/server/HttpResponse';
-export * from './src/server/WebSocketServerFactory';
-export * from './src/server/WebSocketHandler';
-
-// Server/Middleware
-export * from './src/server/middleware/CorsHandler';
-export * from './src/server/middleware/HeaderHandler';
-export * from './src/server/middleware/WebSocketAdvertiser';
-
-// Storage/Accessors
-export * from './src/storage/accessors/DataAccessor';
-export * from './src/storage/accessors/FileDataAccessor';
-export * from './src/storage/accessors/InMemoryDataAccessor';
-export * from './src/storage/accessors/SparqlDataAccessor';
-
-// Storage/Conversion
-export * from './src/storage/conversion/ChainedConverter';
-export * from './src/storage/conversion/QuadToRdfConverter';
-export * from './src/storage/conversion/RdfToQuadConverter';
-export * from './src/storage/conversion/RepresentationConverter';
-export * from './src/storage/conversion/TypedRepresentationConverter';
-
-// Storage/Mapping
-export * from './src/storage/mapping/ExtensionBasedMapper';
-export * from './src/storage/mapping/FixedContentTypeMapper';
-
-// Storage/Patch
-export * from './src/storage/patch/PatchHandler';
-export * from './src/storage/patch/SparqlUpdatePatchHandler';
-
-// Storage/Routing
-export * from './src/storage/routing/ConvertingRouterRule';
-export * from './src/storage/routing/PreferenceSupport';
-export * from './src/storage/routing/RegexRouterRule';
-export * from './src/storage/routing/RouterRule';
-
-// Storage
-export * from './src/storage/AtomicResourceStore';
-export * from './src/storage/Conditions';
-export * from './src/storage/DataAccessorBasedStore';
-export * from './src/storage/LockingResourceStore';
-export * from './src/storage/MonitoringStore';
-export * from './src/storage/PassthroughStore';
-export * from './src/storage/PatchingStore';
-export * from './src/storage/ReadOnlyStore';
-export * from './src/storage/RepresentationConvertingStore';
-export * from './src/storage/ResourceStore';
-export * from './src/storage/RoutingResourceStore';
-export * from './src/storage/mapping/FileIdentifierMapper';
-
-// Util/Errors
-export * from './src/util/errors/BadRequestHttpError';
-export * from './src/util/errors/ConflictHttpError';
-export * from './src/util/errors/ForbiddenHttpError';
-export * from './src/util/errors/HttpError';
-export * from './src/util/errors/MethodNotAllowedHttpError';
-export * from './src/util/errors/NotFoundHttpError';
-export * from './src/util/errors/SystemError';
-export * from './src/util/errors/UnauthorizedHttpError';
-export * from './src/util/errors/UnsupportedMediaTypeHttpError';
-
-// Util/Locking
-export * from './src/util/locking/ExpiringLock';
-export * from './src/util/locking/ExpiringResourceLocker';
-export * from './src/util/locking/Lock';
-export * from './src/util/locking/ResourceLocker';
-export * from './src/util/locking/SingleThreadedResourceLocker';
-export * from './src/util/locking/WrappedExpiringResourceLocker';
-
-// Util
-export * from './src/util/AllVoidCompositeHandler';
-export * from './src/util/AsyncHandler';
-export * from './src/util/FirstCompositeHandler';
-export * from './src/util/HeaderUtil';
-export * from './src/util/PathUtil';
-export * from './src/util/QuadUtil';
-export * from './src/util/StreamUtil';
diff --git a/package.json b/package.json
index 0ff532a6c..9aab076ee 100644
--- a/package.json
+++ b/package.json
@@ -26,8 +26,8 @@
     "https://linkedsoftwaredependencies.org/bundles/npm/@solid/community-server/^1.0.0/components/": "components/",
     "https://linkedsoftwaredependencies.org/bundles/npm/@solid/community-server/^1.0.0/config/": "config/"
   },
-  "main": "./index.js",
-  "types": "./index.d.ts",
+  "main": "./src/index.js",
+  "types": "./src/index.d.ts",
   "bin": {
     "community-solid-server": "./bin/server.js"
   },
@@ -63,8 +63,6 @@
     }
   },
   "files": [
-    "index.js",
-    "index.d.ts",
     "bin/*.js",
     "src/**/*.js",
     "src/**/*.d.ts",
diff --git a/src/index.ts b/src/index.ts
new file mode 100644
index 000000000..336c09b78
--- /dev/null
+++ b/src/index.ts
@@ -0,0 +1,187 @@
+// Authentication
+export * from './authentication/Credentials';
+export * from './authentication/CredentialsExtractor';
+export * from './authentication/DPoPWebIdExtractor';
+export * from './authentication/EmptyCredentialsExtractor';
+export * from './authentication/UnsecureWebIdExtractor';
+
+// Authorization
+export * from './authorization/AllowEverythingAuthorizer';
+export * from './authorization/AclManager';
+export * from './authorization/Authorizer';
+export * from './authorization/UrlBasedAclManager';
+export * from './authorization/WebAclAuthorizer';
+
+// Init
+export * from './init/CliRunner';
+export * from './init/Setup';
+
+// LDP/HTTP/Metadata
+export * from './ldp/http/metadata/BasicMetadataExtractor';
+export * from './ldp/http/metadata/ContentTypeParser';
+export * from './ldp/http/metadata/LinkRelMetadataWriter';
+export * from './ldp/http/metadata/LinkTypeParser';
+export * from './ldp/http/metadata/MappedMetadataWriter';
+export * from './ldp/http/metadata/MetadataExtractor';
+export * from './ldp/http/metadata/MetadataParser';
+export * from './ldp/http/metadata/MetadataWriter';
+export * from './ldp/http/metadata/SlugParser';
+
+// 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/BasicTargetExtractor';
+export * from './ldp/http/BodyParser';
+export * from './ldp/http/ErrorResponseWriter';
+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/SparqlUpdateBodyParser';
+export * from './ldp/http/SparqlUpdatePatch';
+export * from './ldp/http/TargetExtractor';
+
+// 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/PermissionSet';
+export * from './ldp/permissions/PermissionsExtractor';
+export * from './ldp/permissions/MethodPermissionsExtractor';
+export * from './ldp/permissions/SparqlPatchPermissionsExtractor';
+
+// LDP/Representation
+export * from './ldp/representation/Representation';
+export * from './ldp/representation/RepresentationMetadata';
+export * from './ldp/representation/RepresentationPreference';
+export * from './ldp/representation/RepresentationPreferences';
+export * from './ldp/representation/ResourceIdentifier';
+
+// LDP
+export * from './ldp/AuthenticatedLdpHandler';
+export * from './ldp/UnsecureWebSocketsProtocol';
+
+// Logging
+export * from './logging/LazyLogger';
+export * from './logging/LazyLoggerFactory';
+export * from './logging/Logger';
+export * from './logging/LoggerFactory';
+export * from './logging/LogLevel';
+export * from './logging/LogUtil';
+export * from './logging/VoidLoggerFactory';
+export * from './logging/WinstonLoggerFactory';
+
+// Pods/Agent
+export * from './pods/agent/Agent';
+export * from './pods/agent/AgentJsonParser';
+export * from './pods/agent/AgentParser';
+
+// Pods/Generate
+export * from './pods/generate/HandlebarsTemplateEngine';
+export * from './pods/generate/IdentifierGenerator';
+export * from './pods/generate/ResourcesGenerator';
+export * from './pods/generate/SuffixIdentifierGenerator';
+export * from './pods/generate/TemplateEngine';
+export * from './pods/generate/TemplatedResourcesGenerator';
+
+// Pods
+export * from './pods/GeneratedPodManager';
+export * from './pods/PodManager';
+export * from './pods/PodManagerHttpHandler';
+
+// Server
+export * from './server/ExpressHttpServerFactory';
+export * from './server/HttpHandler';
+export * from './server/HttpRequest';
+export * from './server/HttpResponse';
+export * from './server/WebSocketServerFactory';
+export * from './server/WebSocketHandler';
+
+// Server/Middleware
+export * from './server/middleware/CorsHandler';
+export * from './server/middleware/HeaderHandler';
+export * from './server/middleware/WebSocketAdvertiser';
+
+// Storage/Accessors
+export * from './storage/accessors/DataAccessor';
+export * from './storage/accessors/FileDataAccessor';
+export * from './storage/accessors/InMemoryDataAccessor';
+export * from './storage/accessors/SparqlDataAccessor';
+
+// Storage/Conversion
+export * from './storage/conversion/ChainedConverter';
+export * from './storage/conversion/QuadToRdfConverter';
+export * from './storage/conversion/RdfToQuadConverter';
+export * from './storage/conversion/RepresentationConverter';
+export * from './storage/conversion/TypedRepresentationConverter';
+
+// Storage/Mapping
+export * from './storage/mapping/ExtensionBasedMapper';
+export * from './storage/mapping/FileIdentifierMapper';
+export * from './storage/mapping/FixedContentTypeMapper';
+
+// Storage/Patch
+export * from './storage/patch/PatchHandler';
+export * from './storage/patch/SparqlUpdatePatchHandler';
+
+// Storage/Routing
+export * from './storage/routing/ConvertingRouterRule';
+export * from './storage/routing/PreferenceSupport';
+export * from './storage/routing/RegexRouterRule';
+export * from './storage/routing/RouterRule';
+
+// Storage
+export * from './storage/AtomicResourceStore';
+export * from './storage/Conditions';
+export * from './storage/DataAccessorBasedStore';
+export * from './storage/LockingResourceStore';
+export * from './storage/MonitoringStore';
+export * from './storage/PassthroughStore';
+export * from './storage/PatchingStore';
+export * from './storage/ReadOnlyStore';
+export * from './storage/RepresentationConvertingStore';
+export * from './storage/ResourceStore';
+export * from './storage/RoutingResourceStore';
+
+// Util/Errors
+export * from './util/errors/BadRequestHttpError';
+export * from './util/errors/ConflictHttpError';
+export * from './util/errors/ForbiddenHttpError';
+export * from './util/errors/HttpError';
+export * from './util/errors/MethodNotAllowedHttpError';
+export * from './util/errors/NotFoundHttpError';
+export * from './util/errors/SystemError';
+export * from './util/errors/UnauthorizedHttpError';
+export * from './util/errors/UnsupportedMediaTypeHttpError';
+
+// Util/Locking
+export * from './util/locking/ExpiringLock';
+export * from './util/locking/ExpiringResourceLocker';
+export * from './util/locking/Lock';
+export * from './util/locking/ResourceLocker';
+export * from './util/locking/SingleThreadedResourceLocker';
+export * from './util/locking/WrappedExpiringResourceLocker';
+
+// Util
+export * from './util/AllVoidCompositeHandler';
+export * from './util/AsyncHandler';
+export * from './util/FirstCompositeHandler';
+export * from './util/HeaderUtil';
+export * from './util/PathUtil';
+export * from './util/QuadUtil';
+export * from './util/StreamUtil';
diff --git a/test/configs/AuthenticatedDataAccessorBasedConfig.ts b/test/configs/AuthenticatedDataAccessorBasedConfig.ts
index 2ad66f358..b018f1875 100644
--- a/test/configs/AuthenticatedDataAccessorBasedConfig.ts
+++ b/test/configs/AuthenticatedDataAccessorBasedConfig.ts
@@ -2,7 +2,7 @@ import type {
   DataAccessor,
   HttpHandler,
   ResourceStore,
-} from '../../index';
+} from '../../src/index';
 import {
   AuthenticatedLdpHandler,
   EmptyCredentialsExtractor,
@@ -10,7 +10,7 @@ import {
   MethodPermissionsExtractor,
   RdfToQuadConverter,
   QuadToRdfConverter,
-} from '../../index';
+} from '../../src/index';
 import type { ServerConfig } from './ServerConfig';
 import {
   getConvertingStore,
diff --git a/test/configs/BasicConfig.ts b/test/configs/BasicConfig.ts
index 6dab8d0bb..0cebb8084 100644
--- a/test/configs/BasicConfig.ts
+++ b/test/configs/BasicConfig.ts
@@ -1,11 +1,13 @@
-import type { HttpHandler,
-  ResourceStore } from '../../index';
+import type {
+  HttpHandler,
+  ResourceStore,
+} from '../../src/index';
 import {
   AllowEverythingAuthorizer,
   AuthenticatedLdpHandler,
   EmptyCredentialsExtractor,
   MethodPermissionsExtractor,
-} from '../../index';
+} from '../../src/index';
 import type { ServerConfig } from './ServerConfig';
 import { getOperationHandler, getInMemoryResourceStore, getBasicRequestParser, getResponseWriter } from './Util';
 
diff --git a/test/configs/BasicHandlersConfig.ts b/test/configs/BasicHandlersConfig.ts
index ef141eb43..b2f7fc9fb 100644
--- a/test/configs/BasicHandlersConfig.ts
+++ b/test/configs/BasicHandlersConfig.ts
@@ -1,5 +1,7 @@
-import type { HttpHandler,
-  ResourceStore } from '../../index';
+import type {
+  HttpHandler,
+  ResourceStore,
+} from '../../src/index';
 import {
   AllowEverythingAuthorizer,
   AuthenticatedLdpHandler,
@@ -11,7 +13,7 @@ import {
   RdfToQuadConverter,
   SparqlUpdateBodyParser,
   SparqlPatchPermissionsExtractor,
-} from '../../index';
+} from '../../src/index';
 
 import type { ServerConfig } from './ServerConfig';
 import {
diff --git a/test/configs/BasicHandlersWithAclConfig.ts b/test/configs/BasicHandlersWithAclConfig.ts
index dfe4d2eb1..acaae9150 100644
--- a/test/configs/BasicHandlersWithAclConfig.ts
+++ b/test/configs/BasicHandlersWithAclConfig.ts
@@ -1,5 +1,7 @@
-import type { HttpHandler,
-  ResourceStore } from '../../index';
+import type {
+  HttpHandler,
+  ResourceStore,
+} from '../../src/index';
 import {
   AuthenticatedLdpHandler,
   EmptyCredentialsExtractor,
@@ -7,7 +9,7 @@ import {
   MethodPermissionsExtractor,
   RdfToQuadConverter,
   QuadToRdfConverter,
-} from '../../index';
+} from '../../src/index';
 import type { ServerConfig } from './ServerConfig';
 import {
   getInMemoryResourceStore,
diff --git a/test/configs/DataAccessorBasedConfig.ts b/test/configs/DataAccessorBasedConfig.ts
index 3e7f61d6b..c62bfbf62 100644
--- a/test/configs/DataAccessorBasedConfig.ts
+++ b/test/configs/DataAccessorBasedConfig.ts
@@ -2,7 +2,7 @@ import type {
   DataAccessor,
   HttpHandler,
   ResourceStore,
-} from '../../index';
+} from '../../src/index';
 import {
   AllowEverythingAuthorizer,
   AuthenticatedLdpHandler,
@@ -12,7 +12,7 @@ import {
   QuadToRdfConverter,
   RawBodyParser,
   RdfToQuadConverter,
-} from '../../index';
+} from '../../src/index';
 import type { ServerConfig } from './ServerConfig';
 import {
   getOperationHandler,
diff --git a/test/configs/Util.ts b/test/configs/Util.ts
index b401e8861..8f530bdb1 100644
--- a/test/configs/Util.ts
+++ b/test/configs/Util.ts
@@ -11,7 +11,7 @@ import type {
   HttpResponse,
   ResponseWriter,
   OperationHandler,
-} from '../../index';
+} from '../../src/index';
 import {
   AcceptPreferenceParser, AllVoidCompositeHandler,
   BasicMetadataExtractor,
@@ -40,7 +40,7 @@ import {
   SparqlUpdatePatchHandler,
   UrlBasedAclManager,
   WebAclAuthorizer,
-} from '../../index';
+} from '../../src/index';
 import { CONTENT_TYPE, HTTP, RDF } from '../../src/util/UriConstants';
 
 export const BASE = 'http://test.com';
diff --git a/test/util/TestHelpers.ts b/test/util/TestHelpers.ts
index 73d6cb12c..8f21a245e 100644
--- a/test/util/TestHelpers.ts
+++ b/test/util/TestHelpers.ts
@@ -6,11 +6,8 @@ import { Readable } from 'stream';
 import * as url from 'url';
 import type { MockResponse } from 'node-mocks-http';
 import { createResponse } from 'node-mocks-http';
-import type { ResourceStore } from '../../index';
-import { guardedStreamFrom, RepresentationMetadata } from '../../index';
-import type { PermissionSet } from '../../src/ldp/permissions/PermissionSet';
-import type { HttpHandler } from '../../src/server/HttpHandler';
-import type { HttpRequest } from '../../src/server/HttpRequest';
+import type { ResourceStore, PermissionSet, HttpHandler, HttpRequest } from '../../src/index';
+import { guardedStreamFrom, RepresentationMetadata } from '../../src/index';
 import { CONTENT_TYPE } from '../../src/util/UriConstants';
 import { call } from './Util';
 
diff --git a/tsconfig.json b/tsconfig.json
index 2124bdb94..d853a27a4 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -14,7 +14,6 @@
     "stripInternal": true
   },
   "include": [
-    "index.ts",
     "src/**/*.ts",
     "test/**/*.ts"
   ],