diff --git a/src/sap.ui.fl/src/sap/ui/fl/apply/_internal/flexState/FlexState.js b/src/sap.ui.fl/src/sap/ui/fl/apply/_internal/flexState/FlexState.js
index c110d81a27ed..3baa98caa5db 100644
--- a/src/sap.ui.fl/src/sap/ui/fl/apply/_internal/flexState/FlexState.js
+++ b/src/sap.ui.fl/src/sap/ui/fl/apply/_internal/flexState/FlexState.js
@@ -18,7 +18,7 @@ sap.ui.define([
 	"sap/ui/fl/apply/_internal/flexState/InitialPrepareFunctions",
 	"sap/ui/fl/apply/_internal/flexState/Loader",
 	"sap/ui/fl/apply/_internal/flexState/ManifestUtils",
-	"sap/ui/fl/write/_internal/FlexInfoSession",
+	"sap/ui/fl/initial/_internal/FlexInfoSession",
 	"sap/ui/fl/LayerUtils",
 	"sap/ui/fl/requireAsync",
 	"sap/ui/fl/Utils"
diff --git a/src/sap.ui.fl/src/sap/ui/fl/write/_internal/FlexInfoSession.js b/src/sap.ui.fl/src/sap/ui/fl/initial/_internal/FlexInfoSession.js
similarity index 100%
rename from src/sap.ui.fl/src/sap/ui/fl/write/_internal/FlexInfoSession.js
rename to src/sap.ui.fl/src/sap/ui/fl/initial/_internal/FlexInfoSession.js
diff --git a/src/sap.ui.fl/src/sap/ui/fl/initial/_internal/Storage.js b/src/sap.ui.fl/src/sap/ui/fl/initial/_internal/Storage.js
index c0215bb10a1c..421b1060699b 100644
--- a/src/sap.ui.fl/src/sap/ui/fl/initial/_internal/Storage.js
+++ b/src/sap.ui.fl/src/sap/ui/fl/initial/_internal/Storage.js
@@ -6,16 +6,16 @@ sap.ui.define([
 	"sap/ui/fl/initial/_internal/StorageUtils",
 	"sap/ui/fl/initial/_internal/StorageResultMerger",
 	"sap/ui/fl/initial/_internal/storageResultDisassemble",
+	"sap/ui/fl/initial/_internal/FlexInfoSession",
 	"sap/ui/fl/write/api/Version",
-	"sap/ui/fl/Utils",
-	"sap/ui/fl/write/_internal/FlexInfoSession"
+	"sap/ui/fl/Utils"
 ], function(
 	StorageUtils,
 	StorageResultMerger,
 	storageResultDisassemble,
+	FlexInfoSession,
 	Version,
-	Utils,
-	FlexInfoSession
+	Utils
 ) {
 	"use strict";
 
diff --git a/src/sap.ui.fl/src/sap/ui/fl/write/_internal/connectors/KeyUserConnector.js b/src/sap.ui.fl/src/sap/ui/fl/write/_internal/connectors/KeyUserConnector.js
index a9d1422403e1..53c274a049ae 100644
--- a/src/sap.ui.fl/src/sap/ui/fl/write/_internal/connectors/KeyUserConnector.js
+++ b/src/sap.ui.fl/src/sap/ui/fl/write/_internal/connectors/KeyUserConnector.js
@@ -10,7 +10,7 @@ sap.ui.define([
 	"sap/ui/fl/initial/_internal/connectors/Utils",
 	"sap/ui/fl/write/_internal/connectors/Utils",
 	"sap/base/util/restricted/_pick",
-	"sap/ui/fl/write/_internal/FlexInfoSession",
+	"sap/ui/fl/initial/_internal/FlexInfoSession",
 	"sap/ui/core/BusyIndicator",
 	"sap/base/Log",
 	"sap/m/MessageBox"
diff --git a/src/sap.ui.fl/src/sap/ui/fl/write/api/ContextBasedAdaptationsAPI.js b/src/sap.ui.fl/src/sap/ui/fl/write/api/ContextBasedAdaptationsAPI.js
index 57c1697b248a..4c7ea3bf9dbc 100644
--- a/src/sap.ui.fl/src/sap/ui/fl/write/api/ContextBasedAdaptationsAPI.js
+++ b/src/sap.ui.fl/src/sap/ui/fl/write/api/ContextBasedAdaptationsAPI.js
@@ -11,7 +11,7 @@ sap.ui.define([
 	"sap/ui/fl/Layer",
 	"sap/ui/fl/LayerUtils",
 	"sap/ui/fl/Utils",
-	"sap/ui/fl/write/_internal/FlexInfoSession",
+	"sap/ui/fl/initial/_internal/FlexInfoSession",
 	"sap/ui/fl/write/_internal/flexState/FlexObjectState",
 	"sap/ui/fl/apply/_internal/flexState/compVariants/CompVariantMerger",
 	"sap/ui/fl/write/_internal/flexState/compVariants/CompVariantState",
diff --git a/src/sap.ui.fl/src/sap/ui/fl/write/api/PersistenceWriteAPI.js b/src/sap.ui.fl/src/sap/ui/fl/write/api/PersistenceWriteAPI.js
index d9ddada966ea..d7c414a3a7a4 100644
--- a/src/sap.ui.fl/src/sap/ui/fl/write/api/PersistenceWriteAPI.js
+++ b/src/sap.ui.fl/src/sap/ui/fl/write/api/PersistenceWriteAPI.js
@@ -15,7 +15,7 @@ sap.ui.define([
 	"sap/ui/fl/write/_internal/flexState/FlexObjectState",
 	"sap/ui/fl/write/_internal/Storage",
 	"sap/ui/fl/write/api/FeaturesAPI",
-	"sap/ui/fl/write/_internal/FlexInfoSession",
+	"sap/ui/fl/initial/_internal/FlexInfoSession",
 	"sap/ui/fl/ChangePersistenceFactory",
 	"sap/ui/fl/FlexControllerFactory",
 	"sap/ui/fl/Layer",
diff --git a/src/sap.ui.fl/src/sap/ui/fl/write/api/ReloadInfoAPI.js b/src/sap.ui.fl/src/sap/ui/fl/write/api/ReloadInfoAPI.js
index 5df25dfa176d..5c6b3dba6e9b 100644
--- a/src/sap.ui.fl/src/sap/ui/fl/write/api/ReloadInfoAPI.js
+++ b/src/sap.ui.fl/src/sap/ui/fl/write/api/ReloadInfoAPI.js
@@ -12,7 +12,7 @@ sap.ui.define([
 	"sap/ui/fl/write/api/FeaturesAPI",
 	"sap/ui/fl/write/api/PersistenceWriteAPI",
 	"sap/ui/fl/write/_internal/flexState/compVariants/CompVariantState",
-	"sap/ui/fl/write/_internal/FlexInfoSession"
+	"sap/ui/fl/initial/_internal/FlexInfoSession"
 ], function(
 	LayerUtils,
 	Layer,
diff --git a/src/sap.ui.fl/test/sap/ui/fl/qunit/write/api/ContextBasedAdaptationsAPI.qunit.js b/src/sap.ui.fl/test/sap/ui/fl/qunit/write/api/ContextBasedAdaptationsAPI.qunit.js
index 15047157c546..99b90001b0ac 100644
--- a/src/sap.ui.fl/test/sap/ui/fl/qunit/write/api/ContextBasedAdaptationsAPI.qunit.js
+++ b/src/sap.ui.fl/test/sap/ui/fl/qunit/write/api/ContextBasedAdaptationsAPI.qunit.js
@@ -9,6 +9,7 @@ sap.ui.define([
 	"sap/ui/fl/apply/_internal/flexState/FlexState",
 	"sap/ui/fl/apply/_internal/flexState/ManifestUtils",
 	"sap/ui/fl/initial/_internal/Storage",
+	"sap/ui/fl/initial/_internal/FlexInfoSession",
 	"sap/ui/fl/ChangePersistenceFactory",
 	"sap/ui/fl/FlexControllerFactory",
 	"sap/ui/fl/Layer",
@@ -17,7 +18,6 @@ sap.ui.define([
 	"sap/ui/fl/Utils",
 	"sap/ui/fl/variants/VariantModel",
 	"sap/ui/fl/write/api/ContextBasedAdaptationsAPI",
-	"sap/ui/fl/write/_internal/FlexInfoSession",
 	"sap/ui/fl/write/api/Version",
 	"sap/ui/fl/write/_internal/flexState/FlexObjectState",
 	"sap/ui/fl/write/_internal/Storage",
@@ -34,6 +34,7 @@ sap.ui.define([
 	FlexState,
 	ManifestUtils,
 	InitialStorage,
+	FlexInfoSession,
 	ChangePersistenceFactory,
 	FlexControllerFactory,
 	Layer,
@@ -42,7 +43,6 @@ sap.ui.define([
 	Utils,
 	VariantModel,
 	ContextBasedAdaptationsAPI,
-	FlexInfoSession,
 	Version,
 	FlexObjectState,
 	Storage,
diff --git a/src/sap.ui.fl/test/sap/ui/fl/qunit/write/api/PersistenceWriteAPI.qunit.js b/src/sap.ui.fl/test/sap/ui/fl/qunit/write/api/PersistenceWriteAPI.qunit.js
index eecbae2f73e0..31a6e190ad2b 100644
--- a/src/sap.ui.fl/test/sap/ui/fl/qunit/write/api/PersistenceWriteAPI.qunit.js
+++ b/src/sap.ui.fl/test/sap/ui/fl/qunit/write/api/PersistenceWriteAPI.qunit.js
@@ -16,7 +16,7 @@ sap.ui.define([
 	"sap/ui/fl/write/_internal/Storage",
 	"sap/ui/fl/write/api/FeaturesAPI",
 	"sap/ui/fl/write/api/PersistenceWriteAPI",
-	"sap/ui/fl/write/_internal/FlexInfoSession",
+	"sap/ui/fl/initial/_internal/FlexInfoSession",
 	"sap/ui/fl/ChangePersistenceFactory",
 	"sap/ui/fl/ChangePersistence",
 	"sap/ui/fl/FlexControllerFactory",
diff --git a/src/sap.ui.fl/test/sap/ui/fl/qunit/write/api/ReloadInfoAPI.qunit.js b/src/sap.ui.fl/test/sap/ui/fl/qunit/write/api/ReloadInfoAPI.qunit.js
index 6306271ee705..af539b6ba730 100644
--- a/src/sap.ui.fl/test/sap/ui/fl/qunit/write/api/ReloadInfoAPI.qunit.js
+++ b/src/sap.ui.fl/test/sap/ui/fl/qunit/write/api/ReloadInfoAPI.qunit.js
@@ -3,9 +3,8 @@
 sap.ui.define([
 	"sap/base/util/UriParameters",
 	"sap/ui/fl/apply/_internal/flexState/ManifestUtils",
+	"sap/ui/fl/initial/_internal/FlexInfoSession",
 	"sap/ui/fl/write/_internal/flexState/compVariants/CompVariantState",
-	"sap/ui/fl/write/_internal/FlexInfoSession",
-	"sap/ui/fl/write/api/ContextBasedAdaptationsAPI",
 	"sap/ui/fl/write/api/FeaturesAPI",
 	"sap/ui/fl/write/api/PersistenceWriteAPI",
 	"sap/ui/fl/write/api/ReloadInfoAPI",
@@ -18,9 +17,8 @@ sap.ui.define([
 ], function(
 	UriParameters,
 	ManifestUtils,
-	CompVariantState,
 	FlexInfoSession,
-	ContextBasedAdaptationsAPI,
+	CompVariantState,
 	FeaturesAPI,
 	PersistenceWriteAPI,
 	ReloadInfoAPI,
diff --git a/src/sap.ui.rta/test/sap/ui/rta/qunit/RuntimeAuthoring-2.qunit.js b/src/sap.ui.rta/test/sap/ui/rta/qunit/RuntimeAuthoring-2.qunit.js
index c73b7b49b5cc..bfcdbf58adad 100644
--- a/src/sap.ui.rta/test/sap/ui/rta/qunit/RuntimeAuthoring-2.qunit.js
+++ b/src/sap.ui.rta/test/sap/ui/rta/qunit/RuntimeAuthoring-2.qunit.js
@@ -19,7 +19,7 @@ sap.ui.define([
 	"sap/ui/fl/write/api/ControlPersonalizationWriteAPI",
 	"sap/ui/fl/write/api/FeaturesAPI",
 	"sap/ui/fl/write/api/TranslationAPI",
-	"sap/ui/fl/write/_internal/FlexInfoSession",
+	"sap/ui/fl/initial/_internal/FlexInfoSession",
 	"sap/ui/fl/Layer",
 	"sap/ui/fl/Utils",
 	"sap/ui/rta/appVariant/AppVariantUtils",