From: Adeel Kazmi <adeel.kazmi@samsung.com>
Date: Tue, 12 Jul 2022 11:33:41 +0000 (+0100)
Subject: Moved Text Controller & Markup Processor to sub-folders
X-Git-Tag: dali_2.1.31~3^2
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=309be8bafca890aea5baad5c46679cf207adb497

Moved Text Controller & Markup Processor to sub-folders

Change-Id: If5a17c1c568584840ec7f07ebe24cd72bc6a0356
---

diff --git a/automated-tests/src/dali-toolkit-internal/dali-toolkit-test-utils/toolkit-text-utils.cpp b/automated-tests/src/dali-toolkit-internal/dali-toolkit-test-utils/toolkit-text-utils.cpp
index 5b8469d..5fc9349 100644
--- a/automated-tests/src/dali-toolkit-internal/dali-toolkit-test-utils/toolkit-text-utils.cpp
+++ b/automated-tests/src/dali-toolkit-internal/dali-toolkit-test-utils/toolkit-text-utils.cpp
@@ -28,11 +28,11 @@
 #include <dali-toolkit/internal/text/hyphenator.h>
 #include <dali-toolkit/internal/text/layouts/layout-engine.h>
 #include <dali-toolkit/internal/text/layouts/layout-parameters.h>
-#include <dali-toolkit/internal/text/markup-processor.h>
+#include <dali-toolkit/internal/text/markup-processor/markup-processor.h>
 #include <dali-toolkit/internal/text/multi-language-support.h>
 #include <dali-toolkit/internal/text/segmentation.h>
 #include <dali-toolkit/internal/text/shaper.h>
-#include <dali-toolkit/internal/text/text-controller-impl.h>
+#include <dali-toolkit/internal/text/controller/text-controller-impl.h>
 
 namespace Dali
 {
diff --git a/automated-tests/src/dali-toolkit-internal/dali-toolkit-test-utils/toolkit-text-utils.h b/automated-tests/src/dali-toolkit-internal/dali-toolkit-test-utils/toolkit-text-utils.h
index 00bf3d5..b064bfa 100644
--- a/automated-tests/src/dali-toolkit-internal/dali-toolkit-test-utils/toolkit-text-utils.h
+++ b/automated-tests/src/dali-toolkit-internal/dali-toolkit-test-utils/toolkit-text-utils.h
@@ -20,7 +20,7 @@
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/internal/text/metrics.h>
-#include <dali-toolkit/internal/text/text-controller.h>
+#include <dali-toolkit/internal/text/controller/text-controller.h>
 #include <dali-toolkit/internal/text/text-model.h>
 
 namespace Dali
diff --git a/automated-tests/src/dali-toolkit-internal/utc-Dali-LineHelperFunctions.cpp b/automated-tests/src/dali-toolkit-internal/utc-Dali-LineHelperFunctions.cpp
index 2930c6d..92113fc 100644
--- a/automated-tests/src/dali-toolkit-internal/utc-Dali-LineHelperFunctions.cpp
+++ b/automated-tests/src/dali-toolkit-internal/utc-Dali-LineHelperFunctions.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,9 +22,9 @@
 #include <dali-toolkit-test-suite-utils.h>
 #include <dali-toolkit/dali-toolkit.h>
 #include <dali-toolkit/internal/text/line-helper-functions.h>
+#include <dali-toolkit/internal/text/controller/text-controller.h>
 #include <dali-toolkit/internal/text/rendering/text-typesetter.h>
 #include <dali-toolkit/internal/text/rendering/view-model.h>
-#include <dali-toolkit/internal/text/text-controller.h>
 #include <toolkit-text-utils.h>
 
 using namespace Dali;
diff --git a/automated-tests/src/dali-toolkit-internal/utc-Dali-Text-Controller.cpp b/automated-tests/src/dali-toolkit-internal/utc-Dali-Text-Controller.cpp
index b079ce3..53b45f2 100755
--- a/automated-tests/src/dali-toolkit-internal/utc-Dali-Text-Controller.cpp
+++ b/automated-tests/src/dali-toolkit-internal/utc-Dali-Text-Controller.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,10 +25,10 @@
 #include <toolkit-text-utils.h>
 #include <dali/devel-api/events/key-event-devel.h>
 #include <dali-toolkit/internal/controls/text-controls/text-field-impl.h>
-#include <dali-toolkit/internal/text/text-controller.h>
+#include <dali-toolkit/internal/text/controller/text-controller.h>
+#include <dali-toolkit/internal/text/controller/text-controller-impl.h>
 #include <dali-toolkit/internal/text/text-control-interface.h>
 #include <dali-toolkit/internal/text/text-editable-control-interface.h>
-#include <dali-toolkit/internal/text/text-controller-impl.h>
 
 using namespace Dali;
 using namespace Toolkit;
diff --git a/automated-tests/src/dali-toolkit-internal/utc-Dali-Text-Ellipsis.cpp b/automated-tests/src/dali-toolkit-internal/utc-Dali-Text-Ellipsis.cpp
index 75d8bb4..a0a27c9 100755
--- a/automated-tests/src/dali-toolkit-internal/utc-Dali-Text-Ellipsis.cpp
+++ b/automated-tests/src/dali-toolkit-internal/utc-Dali-Text-Ellipsis.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,7 +25,7 @@
 #include <dali-toolkit/internal/text/font-description-run.h>
 #include <dali-toolkit/internal/text/rendering/text-typesetter.h>
 #include <dali-toolkit/internal/text/rendering/view-model.h>
-#include <dali-toolkit/internal/text/text-controller.h>
+#include <dali-toolkit/internal/text/controller/text-controller.h>
 #include <dali-toolkit/internal/text/text-view.h>
 
 
diff --git a/automated-tests/src/dali-toolkit-internal/utc-Dali-Text-Markup.cpp b/automated-tests/src/dali-toolkit-internal/utc-Dali-Text-Markup.cpp
index 36117f7..3efd9aa 100644
--- a/automated-tests/src/dali-toolkit-internal/utc-Dali-Text-Markup.cpp
+++ b/automated-tests/src/dali-toolkit-internal/utc-Dali-Text-Markup.cpp
@@ -24,8 +24,8 @@
 #include <dali-toolkit/dali-toolkit.h>
 #include <dali-toolkit/internal/text/color-run.h>
 #include <dali-toolkit/internal/text/font-description-run.h>
-#include <dali-toolkit/internal/text/markup-processor-helper-functions.h>
-#include <dali-toolkit/internal/text/markup-processor.h>
+#include <dali-toolkit/internal/text/markup-processor/markup-processor-helper-functions.h>
+#include <dali-toolkit/internal/text/markup-processor/markup-processor.h>
 #include <dali-toolkit/internal/text/text-definitions.h>
 #include <dali-toolkit/internal/text/text-io.h>
 #include <toolkit-text-utils.h>
diff --git a/automated-tests/src/dali-toolkit-internal/utc-Dali-Text-Typesetter.cpp b/automated-tests/src/dali-toolkit-internal/utc-Dali-Text-Typesetter.cpp
index 462a883..c64458a 100644
--- a/automated-tests/src/dali-toolkit-internal/utc-Dali-Text-Typesetter.cpp
+++ b/automated-tests/src/dali-toolkit-internal/utc-Dali-Text-Typesetter.cpp
@@ -25,9 +25,9 @@
 #include <dali-toolkit/dali-toolkit.h>
 #include <dali-toolkit/devel-api/text/bitmap-font.h>
 #include <dali-toolkit/devel-api/text/text-enumerations-devel.h>
+#include <dali-toolkit/internal/text/controller/text-controller.h>
 #include <dali-toolkit/internal/text/rendering/text-typesetter.h>
 #include <dali-toolkit/internal/text/rendering/view-model.h>
-#include <dali-toolkit/internal/text/text-controller.h>
 #include <dali/devel-api/text-abstraction/bitmap-font.h>
 #include <toolkit-environment-variable.h>
 #include <toolkit-text-utils.h>
diff --git a/automated-tests/src/dali-toolkit-internal/utc-Dali-Text-ViewModel.cpp b/automated-tests/src/dali-toolkit-internal/utc-Dali-Text-ViewModel.cpp
index a3ad901..daabc0b 100755
--- a/automated-tests/src/dali-toolkit-internal/utc-Dali-Text-ViewModel.cpp
+++ b/automated-tests/src/dali-toolkit-internal/utc-Dali-Text-ViewModel.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,9 +23,9 @@
 #include <dali-toolkit/dali-toolkit.h>
 #include <toolkit-text-utils.h>
 #include <dali-toolkit/internal/text/font-description-run.h>
+#include <dali-toolkit/internal/text/controller/text-controller.h>
 #include <dali-toolkit/internal/text/rendering/text-typesetter.h>
 #include <dali-toolkit/internal/text/rendering/view-model.h>
-#include <dali-toolkit/internal/text/text-controller.h>
 
 using namespace Dali;
 using namespace Toolkit;
diff --git a/automated-tests/src/dali-toolkit-internal/utc-Dali-TextEditor-internal.cpp b/automated-tests/src/dali-toolkit-internal/utc-Dali-TextEditor-internal.cpp
index f768255..16dfc51 100644
--- a/automated-tests/src/dali-toolkit-internal/utc-Dali-TextEditor-internal.cpp
+++ b/automated-tests/src/dali-toolkit-internal/utc-Dali-TextEditor-internal.cpp
@@ -23,8 +23,8 @@
 
 #include <dali-toolkit/internal/controls/text-controls/text-editor-impl.h>
 #include <dali-toolkit/internal/text/rendering/atlas/atlas-glyph-manager.h>
-#include <dali-toolkit/internal/text/text-controller-impl.h>
-#include <dali-toolkit/internal/text/text-controller.h>
+#include <dali-toolkit/internal/text/controller/text-controller.h>
+#include <dali-toolkit/internal/text/controller/text-controller-impl.h>
 
 using namespace Dali;
 using namespace Toolkit;
@@ -1441,4 +1441,4 @@ int UtcDaliTextEditorMarkupSpanCharacterSpacing(void)
   }
 
   END_TEST;
-}
\ No newline at end of file
+}
diff --git a/automated-tests/src/dali-toolkit-internal/utc-Dali-TextField-internal.cpp b/automated-tests/src/dali-toolkit-internal/utc-Dali-TextField-internal.cpp
index da3ffc3..06eefbc 100644
--- a/automated-tests/src/dali-toolkit-internal/utc-Dali-TextField-internal.cpp
+++ b/automated-tests/src/dali-toolkit-internal/utc-Dali-TextField-internal.cpp
@@ -22,9 +22,9 @@
 #include <dali-toolkit/dali-toolkit.h>
 
 #include <dali-toolkit/internal/controls/text-controls/text-field-impl.h>
