diff --git a/lib/core/api/README.md b/lib/core/api/README.md
new file mode 100644
index 0000000000..b8203042d7
--- /dev/null
+++ b/lib/core/api/README.md
@@ -0,0 +1,3 @@
+# @alfresco/adf-core/api
+
+Secondary entry point of `@alfresco/adf-core`. It can be used by importing from `@alfresco/adf-core/api`.
diff --git a/lib/core/api/ng-package.json b/lib/core/api/ng-package.json
index dba7877da8..c781f0df46 100644
--- a/lib/core/api/ng-package.json
+++ b/lib/core/api/ng-package.json
@@ -1,6 +1,5 @@
 {
-  "$schema": "../../../../../node_modules/ng-packagr/ng-package.schema.json",
   "lib": {
-    "entryFile": "public-api.ts"
+    "entryFile": "src/index.ts"
   }
 }
diff --git a/lib/core/api/public-api.ts b/lib/core/api/public-api.ts
deleted file mode 100644
index 3281ffa843..0000000000
--- a/lib/core/api/public-api.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-/*!
- * @license
- * Copyright 2019 Alfresco Software, Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-export * from './api-client.factory';
-export * from './api-clients.service';
-export * from './clients';
-export * from './types';
-export * from './alfresco-api/alfresco-api.http-client';
diff --git a/lib/core/api/index.ts b/lib/core/api/src/index.ts
similarity index 75%
rename from lib/core/api/index.ts
rename to lib/core/api/src/index.ts
index c8d536d2e1..f731288ee9 100644
--- a/lib/core/api/index.ts
+++ b/lib/core/api/src/index.ts
@@ -15,5 +15,8 @@
  * limitations under the License.
  */
 
-export * from './public-api';
-
+export * from './lib/api-client.factory';
+export * from './lib/api-clients.service';
+export * from './lib/clients';
+export * from './lib/types';
+export * from './lib/alfresco-api/alfresco-api.http-client';
diff --git a/lib/core/api/alfresco-api/alfresco-api.http-client.spec.ts b/lib/core/api/src/lib/alfresco-api/alfresco-api.http-client.spec.ts
similarity index 100%
rename from lib/core/api/alfresco-api/alfresco-api.http-client.spec.ts
rename to lib/core/api/src/lib/alfresco-api/alfresco-api.http-client.spec.ts
diff --git a/lib/core/api/alfresco-api/alfresco-api.http-client.ts b/lib/core/api/src/lib/alfresco-api/alfresco-api.http-client.ts
similarity index 100%
rename from lib/core/api/alfresco-api/alfresco-api.http-client.ts
rename to lib/core/api/src/lib/alfresco-api/alfresco-api.http-client.ts
diff --git a/lib/core/api/alfresco-api/alfresco-api.param-encoder.spec.ts b/lib/core/api/src/lib/alfresco-api/alfresco-api.param-encoder.spec.ts
similarity index 100%
rename from lib/core/api/alfresco-api/alfresco-api.param-encoder.spec.ts
rename to lib/core/api/src/lib/alfresco-api/alfresco-api.param-encoder.spec.ts
diff --git a/lib/core/api/alfresco-api/alfresco-api.param-encoder.ts b/lib/core/api/src/lib/alfresco-api/alfresco-api.param-encoder.ts
similarity index 100%
rename from lib/core/api/alfresco-api/alfresco-api.param-encoder.ts
rename to lib/core/api/src/lib/alfresco-api/alfresco-api.param-encoder.ts
diff --git a/lib/core/api/alfresco-api/alfresco-api.response-error.ts b/lib/core/api/src/lib/alfresco-api/alfresco-api.response-error.ts
similarity index 100%
rename from lib/core/api/alfresco-api/alfresco-api.response-error.ts
rename to lib/core/api/src/lib/alfresco-api/alfresco-api.response-error.ts
diff --git a/lib/core/api/alfresco-api/alfresco-api.utils.spec.ts b/lib/core/api/src/lib/alfresco-api/alfresco-api.utils.spec.ts
similarity index 100%
rename from lib/core/api/alfresco-api/alfresco-api.utils.spec.ts
rename to lib/core/api/src/lib/alfresco-api/alfresco-api.utils.spec.ts
diff --git a/lib/core/api/alfresco-api/alfresco-api.utils.ts b/lib/core/api/src/lib/alfresco-api/alfresco-api.utils.ts
similarity index 100%
rename from lib/core/api/alfresco-api/alfresco-api.utils.ts
rename to lib/core/api/src/lib/alfresco-api/alfresco-api.utils.ts
diff --git a/lib/core/api/api-client.factory.ts b/lib/core/api/src/lib/api-client.factory.ts
similarity index 100%
rename from lib/core/api/api-client.factory.ts
rename to lib/core/api/src/lib/api-client.factory.ts
diff --git a/lib/core/api/api-clients.service.spec.ts b/lib/core/api/src/lib/api-clients.service.spec.ts
similarity index 100%
rename from lib/core/api/api-clients.service.spec.ts
rename to lib/core/api/src/lib/api-clients.service.spec.ts
diff --git a/lib/core/api/api-clients.service.ts b/lib/core/api/src/lib/api-clients.service.ts
similarity index 100%
rename from lib/core/api/api-clients.service.ts
rename to lib/core/api/src/lib/api-clients.service.ts
diff --git a/lib/core/api/clients/activiti/activiti-client.module.ts b/lib/core/api/src/lib/clients/activiti/activiti-client.module.ts
similarity index 100%
rename from lib/core/api/clients/activiti/activiti-client.module.ts
rename to lib/core/api/src/lib/clients/activiti/activiti-client.module.ts
diff --git a/lib/core/api/clients/activiti/activiti-client.types.ts b/lib/core/api/src/lib/clients/activiti/activiti-client.types.ts
similarity index 100%
rename from lib/core/api/clients/activiti/activiti-client.types.ts
rename to lib/core/api/src/lib/clients/activiti/activiti-client.types.ts
diff --git a/lib/core/api/clients/alfresco-js-clients.module.ts b/lib/core/api/src/lib/clients/alfresco-js-clients.module.ts
similarity index 81%
rename from lib/core/api/clients/alfresco-js-clients.module.ts
rename to lib/core/api/src/lib/clients/alfresco-js-clients.module.ts
index d437f7c3a2..f15d5440fc 100644
--- a/lib/core/api/clients/alfresco-js-clients.module.ts
+++ b/lib/core/api/src/lib/clients/alfresco-js-clients.module.ts
@@ -15,6 +15,7 @@
  * limitations under the License.
  */
 