+#include <dali-toolkit/internal/text/controller/text-controller.h>
+#include <dali-toolkit/internal/text/controller/text-controller-impl.h>
 #include <dali-toolkit/internal/text/rendering/atlas/atlas-glyph-manager.h>
-#include <dali-toolkit/internal/text/text-controller-impl.h>
-#include <dali-toolkit/internal/text/text-controller.h>
 
 using namespace Dali;
 using namespace Toolkit;
@@ -1350,4 +1350,4 @@ int UtcDaliTextFieldMarkupSpanCharacterSpacing(void)
   }
 
   END_TEST;
-}
\ No newline at end of file
+}
diff --git a/automated-tests/src/dali-toolkit-internal/utc-Dali-TextLabel-internal.cpp b/automated-tests/src/dali-toolkit-internal/utc-Dali-TextLabel-internal.cpp
index d9a3c04..4f15239 100644
--- a/automated-tests/src/dali-toolkit-internal/utc-Dali-TextLabel-internal.cpp
+++ b/automated-tests/src/dali-toolkit-internal/utc-Dali-TextLabel-internal.cpp
@@ -22,10 +22,10 @@
 #include <dali-toolkit/dali-toolkit.h>
 
 #include <dali-toolkit/internal/controls/text-controls/text-label-impl.h>
+#include <dali-toolkit/internal/text/controller/text-controller-impl.h>
+#include <dali-toolkit/internal/text/controller/text-controller.h>
 #include <dali-toolkit/internal/text/rendering/text-typesetter.h>
 #include <dali-toolkit/internal/text/rendering/view-model.h>
-#include <dali-toolkit/internal/text/text-controller-impl.h>
-#include <dali-toolkit/internal/text/text-controller.h>
 
 using namespace Dali;
 using namespace Toolkit;
@@ -1337,4 +1337,4 @@ int UtcDaliTextLabelMarkupSpanCharacterSpacing(void)
   }
 
   END_TEST;
-}
\ No newline at end of file
+}
diff --git a/dali-toolkit/devel-api/text/text-utils-devel.cpp b/dali-toolkit/devel-api/text/text-utils-devel.cpp
index d1d6900..401b82f 100644
--- a/dali-toolkit/devel-api/text/text-utils-devel.cpp
+++ b/dali-toolkit/devel-api/text/text-utils-devel.cpp
@@ -34,7 +34,7 @@
 #include <dali-toolkit/internal/text/glyph-metrics-helper.h>
 #include <dali-toolkit/internal/text/layouts/layout-engine.h>
 #include <dali-toolkit/internal/text/layouts/layout-parameters.h>
-#include <dali-toolkit/internal/text/markup-processor.h>
+#include <dali-toolkit/internal/text/markup-processor/markup-processor.h>
 #include <dali-toolkit/internal/text/multi-language-support.h>
 #include <dali-toolkit/internal/text/rendering/styles/character-spacing-helper-functions.h>
 #include <dali-toolkit/internal/text/segmentation.h>
diff --git a/dali-toolkit/internal/controls/text-controls/common-text-utils.h b/dali-toolkit/internal/controls/text-controls/common-text-utils.h
index a0d0ad4..a21dc86 100644
--- a/dali-toolkit/internal/controls/text-controls/common-text-utils.h
+++ b/dali-toolkit/internal/controls/text-controls/common-text-utils.h
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_INTERNAL_TEXT_CONTROLS_COMMON_TEXT_UTILS_H
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -29,7 +29,7 @@
 #include <dali-toolkit/devel-api/controls/text-controls/text-anchor-devel.h>
 #include <dali-toolkit/internal/text/decorator/text-decorator.h>
 #include <dali-toolkit/internal/text/rendering/text-renderer.h>
-#include <dali-toolkit/internal/text/text-controller.h>
+#include <dali-toolkit/internal/text/controller/text-controller.h>
 #include <dali-toolkit/public-api/controls/control.h>
 #include <dali-toolkit/public-api/controls/text-controls/text-editor.h>
 
diff --git a/dali-toolkit/internal/controls/text-controls/text-editor-impl.h b/dali-toolkit/internal/controls/text-controls/text-editor-impl.h
index c62988a..aaa58f7 100644
--- a/dali-toolkit/internal/controls/text-controls/text-editor-impl.h
+++ b/dali-toolkit/internal/controls/text-controls/text-editor-impl.h
@@ -37,7 +37,7 @@
 #include <dali-toolkit/internal/text/rendering/text-renderer.h>
 #include <dali-toolkit/internal/text/text-anchor-control-interface.h>
 #include <dali-toolkit/internal/text/text-control-interface.h>
-#include <dali-toolkit/internal/text/text-controller.h>
+#include <dali-toolkit/internal/text/controller/text-controller.h>
 #include <dali-toolkit/internal/text/text-editable-control-interface.h>
 #include <dali-toolkit/internal/text/text-selectable-control-interface.h>
 #include <dali-toolkit/internal/text/text-vertical-scroller.h>
diff --git a/dali-toolkit/internal/controls/text-controls/text-editor-property-handler.cpp b/dali-toolkit/internal/controls/text-controls/text-editor-property-handler.cpp
index 403f777..067023a 100644
--- a/dali-toolkit/internal/controls/text-controls/text-editor-property-handler.cpp
+++ b/dali-toolkit/internal/controls/text-controls/text-editor-property-handler.cpp
@@ -20,7 +20,7 @@
 #include <dali-toolkit/devel-api/focus-manager/keyinput-focus-manager.h>
 
 #include <dali-toolkit/internal/text/decorator/text-decorator.h>
-#include <dali-toolkit/internal/text/text-controller.h>
+#include <dali-toolkit/internal/text/controller/text-controller.h>
 #include <dali-toolkit/internal/text/text-effects-style.h>
 #include <dali-toolkit/internal/text/text-enumerations-impl.h>
 #include <dali-toolkit/internal/text/text-font-style.h>
diff --git a/dali-toolkit/internal/controls/text-controls/text-field-impl.h b/dali-toolkit/internal/controls/text-controls/text-field-impl.h
index 6c4faa6..bed947d 100644
--- a/dali-toolkit/internal/controls/text-controls/text-field-impl.h
+++ b/dali-toolkit/internal/controls/text-controls/text-field-impl.h
@@ -34,7 +34,7 @@
 #include <dali-toolkit/internal/text/rendering/text-renderer.h>
 #include <dali-toolkit/internal/text/text-anchor-control-interface.h>
 #include <dali-toolkit/internal/text/text-control-interface.h>
-#include <dali-toolkit/internal/text/text-controller.h>
+#include <dali-toolkit/internal/text/controller/text-controller.h>
 #include <dali-toolkit/internal/text/text-editable-control-interface.h>
 #include <dali-toolkit/internal/text/text-selectable-control-interface.h>
 #include <dali-toolkit/public-api/controls/control-impl.h>
diff --git a/dali-toolkit/internal/controls/text-controls/text-field-property-handler.cpp b/dali-toolkit/internal/controls/text-controls/text-field-property-handler.cpp
index f1247f9..45af9b7 100644
--- a/dali-toolkit/internal/controls/text-controls/text-field-property-handler.cpp
+++ b/dali-toolkit/internal/controls/text-controls/text-field-property-handler.cpp
@@ -21,7 +21,7 @@
 #include <dali-toolkit/devel-api/text/rendering-backend.h>
 
 #include <dali-toolkit/internal/text/decorator/text-decorator.h>
-#include <dali-toolkit/internal/text/text-controller.h>
+#include <dali-toolkit/internal/text/controller/text-controller.h>
 #include <dali-toolkit/internal/text/text-effects-style.h>
 #include <dali-toolkit/internal/text/text-enumerations-impl.h>
 #include <dali-toolkit/internal/text/text-font-style.h>
diff --git a/dali-toolkit/internal/controls/text-controls/text-label-impl.h b/dali-toolkit/internal/controls/text-controls/text-label-impl.h
index 49f9197..f4dac1d 100644
--- a/dali-toolkit/internal/controls/text-controls/text-label-impl.h
+++ b/dali-toolkit/internal/controls/text-controls/text-label-impl.h
@@ -29,7 +29,7 @@
 #include <dali-toolkit/internal/text/rendering/text-renderer.h>
 #include <dali-toolkit/internal/text/text-anchor-control-interface.h>
 #include <dali-toolkit/internal/text/text-control-interface.h>
-#include <dali-toolkit/internal/text/text-controller.h>
+#include <dali-toolkit/internal/text/controller/text-controller.h>
 #include <dali-toolkit/internal/text/text-scroller-interface.h>
 #include <dali-toolkit/internal/text/text-scroller.h>
 #include <dali-toolkit/internal/visuals/text/text-visual.h>
diff --git a/dali-toolkit/internal/file.list b/dali-toolkit/internal/file.list
index 6edbd75..2d71f4b 100644
--- a/dali-toolkit/internal/file.list
+++ b/dali-toolkit/internal/file.list
@@ -150,19 +150,6 @@ SET( toolkit_src_files
    ${toolkit_src_dir}/text/cursor-helper-functions.cpp
    ${toolkit_src_dir}/text/glyph-metrics-helper.cpp
    ${toolkit_src_dir}/text/logical-model-impl.cpp
-   ${toolkit_src_dir}/text/markup-processor.cpp
-   ${toolkit_src_dir}/text/markup-processor-color.cpp
-   ${toolkit_src_dir}/text/markup-processor-embedded-item.cpp
-   ${toolkit_src_dir}/text/markup-processor-anchor.cpp
-   ${toolkit_src_dir}/text/markup-processor-font.cpp
-   ${toolkit_src_dir}/text/markup-processor-background.cpp
-   ${toolkit_src_dir}/text/markup-processor-paragraph.cpp
-   ${toolkit_src_dir}/text/markup-processor-span.cpp
-   ${toolkit_src_dir}/text/markup-processor-strikethrough.cpp
-   ${toolkit_src_dir}/text/markup-processor-underline.cpp
-   ${toolkit_src_dir}/text/markup-processor-character-spacing.cpp
-   ${toolkit_src_dir}/text/markup-processor-helper-functions.cpp
-   ${toolkit_src_dir}/text/markup-processor-attribute-helper-functions.cpp
    ${toolkit_src_dir}/text/multi-language-support.cpp
    ${toolkit_src_dir}/text/hidden-text.cpp
    ${toolkit_src_dir}/text/input-filter.cpp
@@ -172,18 +159,6 @@ SET( toolkit_src_files
    ${toolkit_src_dir}/text/shaper.cpp
    ${toolkit_src_dir}/text/hyphenator.cpp
    ${toolkit_src_dir}/text/text-enumerations-impl.cpp
-   ${toolkit_src_dir}/text/text-controller.cpp
-   ${toolkit_src_dir}/text/text-controller-background-actor.cpp
-   ${toolkit_src_dir}/text/text-controller-event-handler.cpp
-   ${toolkit_src_dir}/text/text-controller-impl.cpp
-   ${toolkit_src_dir}/text/text-controller-impl-data-clearer.cpp
-   ${toolkit_src_dir}/text/text-controller-impl-event-handler.cpp
-   ${toolkit_src_dir}/text/text-controller-impl-model-updater.cpp
-   ${toolkit_src_dir}/text/text-controller-input-font-handler.cpp
-   ${toolkit_src_dir}/text/text-controller-input-properties.cpp
-   ${toolkit_src_dir}/text/text-controller-placeholder-handler.cpp
-   ${toolkit_src_dir}/text/text-controller-relayouter.cpp
-   ${toolkit_src_dir}/text/text-controller-text-updater.cpp
    ${toolkit_src_dir}/text/text-effects-style.cpp
    ${toolkit_src_dir}/text/text-font-style.cpp
    ${toolkit_src_dir}/text/text-io.cpp
@@ -195,8 +170,33 @@ SET( toolkit_src_files
    ${toolkit_src_dir}/text/text-view-interface.cpp
    ${toolkit_src_dir}/text/visual-model-impl.cpp
    ${toolkit_src_dir}/text/decorator/text-decorator.cpp
+   ${toolkit_src_dir}/text/controller/text-controller.cpp
+   ${toolkit_src_dir}/text/controller/text-controller-background-actor.cpp
+   ${toolkit_src_dir}/text/controller/text-controller-event-handler.cpp
+   ${toolkit_src_dir}/text/controller/text-controller-impl.cpp
+   ${toolkit_src_dir}/text/controller/text-controller-impl-data-clearer.cpp
+   ${toolkit_src_dir}/text/controller/text-controller-impl-event-handler.cpp
+   ${toolkit_src_dir}/text/controller/text-controller-impl-model-updater.cpp
+   ${toolkit_src_dir}/text/controller/text-controller-input-font-handler.cpp
+   ${toolkit_src_dir}/text/controller/text-controller-input-properties.cpp
+   ${toolkit_src_dir}/text/controller/text-controller-placeholder-handler.cpp
+   ${toolkit_src_dir}/text/controller/text-controller-relayouter.cpp
+   ${toolkit_src_dir}/text/controller/text-controller-text-updater.cpp
    ${toolkit_src_dir}/text/layouts/layout-engine-helper-functions.cpp
    ${toolkit_src_dir}/text/layouts/layout-engine.cpp
+   ${toolkit_src_dir}/text/markup-processor/markup-processor.cpp
+   ${toolkit_src_dir}/text/markup-processor/markup-processor-color.cpp
+   ${toolkit_src_dir}/text/markup-processor/markup-processor-embedded-item.cpp
+   ${toolkit_src_dir}/text/markup-processor/markup-processor-anchor.cpp
+   ${toolkit_src_dir}/text/markup-processor/markup-processor-font.cpp
+   ${toolkit_src_dir}/text/markup-processor/markup-processor-background.cpp
+   ${toolkit_src_dir}/text/markup-processor/markup-processor-paragraph.cpp
+   ${toolkit_src_dir}/text/markup-processor/markup-processor-span.cpp
+   ${toolkit_src_dir}/text/markup-processor/markup-processor-strikethrough.cpp
+   ${toolkit_src_dir}/text/markup-processor/markup-processor-underline.cpp
+   ${toolkit_src_dir}/text/markup-processor/markup-processor-character-spacing.cpp
+   ${toolkit_src_dir}/text/markup-processor/markup-processor-helper-functions.cpp
+   ${toolkit_src_dir}/text/markup-processor/markup-processor-attribute-helper-functions.cpp
    ${toolkit_src_dir}/text/multi-language-helper-functions.cpp
    ${toolkit_src_dir}/text/multi-language-support-impl.cpp
    ${toolkit_src_dir}/text/rendering/text-backend.cpp
diff --git a/dali-toolkit/internal/text/text-controller-background-actor.cpp b/dali-toolkit/internal/text/controller/text-controller-background-actor.cpp
similarity index 99%
rename from dali-toolkit/internal/text/text-controller-background-actor.cpp
rename to dali-toolkit/internal/text/controller/text-controller-background-actor.cpp
index bc7c79b..666d794 100644
--- a/dali-toolkit/internal/text/text-controller-background-actor.cpp
+++ b/dali-toolkit/internal/text/controller/text-controller-background-actor.cpp
@@ -16,7 +16,7 @@
  */
 
 // HEADER
-#include <dali-toolkit/internal/text/text-controller-background-actor.h>
+#include <dali-toolkit/internal/text/controller/text-controller-background-actor.h>
 
 // EXTERNAL INCLUDES
 #include <dali/public-api/rendering/renderer.h>
diff --git a/dali-toolkit/internal/text/text-controller-background-actor.h b/dali-toolkit/internal/text/controller/text-controller-background-actor.h
similarity index 100%
rename from dali-toolkit/internal/text/text-controller-background-actor.h
rename to dali-toolkit/internal/text/controller/text-controller-background-actor.h
diff --git a/dali-toolkit/internal/text/text-controller-event-handler.cpp b/dali-toolkit/internal/text/controller/text-controller-event-handler.cpp
similarity index 98%
rename from dali-toolkit/internal/text/text-controller-event-handler.cpp
rename to dali-toolkit/internal/text/controller/text-controller-event-handler.cpp
index 59f0b8d..e351342 100644
--- a/dali-toolkit/internal/text/text-controller-event-handler.cpp
+++ b/dali-toolkit/internal/text/controller/text-controller-event-handler.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@
  */
 
 // CLASS HEADER
-#include <dali-toolkit/internal/text/text-controller-event-handler.h>
+#include <dali-toolkit/internal/text/controller/text-controller-event-handler.h>
 
 // EXTERNAL INCLUDES
 #include <dali/devel-api/adaptor-framework/clipboard-event-notifier.h>
@@ -25,9 +25,9 @@
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/internal/text/cursor-helper-functions.h>
-#include <dali-toolkit/internal/text/text-controller-impl.h>
-#include <dali-toolkit/internal/text/text-controller-placeholder-handler.h>
-#include <dali-toolkit/internal/text/text-controller-text-updater.h>
+#include <dali-toolkit/internal/text/controller/text-controller-impl.h>
+#include <dali-toolkit/internal/text/controller/text-controller-placeholder-handler.h>
+#include <dali-toolkit/internal/text/controller/text-controller-text-updater.h>
 #include <dali-toolkit/internal/text/text-editable-control-interface.h>
 
 namespace
diff --git a/dali-toolkit/internal/text/text-controller-event-handler.h b/dali-toolkit/internal/text/controller/text-controller-event-handler.h
similarity index 97%
rename from dali-toolkit/internal/text/text-controller-event-handler.h
rename to dali-toolkit/internal/text/controller/text-controller-event-handler.h
index 0028890..3be57c2 100644
--- a/dali-toolkit/internal/text/text-controller-event-handler.h
+++ b/dali-toolkit/internal/text/controller/text-controller-event-handler.h
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_TEXT_CONTROLLER_EVENT_HANDLER_H
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,8 +26,8 @@
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/devel-api/controls/text-controls/text-selection-popup.h>
+#include <dali-toolkit/internal/text/controller/text-controller.h>
 #include <dali-toolkit/internal/text/decorator/text-decorator.h>
-#include <dali-toolkit/internal/text/text-controller.h>
 
 namespace Dali
 {
diff --git a/dali-toolkit/internal/text/text-controller-impl-data-clearer.cpp b/dali-toolkit/internal/text/controller/text-controller-impl-data-clearer.cpp
similarity index 98%
rename from dali-toolkit/internal/text/text-controller-impl-data-clearer.cpp
rename to dali-toolkit/internal/text/controller/text-controller-impl-data-clearer.cpp
index 87099da..3822fb3 100644
--- a/dali-toolkit/internal/text/text-controller-impl-data-clearer.cpp
+++ b/dali-toolkit/internal/text/controller/text-controller-impl-data-clearer.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,10 +16,10 @@
  */
 
 // CLASS HEADER
-#include <dali-toolkit/internal/text/text-controller-impl-data-clearer.h>
+#include <dali-toolkit/internal/text/controller/text-controller-impl-data-clearer.h>
 
 // INTERNAL INCLUDES
-#include <dali-toolkit/internal/text/text-controller-impl.h>
+#include <dali-toolkit/internal/text/controller/text-controller-impl.h>
 #include <dali-toolkit/internal/text/text-run-container.h>
 
 namespace Dali::Toolkit::Text
diff --git a/dali-toolkit/internal/text/text-controller-impl-data-clearer.h b/dali-toolkit/internal/text/controller/text-controller-impl-data-clearer.h
similarity index 96%
rename from dali-toolkit/internal/text/text-controller-impl-data-clearer.h
rename to dali-toolkit/internal/text/controller/text-controller-impl-data-clearer.h
index 87d6e24..878b285 100644
--- a/dali-toolkit/internal/text/text-controller-impl-data-clearer.h
+++ b/dali-toolkit/internal/text/controller/text-controller-impl-data-clearer.h
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_TEXT_CONTROLLER_IMPL_DATA_CLEARER_H
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@
  */
 
 // INTERNAL INCLUDES
-#include <dali-toolkit/internal/text/text-controller.h>
+#include <dali-toolkit/internal/text/controller/text-controller.h>
 
 namespace Dali::Toolkit::Text
 {
diff --git a/dali-toolkit/internal/text/text-controller-impl-event-handler.cpp b/dali-toolkit/internal/text/controller/text-controller-impl-event-handler.cpp
similarity index 99%
rename from dali-toolkit/internal/text/text-controller-impl-event-handler.cpp
rename to dali-toolkit/internal/text/controller/text-controller-impl-event-handler.cpp
index 1ed8c7f..9dcf07a 100644
--- a/dali-toolkit/internal/text/text-controller-impl-event-handler.cpp
+++ b/dali-toolkit/internal/text/controller/text-controller-impl-event-handler.cpp
@@ -16,7 +16,7 @@
  */
 
 // CLASS HEADER
-#include <dali-toolkit/internal/text/text-controller-impl-event-handler.h>
+#include <dali-toolkit/internal/text/controller/text-controller-impl-event-handler.h>
 
 // EXTERNAL INCLUDES
 #include <dali/integration-api/debug.h>
diff --git a/dali-toolkit/internal/text/text-controller-impl-event-handler.h b/dali-toolkit/internal/text/controller/text-controller-impl-event-handler.h
similarity index 97%
rename from dali-toolkit/internal/text/text-controller-impl-event-handler.h
rename to dali-toolkit/internal/text/controller/text-controller-impl-event-handler.h
index 82e5c78..ca93586 100644
--- a/dali-toolkit/internal/text/text-controller-impl-event-handler.h
+++ b/dali-toolkit/internal/text/controller/text-controller-impl-event-handler.h
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_TEXT_CONTROLLER_IMPL_EVENT_HANDLER_H
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@
  */
 
 // INTERNAL INCLUDES
-#include <dali-toolkit/internal/text/text-controller-impl.h>
+#include <dali-toolkit/internal/text/controller/text-controller-impl.h>
 
 namespace Dali
 {
diff --git a/dali-toolkit/internal/text/text-controller-impl-model-updater.cpp b/dali-toolkit/internal/text/controller/text-controller-impl-model-updater.cpp
similarity index 99%
rename from dali-toolkit/internal/text/text-controller-impl-model-updater.cpp
rename to dali-toolkit/internal/text/controller/text-controller-impl-model-updater.cpp
index de18e85..8b6b639 100644
--- a/dali-toolkit/internal/text/text-controller-impl-model-updater.cpp
+++ b/dali-toolkit/internal/text/controller/text-controller-impl-model-updater.cpp
@@ -16,7 +16,7 @@
  */
 
 // CLASS HEADER
-#include <dali-toolkit/internal/text/text-controller-impl-model-updater.h>
+#include <dali-toolkit/internal/text/controller/text-controller-impl-model-updater.h>
 
 // EXTERNAL INCLUDES
 #include <dali/integration-api/debug.h>
diff --git a/dali-toolkit/internal/text/text-controller-impl-model-updater.h b/dali-toolkit/internal/text/controller/text-controller-impl-model-updater.h
similarity index 91%
rename from dali-toolkit/internal/text/text-controller-impl-model-updater.h
rename to dali-toolkit/internal/text/controller/text-controller-impl-model-updater.h
index 2c5dd8c..928d8c5 100644
--- a/dali-toolkit/internal/text/text-controller-impl-model-updater.h
+++ b/dali-toolkit/internal/text/controller/text-controller-impl-model-updater.h
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_TEXT_CONTROLLER_IMPL_MODEL_UPDATER_H
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@
  */
 
 // INTERNAL INCLUDES
-#include <dali-toolkit/internal/text/text-controller-impl.h>
+#include <dali-toolkit/internal/text/controller/text-controller-impl.h>
 
 namespace Dali::Toolkit::Text
 {
diff --git a/dali-toolkit/internal/text/text-controller-impl.cpp b/dali-toolkit/internal/text/controller/text-controller-impl.cpp
similarity index 99%
rename from dali-toolkit/internal/text/text-controller-impl.cpp
rename to dali-toolkit/internal/text/controller/text-controller-impl.cpp
index 7fac661..e5086d6 100644
--- a/dali-toolkit/internal/text/text-controller-impl.cpp
+++ b/dali-toolkit/internal/text/controller/text-controller-impl.cpp
@@ -16,7 +16,7 @@
  */
 
 // CLASS HEADER
-#include <dali-toolkit/internal/text/text-controller-impl.h>
+#include <dali-toolkit/internal/text/controller/text-controller-impl.h>
 
 // EXTERNAL INCLUDES
 #include <dali/devel-api/adaptor-framework/window-devel.h>
@@ -30,11 +30,11 @@
 #include <dali-toolkit/internal/text/cursor-helper-functions.h>
 #include <dali-toolkit/internal/text/glyph-metrics-helper.h>
 #include <dali-toolkit/internal/text/text-control-interface.h>
-#include <dali-toolkit/internal/text/text-controller-impl-data-clearer.h>
-#include <dali-toolkit/internal/text/text-controller-impl-event-handler.h>
-#include <dali-toolkit/internal/text/text-controller-impl-model-updater.h>
-#include <dali-toolkit/internal/text/text-controller-placeholder-handler.h>
-#include <dali-toolkit/internal/text/text-controller-relayouter.h>
+#include <dali-toolkit/internal/text/controller/text-controller-impl-data-clearer.h>
+#include <dali-toolkit/internal/text/controller/text-controller-impl-event-handler.h>
+#include <dali-toolkit/internal/text/controller/text-controller-impl-model-updater.h>
+#include <dali-toolkit/internal/text/controller/text-controller-placeholder-handler.h>
+#include <dali-toolkit/internal/text/controller/text-controller-relayouter.h>
 #include <dali-toolkit/internal/text/text-editable-control-interface.h>
 #include <dali-toolkit/internal/text/text-enumerations-impl.h>
 #include <dali-toolkit/internal/text/text-run-container.h>
diff --git a/dali-toolkit/internal/text/text-controller-impl.h b/dali-toolkit/internal/text/controller/text-controller-impl.h
similarity index 99%
rename from dali-toolkit/internal/text/text-controller-impl.h
rename to dali-toolkit/internal/text/controller/text-controller-impl.h
index 23b020c..faa8772 100644
--- a/dali-toolkit/internal/text/text-controller-impl.h
+++ b/dali-toolkit/internal/text/controller/text-controller-impl.h
@@ -26,7 +26,7 @@
 // INTERNAL INCLUDES
 #include <dali-toolkit/devel-api/styling/style-manager-devel.h>
 #include <dali-toolkit/internal/text/input-style.h>
-#include <dali-toolkit/internal/text/text-controller.h>
+#include <dali-toolkit/internal/text/controller/text-controller.h>
 #include <dali-toolkit/internal/text/text-model.h>
 #include <dali-toolkit/internal/text/text-view.h>
 #include <dali-toolkit/public-api/styling/style-manager.h>
diff --git a/dali-toolkit/internal/text/text-controller-input-font-handler.cpp b/dali-toolkit/internal/text/controller/text-controller-input-font-handler.cpp
similarity index 99%
rename from dali-toolkit/internal/text/text-controller-input-font-handler.cpp
rename to dali-toolkit/internal/text/controller/text-controller-input-font-handler.cpp
index 988ddd1..a1e6214 100644
--- a/dali-toolkit/internal/text/text-controller-input-font-handler.cpp
+++ b/dali-toolkit/internal/text/controller/text-controller-input-font-handler.cpp
@@ -16,13 +16,13 @@
  */
 
 // CLASS HEADER
-#include <dali-toolkit/internal/text/text-controller-input-font-handler.h>
+#include <dali-toolkit/internal/text/controller/text-controller-input-font-handler.h>
 
 // EXTERNAL INCLUDES
 #include <memory.h>
 
 // INTERNAL INCLUDES
-#include <dali-toolkit/internal/text/text-controller-impl.h>
+#include <dali-toolkit/internal/text/controller/text-controller-impl.h>
 
 namespace Dali
 {
diff --git a/dali-toolkit/internal/text/text-controller-input-font-handler.h b/dali-toolkit/internal/text/controller/text-controller-input-font-handler.h
similarity index 94%
rename from dali-toolkit/internal/text/text-controller-input-font-handler.h
rename to dali-toolkit/internal/text/controller/text-controller-input-font-handler.h
index f76bc41..2ac7464 100644
--- a/dali-toolkit/internal/text/text-controller-input-font-handler.h
+++ b/dali-toolkit/internal/text/controller/text-controller-input-font-handler.h
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_TEXT_CONTROLLER_INPUT_FONT_HANDLER_H
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,7 +22,7 @@
 #include <string>
 
 // INTERNAL INCLUDES
-#include <dali-toolkit/internal/text/text-controller.h>
+#include <dali-toolkit/internal/text/controller/text-controller.h>
 #include <dali-toolkit/internal/text/text-definitions.h>
 
 namespace Dali
diff --git a/dali-toolkit/internal/text/text-controller-input-properties.cpp b/dali-toolkit/internal/text/controller/text-controller-input-properties.cpp
similarity index 91%
rename from dali-toolkit/internal/text/text-controller-input-properties.cpp
rename to dali-toolkit/internal/text/controller/text-controller-input-properties.cpp
index 99ef15a..f410187 100644
--- a/dali-toolkit/internal/text/text-controller-input-properties.cpp
+++ b/dali-toolkit/internal/text/controller/text-controller-input-properties.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@
  */
 
 // CLASS HEADER
-#include <dali-toolkit/internal/text/text-controller-input-properties.h>
+#include <dali-toolkit/internal/text/controller/text-controller-input-properties.h>
 
 // EXTERNAL INCLUDES
 //#include <dali-toolkit/devel-api/controls/control-depth-index-ranges.h>
@@ -28,12 +28,12 @@
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/devel-api/text/text-enumerations-devel.h>
-#include <dali-toolkit/internal/text/text-controller-event-handler.h>
-#include <dali-toolkit/internal/text/text-controller-impl.h>
-#include <dali-toolkit/internal/text/text-controller-input-font-handler.h>
-#include <dali-toolkit/internal/text/text-controller-placeholder-handler.h>
-#include <dali-toolkit/internal/text/text-controller-relayouter.h>
-#include <dali-toolkit/internal/text/text-controller-text-updater.h>
+#include <dali-toolkit/internal/text/controller/text-controller-event-handler.h>
+#include <dali-toolkit/internal/text/controller/text-controller-impl.h>
+#include <dali-toolkit/internal/text/controller/text-controller-input-font-handler.h>
+#include <dali-toolkit/internal/text/controller/text-controller-placeholder-handler.h>
+#include <dali-toolkit/internal/text/controller/text-controller-relayouter.h>
+#include <dali-toolkit/internal/text/controller/text-controller-text-updater.h>
 #include <dali-toolkit/internal/text/text-editable-control-interface.h>
 
 namespace
diff --git a/dali-toolkit/internal/text/text-controller-input-properties.h b/dali-toolkit/internal/text/controller/text-controller-input-properties.h
similarity index 71%
rename from dali-toolkit/internal/text/text-controller-input-properties.h
rename to dali-toolkit/internal/text/controller/text-controller-input-properties.h
index d453b5f..b0736f7 100644
--- a/dali-toolkit/internal/text/text-controller-input-properties.h
+++ b/dali-toolkit/internal/text/controller/text-controller-input-properties.h
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_TEXT_CONTROLLER_INPUT_PROPERTIES_H
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,18 +23,7 @@
 #include <dali/public-api/events/gesture.h>
 
 // INTERNAL INCLUDES
-#include <dali-toolkit/internal/text/text-controller.h>
-//#include <dali-toolkit/devel-api/controls/text-controls/text-label-devel.h>
-//#include <dali-toolkit/devel-api/controls/text-controls/text-selection-popup-callback-interface.h>
-//#include <dali-toolkit/devel-api/text/text-enumerations-devel.h>
-//#include <dali-toolkit/internal/text/decorator/text-decorator.h>
-//#include <dali-toolkit/internal/text/hidden-text.h>
-//#include <dali-toolkit/internal/text/input-filter.h>
-//#include <dali-toolkit/internal/text/layouts/layout-engine.h>
-//#include <dali-toolkit/internal/text/text-anchor-control-interface.h>
-//#include <dali-toolkit/internal/text/text-model-interface.h>
-//#include <dali-toolkit/internal/text/text-selectable-control-interface.h>
-//#include <dali-toolkit/public-api/text/text-enumerations.h>
+#include <dali-toolkit/internal/text/controller/text-controller.h>
 
 namespace Dali::Toolkit::Text
 {
diff --git a/dali-toolkit/internal/text/text-controller-placeholder-handler.cpp b/dali-toolkit/internal/text/controller/text-controller-placeholder-handler.cpp
similarity index 98%
rename from dali-toolkit/internal/text/text-controller-placeholder-handler.cpp
rename to dali-toolkit/internal/text/controller/text-controller-placeholder-handler.cpp
index 312ecb5..da15a43 100644
--- a/dali-toolkit/internal/text/text-controller-placeholder-handler.cpp
+++ b/dali-toolkit/internal/text/controller/text-controller-placeholder-handler.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,14 +16,14 @@
  */
 
 // CLASS HEADER
-#include <dali-toolkit/internal/text/text-controller-placeholder-handler.h>
+#include <dali-toolkit/internal/text/controller/text-controller-placeholder-handler.h>
 
 // EXTERNAL INCLUDES
 #include <dali/integration-api/debug.h>
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/internal/text/character-set-conversion.h>
-#include <dali-toolkit/internal/text/text-controller-impl.h>
+#include <dali-toolkit/internal/text/controller/text-controller-impl.h>
 #include <dali-toolkit/internal/text/text-font-style.h>
 #include <dali-toolkit/public-api/controls/text-controls/placeholder-properties.h>
 
diff --git a/dali-toolkit/internal/text/text-controller-placeholder-handler.h b/dali-toolkit/internal/text/controller/text-controller-placeholder-handler.h
similarity index 96%
rename from dali-toolkit/internal/text/text-controller-placeholder-handler.h
rename to dali-toolkit/internal/text/controller/text-controller-placeholder-handler.h
index 9c81eb1..c7107c9 100644
--- a/dali-toolkit/internal/text/text-controller-placeholder-handler.h
+++ b/dali-toolkit/internal/text/controller/text-controller-placeholder-handler.h
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_TEXT_CONTROLLER_PLACEHOLDER_HANDLER_H
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,7 +23,7 @@
 #include <dali/public-api/object/property-map.h>
 
 // INTERNAL INCLUDES
-#include <dali-toolkit/internal/text/text-controller.h>
+#include <dali-toolkit/internal/text/controller/text-controller.h>
 #include <dali-toolkit/internal/text/text-definitions.h>
 
 namespace Dali
diff --git a/dali-toolkit/internal/text/text-controller-relayouter.cpp b/dali-toolkit/internal/text/controller/text-controller-relayouter.cpp
similarity index 99%
rename from dali-toolkit/internal/text/text-controller-relayouter.cpp
rename to dali-toolkit/internal/text/controller/text-controller-relayouter.cpp
index 527bb99..3b0c4c3 100644
--- a/dali-toolkit/internal/text/text-controller-relayouter.cpp
+++ b/dali-toolkit/internal/text/controller/text-controller-relayouter.cpp
@@ -16,7 +16,7 @@
  */
 
 // CLASS HEADER
-#include <dali-toolkit/internal/text/text-controller-relayouter.h>
+#include <dali-toolkit/internal/text/controller/text-controller-relayouter.h>
 
 // EXTERNAL INCLUDES
 #include <dali/integration-api/debug.h>
@@ -24,8 +24,8 @@
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/internal/text/layouts/layout-parameters.h>
-#include <dali-toolkit/internal/text/text-controller-event-handler.h>
-#include <dali-toolkit/internal/text/text-controller-impl.h>
+#include <dali-toolkit/internal/text/controller/text-controller-event-handler.h>
+#include <dali-toolkit/internal/text/controller/text-controller-impl.h>
 
 namespace
 {
diff --git a/dali-toolkit/internal/text/text-controller-relayouter.h b/dali-toolkit/internal/text/controller/text-controller-relayouter.h
similarity index 97%
rename from dali-toolkit/internal/text/text-controller-relayouter.h
rename to dali-toolkit/internal/text/controller/text-controller-relayouter.h
index a98ed53..ca4e666 100644
--- a/dali-toolkit/internal/text/text-controller-relayouter.h
+++ b/dali-toolkit/internal/text/controller/text-controller-relayouter.h
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_TEXT_CONTROLLER_RELAYOUTER_H
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,7 +24,7 @@
 #include <dali/public-api/math/vector3.h>
 
 // INTERNAL INCLUDES
-#include <dali-toolkit/internal/text/text-controller.h>
+#include <dali-toolkit/internal/text/controller/text-controller.h>
 
 namespace Dali
 {
diff --git a/dali-toolkit/internal/text/text-controller-text-updater.cpp b/dali-toolkit/internal/text/controller/text-controller-text-updater.cpp
similarity index 98%
rename from dali-toolkit/internal/text/text-controller-text-updater.cpp
rename to dali-toolkit/internal/text/controller/text-controller-text-updater.cpp
index 4d0ba8f..addb91a 100644
--- a/dali-toolkit/internal/text/text-controller-text-updater.cpp
+++ b/dali-toolkit/internal/text/controller/text-controller-text-updater.cpp
@@ -16,7 +16,7 @@
  */
 
 // CLASS HEADER
-#include <dali-toolkit/internal/text/text-controller-text-updater.h>
+#include <dali-toolkit/internal/text/controller/text-controller-text-updater.h>
 
 // EXTERNAL INCLUDES
 #include <dali/integration-api/debug.h>
@@ -26,9 +26,9 @@
 #include <dali-toolkit/internal/text/character-set-conversion.h>
 #include <dali-toolkit/internal/text/characters-helper-functions.h>
 #include <dali-toolkit/internal/text/emoji-helper.h>
-#include <dali-toolkit/internal/text/markup-processor.h>
-#include <dali-toolkit/internal/text/text-controller-impl.h>
-#include <dali-toolkit/internal/text/text-controller-placeholder-handler.h>
+#include <dali-toolkit/internal/text/markup-processor/markup-processor.h>
+#include <dali-toolkit/internal/text/controller/text-controller-impl.h>
+#include <dali-toolkit/internal/text/controller/text-controller-placeholder-handler.h>
 #include <dali-toolkit/internal/text/text-editable-control-interface.h>
 
 namespace
diff --git a/dali-toolkit/internal/text/text-controller-text-updater.h b/dali-toolkit/internal/text/controller/text-controller-text-updater.h
similarity index 96%
rename from dali-toolkit/internal/text/text-controller-text-updater.h
rename to dali-toolkit/internal/text/controller/text-controller-text-updater.h
index 1070966..47403f6 100644
--- a/dali-toolkit/internal/text/text-controller-text-updater.h
+++ b/dali-toolkit/internal/text/controller/text-controller-text-updater.h
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_TEXT_UPDATER_H
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,7 +22,7 @@
 #include <string>
 
 // INTERNAL INCLUDES
-#include <dali-toolkit/internal/text/text-controller.h>
+#include <dali-toolkit/internal/text/controller/text-controller.h>
 
 namespace Dali
 {
diff --git a/dali-toolkit/internal/text/text-controller.cpp b/dali-toolkit/internal/text/controller/text-controller.cpp
similarity index 98%
rename from dali-toolkit/internal/text/text-controller.cpp
rename to dali-toolkit/internal/text/controller/text-controller.cpp
index 1a07af5..5f775f7 100644
--- a/dali-toolkit/internal/text/text-controller.cpp
+++ b/dali-toolkit/internal/text/controller/text-controller.cpp
@@ -16,7 +16,7 @@
  */
 
 // CLASS HEADER
-#include <dali-toolkit/internal/text/text-controller.h>
+#include <dali-toolkit/internal/text/controller/text-controller.h>
 
 // EXTERNAL INCLUDES
 #include <dali-toolkit/devel-api/controls/control-depth-index-ranges.h>
@@ -28,14 +28,14 @@
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/devel-api/text/text-enumerations-devel.h>
-#include <dali-toolkit/internal/text/text-controller-background-actor.h>
-#include <dali-toolkit/internal/text/text-controller-event-handler.h>
-#include <dali-toolkit/internal/text/text-controller-impl.h>
-#include <dali-toolkit/internal/text/text-controller-input-font-handler.h>
-#include <dali-toolkit/internal/text/text-controller-input-properties.h>
-#include <dali-toolkit/internal/text/text-controller-placeholder-handler.h>
-#include <dali-toolkit/internal/text/text-controller-relayouter.h>
-#include <dali-toolkit/internal/text/text-controller-text-updater.h>
+#include <dali-toolkit/internal/text/controller/text-controller-background-actor.h>
+#include <dali-toolkit/internal/text/controller/text-controller-event-handler.h>
+#include <dali-toolkit/internal/text/controller/text-controller-impl.h>
+#include <dali-toolkit/internal/text/controller/text-controller-input-font-handler.h>
+#include <dali-toolkit/internal/text/controller/text-controller-input-properties.h>
+#include <dali-toolkit/internal/text/controller/text-controller-placeholder-handler.h>
+#include <dali-toolkit/internal/text/controller/text-controller-relayouter.h>
+#include <dali-toolkit/internal/text/controller/text-controller-text-updater.h>
 #include <dali-toolkit/internal/text/text-editable-control-interface.h>
 #include <dali-toolkit/internal/text/text-geometry.h>
 
diff --git a/dali-toolkit/internal/text/text-controller.h b/dali-toolkit/internal/text/controller/text-controller.h
similarity index 100%
rename from dali-toolkit/internal/text/text-controller.h
rename to dali-toolkit/internal/text/controller/text-controller.h
diff --git a/dali-toolkit/internal/text/markup-processor-anchor.cpp b/dali-toolkit/internal/text/markup-processor/markup-processor-anchor.cpp
similarity index 85%
rename from dali-toolkit/internal/text/markup-processor-anchor.cpp
rename to dali-toolkit/internal/text/markup-processor/markup-processor-anchor.cpp
index 771ff4e..87789e3 100644
--- a/dali-toolkit/internal/text/markup-processor-anchor.cpp
+++ b/dali-toolkit/internal/text/markup-processor/markup-processor-anchor.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@
  */
 
 // FILE HEADER
-#include <dali-toolkit/internal/text/markup-processor-anchor.h>
+#include <dali-toolkit/internal/text/markup-processor/markup-processor-anchor.h>
 
 // EXTERNAL INCLUDES
 #include <dali/public-api/common/dali-vector.h>
@@ -24,7 +24,7 @@
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/internal/text/anchor.h>
-#include <dali-toolkit/internal/text/markup-processor-helper-functions.h>
+#include <dali-toolkit/internal/text/markup-processor/markup-processor-helper-functions.h>
 #include <dali-toolkit/internal/text/markup-tags-and-attributes.h>
 
 namespace Dali
diff --git a/dali-toolkit/internal/text/markup-processor-anchor.h b/dali-toolkit/internal/text/markup-processor/markup-processor-anchor.h
similarity index 90%
rename from dali-toolkit/internal/text/markup-processor-anchor.h
rename to dali-toolkit/internal/text/markup-processor/markup-processor-anchor.h
index 7c1d181..5559e0a 100644
--- a/dali-toolkit/internal/text/markup-processor-anchor.h
+++ b/dali-toolkit/internal/text/markup-processor/markup-processor-anchor.h
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_TEXT_MARKUP_PROCESSOR_ANCHOR_H
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/dali-toolkit/internal/text/markup-processor-attribute-helper-functions.cpp b/dali-toolkit/internal/text/markup-processor/markup-processor-attribute-helper-functions.cpp
similarity index 86%
rename from dali-toolkit/internal/text/markup-processor-attribute-helper-functions.cpp
rename to dali-toolkit/internal/text/markup-processor/markup-processor-attribute-helper-functions.cpp
index da00996..5554c22 100644
--- a/dali-toolkit/internal/text/markup-processor-attribute-helper-functions.cpp
+++ b/dali-toolkit/internal/text/markup-processor/markup-processor-attribute-helper-functions.cpp
@@ -16,10 +16,10 @@
  */
 
 // FILE HEADER
-#include <dali-toolkit/internal/text/markup-processor-attribute-helper-functions.h>
+#include <dali-toolkit/internal/text/markup-processor/markup-processor-attribute-helper-functions.h>
 
 // INTERNAL INCLUDES
-#include <dali-toolkit/internal/text/markup-processor-helper-functions.h>
+#include <dali-toolkit/internal/text/markup-processor/markup-processor-helper-functions.h>
 
 // EXTERNAL INCLUDES
 #include <memory.h>
diff --git a/dali-toolkit/internal/text/markup-processor-attribute-helper-functions.h b/dali-toolkit/internal/text/markup-processor/markup-processor-attribute-helper-functions.h
similarity index 98%
rename from dali-toolkit/internal/text/markup-processor-attribute-helper-functions.h
rename to dali-toolkit/internal/text/markup-processor/markup-processor-attribute-helper-functions.h
index 52771b5..ab7e07e 100644
--- a/dali-toolkit/internal/text/markup-processor-attribute-helper-functions.h
+++ b/dali-toolkit/internal/text/markup-processor/markup-processor-attribute-helper-functions.h
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_TEXT_MARKUP_PROCESSOR_ATTRIBUTE_HELPER_FUNCTIONS_H
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/dali-toolkit/internal/text/markup-processor-background.cpp b/dali-toolkit/internal/text/markup-processor/markup-processor-background.cpp
similarity index 83%
rename from dali-toolkit/internal/text/markup-processor-background.cpp
rename to dali-toolkit/internal/text/markup-processor/markup-processor-background.cpp
index 7f0e8ae..303fff7 100644
--- a/dali-toolkit/internal/text/markup-processor-background.cpp
+++ b/dali-toolkit/internal/text/markup-processor/markup-processor-background.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@
  */
 
 // FILE HEADER
-#include <dali-toolkit/internal/text/markup-processor-background.h>
+#include <dali-toolkit/internal/text/markup-processor/markup-processor-background.h>
 
 // EXTERNAL INCLUDES
 #include <dali/public-api/common/dali-vector.h>
@@ -24,7 +24,7 @@
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/internal/text/color-run.h>
-#include <dali-toolkit/internal/text/markup-processor-helper-functions.h>
+#include <dali-toolkit/internal/text/markup-processor/markup-processor-helper-functions.h>
 #include <dali-toolkit/internal/text/markup-tags-and-attributes.h>
 
 namespace Dali
diff --git a/dali-toolkit/internal/text/markup-processor-background.h b/dali-toolkit/internal/text/markup-processor/markup-processor-background.h
similarity index 90%
rename from dali-toolkit/internal/text/markup-processor-background.h
rename to dali-toolkit/internal/text/markup-processor/markup-processor-background.h
index 331d2c8..9420dac 100644
--- a/dali-toolkit/internal/text/markup-processor-background.h
+++ b/dali-toolkit/internal/text/markup-processor/markup-processor-background.h
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_TEXT_MARKUP_PROCESSOR_BACKGROUND_H
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/dali-toolkit/internal/text/markup-processor-character-spacing.cpp b/dali-toolkit/internal/text/markup-processor/markup-processor-character-spacing.cpp
similarity index 85%
rename from dali-toolkit/internal/text/markup-processor-character-spacing.cpp
rename to dali-toolkit/internal/text/markup-processor/markup-processor-character-spacing.cpp
index cce30dd..f18efe3 100644
--- a/dali-toolkit/internal/text/markup-processor-character-spacing.cpp
+++ b/dali-toolkit/internal/text/markup-processor/markup-processor-character-spacing.cpp
@@ -16,15 +16,15 @@
  */
 
 // FILE HEADER
-#include <dali-toolkit/internal/text/markup-processor-character-spacing.h>
+#include <dali-toolkit/internal/text/markup-processor/markup-processor-character-spacing.h>
 
 // EXTERNAL INCLUDES
 #include <dali/public-api/common/dali-vector.h>
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/internal/text/character-spacing-character-run.h>
-#include <dali-toolkit/internal/text/markup-processor-attribute-helper-functions.h>
-#include <dali-toolkit/internal/text/markup-processor-helper-functions.h>
+#include <dali-toolkit/internal/text/markup-processor/markup-processor-attribute-helper-functions.h>
+#include <dali-toolkit/internal/text/markup-processor/markup-processor-helper-functions.h>
 #include <dali-toolkit/internal/text/markup-tags-and-attributes.h>
 
 namespace Dali
diff --git a/dali-toolkit/internal/text/markup-processor-character-spacing.h b/dali-toolkit/internal/text/markup-processor/markup-processor-character-spacing.h
similarity index 100%
rename from dali-toolkit/internal/text/markup-processor-character-spacing.h
rename to dali-toolkit/internal/text/markup-processor/markup-processor-character-spacing.h
diff --git a/dali-toolkit/internal/text/markup-processor-color.cpp b/dali-toolkit/internal/text/markup-processor/markup-processor-color.cpp
similarity index 90%
rename from dali-toolkit/internal/text/markup-processor-color.cpp
rename to dali-toolkit/internal/text/markup-processor/markup-processor-color.cpp
index 4fb95ef..1a5ce73 100644
--- a/dali-toolkit/internal/text/markup-processor-color.cpp
+++ b/dali-toolkit/internal/text/markup-processor/markup-processor-color.cpp
@@ -16,14 +16,14 @@
  */
 
 // FILE HEADER
-#include <dali-toolkit/internal/text/markup-processor-color.h>
+#include <dali-toolkit/internal/text/markup-processor/markup-processor-color.h>
 
 // EXTERNAL INCLUDES
 #include <dali/public-api/common/dali-vector.h>
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/internal/text/color-run.h>
-#include <dali-toolkit/internal/text/markup-processor-helper-functions.h>
+#include <dali-toolkit/internal/text/markup-processor/markup-processor-helper-functions.h>
 #include <dali-toolkit/internal/text/markup-tags-and-attributes.h>
 
 namespace Dali
diff --git a/dali-toolkit/internal/text/markup-processor-color.h b/dali-toolkit/internal/text/markup-processor/markup-processor-color.h
similarity index 96%
rename from dali-toolkit/internal/text/markup-processor-color.h
rename to dali-toolkit/internal/text/markup-processor/markup-processor-color.h
index 02210fb..2d8be1e 100644
--- a/dali-toolkit/internal/text/markup-processor-color.h
+++ b/dali-toolkit/internal/text/markup-processor/markup-processor-color.h
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_TEXT_MARKUP_PROCESSOR_COLOR_H
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/dali-toolkit/internal/text/markup-processor-embedded-item.cpp b/dali-toolkit/internal/text/markup-processor/markup-processor-embedded-item.cpp
similarity index 91%
rename from dali-toolkit/internal/text/markup-processor-embedded-item.cpp
rename to dali-toolkit/internal/text/markup-processor/markup-processor-embedded-item.cpp
index 94d6fd4..8e9ec06 100644
--- a/dali-toolkit/internal/text/markup-processor-embedded-item.cpp
+++ b/dali-toolkit/internal/text/markup-processor/markup-processor-embedded-item.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@
  */
 
 // FILE HEADER
-#include <dali-toolkit/internal/text/markup-processor-embedded-item.h>
+#include <dali-toolkit/internal/text/markup-processor/markup-processor-embedded-item.h>
 
 // EXTERNAL INCLUDES
 #include <dali/public-api/common/dali-vector.h>
@@ -24,7 +24,7 @@
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/internal/text/embedded-item.h>
-#include <dali-toolkit/internal/text/markup-processor-helper-functions.h>
+#include <dali-toolkit/internal/text/markup-processor/markup-processor-helper-functions.h>
 #include <dali-toolkit/internal/text/markup-tags-and-attributes.h>
 
 namespace Dali
diff --git a/dali-toolkit/internal/text/markup-processor-embedded-item.h b/dali-toolkit/internal/text/markup-processor/markup-processor-embedded-item.h
similarity index 95%
rename from dali-toolkit/internal/text/markup-processor-embedded-item.h
rename to dali-toolkit/internal/text/markup-processor/markup-processor-embedded-item.h
index 1677244..ed6a371 100644
--- a/dali-toolkit/internal/text/markup-processor-embedded-item.h
+++ b/dali-toolkit/internal/text/markup-processor/markup-processor-embedded-item.h
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_TEXT_MARKUP_PROCESSOR_EMBEDDED_ITEM_H
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/dali-toolkit/internal/text/markup-processor-font.cpp b/dali-toolkit/internal/text/markup-processor/markup-processor-font.cpp
similarity index 93%
rename from dali-toolkit/internal/text/markup-processor-font.cpp
rename to dali-toolkit/internal/text/markup-processor/markup-processor-font.cpp
index 802f9e9..133d7fa 100644
--- a/dali-toolkit/internal/text/markup-processor-font.cpp
+++ b/dali-toolkit/internal/text/markup-processor/markup-processor-font.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@
  */
 
 // FILE HEADER
-#include <dali-toolkit/internal/text/markup-processor-font.h>
+#include <dali-toolkit/internal/text/markup-processor/markup-processor-font.h>
 
 // EXTERNAL INCLUDES
 #include <dali/public-api/common/dali-vector.h>
@@ -24,8 +24,8 @@
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/internal/text/font-description-run.h>
-#include <dali-toolkit/internal/text/markup-processor-attribute-helper-functions.h>
-#include <dali-toolkit/internal/text/markup-processor-helper-functions.h>
+#include <dali-toolkit/internal/text/markup-processor/markup-processor-attribute-helper-functions.h>
+#include <dali-toolkit/internal/text/markup-processor/markup-processor-helper-functions.h>
 #include <dali-toolkit/internal/text/markup-tags-and-attributes.h>
 #include <dali-toolkit/internal/text/text-font-style.h>
 
diff --git a/dali-toolkit/internal/text/markup-processor-font.h b/dali-toolkit/internal/text/markup-processor/markup-processor-font.h
similarity index 97%
rename from dali-toolkit/internal/text/markup-processor-font.h
rename to dali-toolkit/internal/text/markup-processor/markup-processor-font.h
index 6461451..cc2b561 100644
--- a/dali-toolkit/internal/text/markup-processor-font.h
+++ b/dali-toolkit/internal/text/markup-processor/markup-processor-font.h
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_TEXT_MARKUP_PROCESSOR_FONT_H
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/dali-toolkit/internal/text/markup-processor-helper-functions.cpp b/dali-toolkit/internal/text/markup-processor/markup-processor-helper-functions.cpp
similarity index 99%
rename from dali-toolkit/internal/text/markup-processor-helper-functions.cpp
rename to dali-toolkit/internal/text/markup-processor/markup-processor-helper-functions.cpp
index 9f4c34d..b0ac16b 100644
--- a/dali-toolkit/internal/text/markup-processor-helper-functions.cpp
+++ b/dali-toolkit/internal/text/markup-processor/markup-processor-helper-functions.cpp
@@ -16,7 +16,7 @@
  */
 
 // FILE HEADER
-#include <dali-toolkit/internal/text/markup-processor-helper-functions.h>
+#include <dali-toolkit/internal/text/markup-processor/markup-processor-helper-functions.h>
 
 // EXTERNAL INCLUDES
 #include <dali/public-api/common/constants.h>
diff --git a/dali-toolkit/internal/text/markup-processor-helper-functions.h b/dali-toolkit/internal/text/markup-processor/markup-processor-helper-functions.h
similarity index 100%
rename from dali-toolkit/internal/text/markup-processor-helper-functions.h
rename to dali-toolkit/internal/text/markup-processor/markup-processor-helper-functions.h
diff --git a/dali-toolkit/internal/text/markup-processor-paragraph.cpp b/dali-toolkit/internal/text/markup-processor/markup-processor-paragraph.cpp
similarity index 93%
rename from dali-toolkit/internal/text/markup-processor-paragraph.cpp
rename to dali-toolkit/internal/text/markup-processor/markup-processor-paragraph.cpp
index e470bec..8676198 100644
--- a/dali-toolkit/internal/text/markup-processor-paragraph.cpp
+++ b/dali-toolkit/internal/text/markup-processor/markup-processor-paragraph.cpp
@@ -16,14 +16,14 @@
  */
 
 // FILE HEADER
-#include <dali-toolkit/internal/text/markup-processor-paragraph.h>
+#include <dali-toolkit/internal/text/markup-processor/markup-processor-paragraph.h>
 
 // EXTERNAL INCLUDES
 #include <dali/public-api/common/dali-vector.h>
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/internal/text/bounded-paragraph-run.h>
-#include <dali-toolkit/internal/text/markup-processor-helper-functions.h>
+#include <dali-toolkit/internal/text/markup-processor/markup-processor-helper-functions.h>
 #include <dali-toolkit/internal/text/markup-tags-and-attributes.h>
 
 namespace Dali
diff --git a/dali-toolkit/internal/text/markup-processor-paragraph.h b/dali-toolkit/internal/text/markup-processor/markup-processor-paragraph.h
similarity index 100%
rename from dali-toolkit/internal/text/markup-processor-paragraph.h
rename to dali-toolkit/internal/text/markup-processor/markup-processor-paragraph.h
diff --git a/dali-toolkit/internal/text/markup-processor-span.cpp b/dali-toolkit/internal/text/markup-processor/markup-processor-span.cpp
similarity index 91%
rename from dali-toolkit/internal/text/markup-processor-span.cpp
rename to dali-toolkit/internal/text/markup-processor/markup-processor-span.cpp
index 3e20c6f..5f8dfa2 100644
--- a/dali-toolkit/internal/text/markup-processor-span.cpp
+++ b/dali-toolkit/internal/text/markup-processor/markup-processor-span.cpp
@@ -16,7 +16,7 @@
  */
 
 // FILE HEADER
-#include <dali-toolkit/internal/text/markup-processor-color.h>
+#include <dali-toolkit/internal/text/markup-processor/markup-processor-color.h>
 
 // EXTERNAL INCLUDES
 #include <dali/public-api/common/dali-vector.h>
@@ -24,11 +24,11 @@
 // INTERNAL INCLUDES
 #include <dali-toolkit/internal/text/color-run.h>
 #include <dali-toolkit/internal/text/font-description-run.h>
-#include <dali-toolkit/internal/text/markup-processor-character-spacing.h>
-#include <dali-toolkit/internal/text/markup-processor-font.h>
-#include <dali-toolkit/internal/text/markup-processor-helper-functions.h>
-#include <dali-toolkit/internal/text/markup-processor-strikethrough.h>
-#include <dali-toolkit/internal/text/markup-processor-underline.h>
+#include <dali-toolkit/internal/text/markup-processor/markup-processor-character-spacing.h>
+#include <dali-toolkit/internal/text/markup-processor/markup-processor-font.h>
+#include <dali-toolkit/internal/text/markup-processor/markup-processor-helper-functions.h>
+#include <dali-toolkit/internal/text/markup-processor/markup-processor-strikethrough.h>
+#include <dali-toolkit/internal/text/markup-processor/markup-processor-underline.h>
 #include <dali-toolkit/internal/text/markup-tags-and-attributes.h>
 
 namespace Dali
diff --git a/dali-toolkit/internal/text/markup-processor-span.h b/dali-toolkit/internal/text/markup-processor/markup-processor-span.h
similarity index 100%
rename from dali-toolkit/internal/text/markup-processor-span.h
rename to dali-toolkit/internal/text/markup-processor/markup-processor-span.h
diff --git a/dali-toolkit/internal/text/markup-processor-strikethrough.cpp b/dali-toolkit/internal/text/markup-processor/markup-processor-strikethrough.cpp
similarity index 93%
rename from dali-toolkit/internal/text/markup-processor-strikethrough.cpp
rename to dali-toolkit/internal/text/markup-processor/markup-processor-strikethrough.cpp
index 10e104c..5d08c93 100644
--- a/dali-toolkit/internal/text/markup-processor-strikethrough.cpp
+++ b/dali-toolkit/internal/text/markup-processor/markup-processor-strikethrough.cpp
@@ -16,14 +16,14 @@
  */
 
 // FILE HEADER
-#include <dali-toolkit/internal/text/markup-processor-strikethrough.h>
+#include <dali-toolkit/internal/text/markup-processor/markup-processor-strikethrough.h>
 
 // EXTERNAL INCLUDES
 #include <dali/public-api/common/dali-vector.h>
 
 // INTERNAL INCLUDES
-#include <dali-toolkit/internal/text/markup-processor-attribute-helper-functions.h>
-#include <dali-toolkit/internal/text/markup-processor-helper-functions.h>
+#include <dali-toolkit/internal/text/markup-processor/markup-processor-attribute-helper-functions.h>
+#include <dali-toolkit/internal/text/markup-processor/markup-processor-helper-functions.h>
 #include <dali-toolkit/internal/text/markup-tags-and-attributes.h>
 #include <dali-toolkit/internal/text/strikethrough-character-run.h>
 
diff --git a/dali-toolkit/internal/text/markup-processor-strikethrough.h b/dali-toolkit/internal/text/markup-processor/markup-processor-strikethrough.h
similarity index 100%
rename from dali-toolkit/internal/text/markup-processor-strikethrough.h
rename to dali-toolkit/internal/text/markup-processor/markup-processor-strikethrough.h
diff --git a/dali-toolkit/internal/text/markup-processor-underline.cpp b/dali-toolkit/internal/text/markup-processor/markup-processor-underline.cpp
similarity index 95%
rename from dali-toolkit/internal/text/markup-processor-underline.cpp
rename to dali-toolkit/internal/text/markup-processor/markup-processor-underline.cpp
index 08b9f1e..ac1b0ae 100644
--- a/dali-toolkit/internal/text/markup-processor-underline.cpp
+++ b/dali-toolkit/internal/text/markup-processor/markup-processor-underline.cpp
@@ -16,14 +16,14 @@
  */
 
 // FILE HEADER
-#include <dali-toolkit/internal/text/markup-processor-underline.h>
+#include <dali-toolkit/internal/text/markup-processor/markup-processor-underline.h>
 
 // EXTERNAL INCLUDES
 #include <dali/public-api/common/dali-vector.h>
 
 // INTERNAL INCLUDES
-#include <dali-toolkit/internal/text/markup-processor-attribute-helper-functions.h>
-#include <dali-toolkit/internal/text/markup-processor-helper-functions.h>
+#include <dali-toolkit/internal/text/markup-processor/markup-processor-attribute-helper-functions.h>
+#include <dali-toolkit/internal/text/markup-processor/markup-processor-helper-functions.h>
 #include <dali-toolkit/internal/text/markup-tags-and-attributes.h>
 #include <dali-toolkit/internal/text/text-effects-style.h>
 #include <dali-toolkit/internal/text/underlined-character-run.h>
diff --git a/dali-toolkit/internal/text/markup-processor-underline.h b/dali-toolkit/internal/text/markup-processor/markup-processor-underline.h
similarity index 100%
rename from dali-toolkit/internal/text/markup-processor-underline.h
rename to dali-toolkit/internal/text/markup-processor/markup-processor-underline.h
diff --git a/dali-toolkit/internal/text/markup-processor.cpp b/dali-toolkit/internal/text/markup-processor/markup-processor.cpp
similarity index 97%
rename from dali-toolkit/internal/text/markup-processor.cpp
rename to dali-toolkit/internal/text/markup-processor/markup-processor.cpp
index 344cde1..b19cdb1 100644
--- a/dali-toolkit/internal/text/markup-processor.cpp
+++ b/dali-toolkit/internal/text/markup-processor/markup-processor.cpp
@@ -16,7 +16,7 @@
  */
 
 // FILE HEADER
-#include <dali-toolkit/internal/text/markup-processor.h>
+#include <dali-toolkit/internal/text/markup-processor/markup-processor.h>
 
 // EXTERNAL INCLUDES
 #include <dali/integration-api/debug.h>
@@ -25,17 +25,17 @@
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/internal/text/character-set-conversion.h>
-#include <dali-toolkit/internal/text/markup-processor-anchor.h>
-#include <dali-toolkit/internal/text/markup-processor-background.h>
-#include <dali-toolkit/internal/text/markup-processor-character-spacing.h>
-#include <dali-toolkit/internal/text/markup-processor-color.h>
-#include <dali-toolkit/internal/text/markup-processor-embedded-item.h>
-#include <dali-toolkit/internal/text/markup-processor-font.h>
-#include <dali-toolkit/internal/text/markup-processor-helper-functions.h>
-#include <dali-toolkit/internal/text/markup-processor-paragraph.h>
-#include <dali-toolkit/internal/text/markup-processor-span.h>
-#include <dali-toolkit/internal/text/markup-processor-strikethrough.h>
-#include <dali-toolkit/internal/text/markup-processor-underline.h>
+#include <dali-toolkit/internal/text/markup-processor/markup-processor-anchor.h>
+#include <dali-toolkit/internal/text/markup-processor/markup-processor-background.h>
+#include <dali-toolkit/internal/text/markup-processor/markup-processor-character-spacing.h>
+#include <dali-toolkit/internal/text/markup-processor/markup-processor-color.h>
+#include <dali-toolkit/internal/text/markup-processor/markup-processor-embedded-item.h>
+#include <dali-toolkit/internal/text/markup-processor/markup-processor-font.h>
+#include <dali-toolkit/internal/text/markup-processor/markup-processor-helper-functions.h>
+#include <dali-toolkit/internal/text/markup-processor/markup-processor-paragraph.h>
+#include <dali-toolkit/internal/text/markup-processor/markup-processor-span.h>
+#include <dali-toolkit/internal/text/markup-processor/markup-processor-strikethrough.h>
+#include <dali-toolkit/internal/text/markup-processor/markup-processor-underline.h>
 #include <dali-toolkit/internal/text/markup-tags-and-attributes.h>
 #include <dali-toolkit/internal/text/xhtml-entities.h>
 
diff --git a/dali-toolkit/internal/text/markup-processor.h b/dali-toolkit/internal/text/markup-processor/markup-processor.h
similarity index 100%
rename from dali-toolkit/internal/text/markup-processor.h
rename to dali-toolkit/internal/text/markup-processor/markup-processor.h
diff --git a/dali-toolkit/internal/text/property-string-parser.cpp b/dali-toolkit/internal/text/property-string-parser.cpp
index ec0fc94..9265472 100644
--- a/dali-toolkit/internal/text/property-string-parser.cpp
+++ b/dali-toolkit/internal/text/property-string-parser.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,7 +24,7 @@
 // INTERNAL INCLUDES
 #include <dali-toolkit/devel-api/builder/json-parser.h>
 #include <dali-toolkit/devel-api/builder/tree-node.h>
-#include <dali-toolkit/internal/text/markup-processor-helper-functions.h>
+#include <dali-toolkit/internal/text/markup-processor/markup-processor-helper-functions.h>
 
 namespace Dali
 {
diff --git a/dali-toolkit/internal/text/text-effects-style.cpp b/dali-toolkit/internal/text/text-effects-style.cpp
index 90c570a..c15a11d 100644
--- a/dali-toolkit/internal/text/text-effects-style.cpp
+++ b/dali-toolkit/internal/text/text-effects-style.cpp
@@ -20,7 +20,7 @@
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/devel-api/controls/text-controls/text-style-properties-devel.h>
-#include <dali-toolkit/internal/text/markup-processor-helper-functions.h>
+#include <dali-toolkit/internal/text/markup-processor/markup-processor-helper-functions.h>
 #include <dali-toolkit/internal/text/property-string-parser.h>
 #include <dali-toolkit/internal/text/text-enumerations-impl.h>
 
diff --git a/dali-toolkit/internal/text/text-effects-style.h b/dali-toolkit/internal/text/text-effects-style.h
index d87e810..0ceeab3 100644
--- a/dali-toolkit/internal/text/text-effects-style.h
+++ b/dali-toolkit/internal/text/text-effects-style.h
@@ -19,7 +19,7 @@
  */
 
 // INTERNAL INCLUDES
-#include <dali-toolkit/internal/text/text-controller.h>
+#include <dali-toolkit/internal/text/controller/text-controller.h>
 #include <dali-toolkit/public-api/text/text-enumerations.h>
 #include <dali/devel-api/scripting/scripting.h>
 
diff --git a/dali-toolkit/internal/text/text-font-style.cpp b/dali-toolkit/internal/text/text-font-style.cpp
index 117268a..ce5e860 100644
--- a/dali-toolkit/internal/text/text-font-style.cpp
+++ b/dali-toolkit/internal/text/text-font-style.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,7 +22,7 @@
 #include <dali/integration-api/debug.h>
 
 // INTERNAL INCLUDES
-#include <dali-toolkit/internal/text/markup-processor-helper-functions.h>
+#include <dali-toolkit/internal/text/markup-processor/markup-processor-helper-functions.h>
 #include <dali-toolkit/internal/text/property-string-parser.h>
 
 namespace Dali
diff --git a/dali-toolkit/internal/text/text-font-style.h b/dali-toolkit/internal/text/text-font-style.h
index c85ec58..e2955c7 100644
--- a/dali-toolkit/internal/text/text-font-style.h
+++ b/dali-toolkit/internal/text/text-font-style.h
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_INTERNAL_TEXT_FONT_STYLE_H
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,7 +22,7 @@
 #include <dali/devel-api/scripting/scripting.h>
 
 // INTERNAL INCLUDES
-#include <dali-toolkit/internal/text/text-controller.h>
+#include <dali-toolkit/internal/text/controller/text-controller.h>
 
 namespace Dali
 {
diff --git a/dali-toolkit/internal/text/text-selection-handle-controller.cpp b/dali-toolkit/internal/text/text-selection-handle-controller.cpp
index e4bf91c..fef3baa 100644
--- a/dali-toolkit/internal/text/text-selection-handle-controller.cpp
+++ b/dali-toolkit/internal/text/text-selection-handle-controller.cpp
@@ -25,7 +25,7 @@
 #include <dali-toolkit/internal/text/cursor-helper-functions.h>
 #include <dali-toolkit/internal/text/glyph-metrics-helper.h>
 #include <dali-toolkit/internal/text/rendering/styles/character-spacing-helper-functions.h>
-#include <dali-toolkit/internal/text/text-controller-impl-event-handler.h>
+#include <dali-toolkit/internal/text/controller/text-controller-impl-event-handler.h>
 
 using namespace Dali;
 
diff --git a/dali-toolkit/internal/text/text-selection-handle-controller.h b/dali-toolkit/internal/text/text-selection-handle-controller.h
index 62032fd..a021009 100644
--- a/dali-toolkit/internal/text/text-selection-handle-controller.h
+++ b/dali-toolkit/internal/text/text-selection-handle-controller.h
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_TEXT_SELECTION_HANDLE_CONTROLLER_H
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,7 +21,7 @@
 // INTERNAL INCLUDES
 #include <dali-toolkit/internal/text/cursor-helper-functions.h>
 #include <dali-toolkit/internal/text/decorator/text-decorator.h>
-#include <dali-toolkit/internal/text/text-controller.h>
+#include <dali-toolkit/internal/text/controller/text-controller.h>
 
 namespace Dali
 {
diff --git a/dali-toolkit/internal/visuals/text/text-visual.h b/dali-toolkit/internal/visuals/text/text-visual.h
index 05d1585..c81fbce 100644
--- a/dali-toolkit/internal/visuals/text/text-visual.h
+++ b/dali-toolkit/internal/visuals/text/text-visual.h
@@ -25,8 +25,8 @@
 #include <dali/public-api/rendering/visual-renderer.h>
 
 // INTERNAL INCLUDES
+#include <dali-toolkit/internal/text/controller/text-controller.h>
 #include <dali-toolkit/internal/text/rendering/text-typesetter.h>
-#include <dali-toolkit/internal/text/text-controller.h>
 #include <dali-toolkit/internal/visuals/text-visual-shader-factory.h>
 #include <dali-toolkit/internal/visuals/visual-base-impl.h>