+import { HttpClientModule, HttpClientXsrfModule } from '@angular/common/http';
 import { NgModule } from '@angular/core';
 import { ApiClientsService } from '../api-clients.service';
 import { ActivitiClientModule } from './activiti/activiti-client.module';
@@ -22,6 +23,11 @@ import { DiscoveryClientModule } from './discovery/discovery-client.module';
 
 @NgModule({
     imports: [
+        HttpClientModule,
+        HttpClientXsrfModule.withOptions({
+            cookieName: 'CSRF-TOKEN',
+            headerName: 'X-CSRF-TOKEN'
+        }),
         ActivitiClientModule,
         DiscoveryClientModule
     ],
diff --git a/lib/core/api/clients/discovery/discovery-client.module.ts b/lib/core/api/src/lib/clients/discovery/discovery-client.module.ts
similarity index 100%
rename from lib/core/api/clients/discovery/discovery-client.module.ts
rename to lib/core/api/src/lib/clients/discovery/discovery-client.module.ts
diff --git a/lib/core/api/clients/discovery/discovery-client.types.ts b/lib/core/api/src/lib/clients/discovery/discovery-client.types.ts
similarity index 100%
rename from lib/core/api/clients/discovery/discovery-client.types.ts
rename to lib/core/api/src/lib/clients/discovery/discovery-client.types.ts
diff --git a/lib/core/api/clients/index.ts b/lib/core/api/src/lib/clients/index.ts
similarity index 99%
rename from lib/core/api/clients/index.ts
rename to lib/core/api/src/lib/clients/index.ts
index 8907f6d663..c645fc8c2e 100644
--- a/lib/core/api/clients/index.ts
+++ b/lib/core/api/src/lib/clients/index.ts
@@ -18,4 +18,3 @@
 export * from './activiti/activiti-client.types';
 export * from './alfresco-js-clients.module';
 export * from './discovery/discovery-client.types';
-
diff --git a/lib/core/api/types.ts b/lib/core/api/src/lib/types.ts
similarity index 100%
rename from lib/core/api/types.ts
rename to lib/core/api/src/lib/types.ts