diff --git a/global.inc.php.tpl b/global.inc.php.tpl
index 83196a2734..7ad77d44a9 100644
--- a/global.inc.php.tpl
+++ b/global.inc.php.tpl
@@ -68,6 +68,7 @@
 	define('ONPHP_CORE_PATH', ONPHP_ROOT_PATH.'core'.DIRECTORY_SEPARATOR);
 	define('ONPHP_MAIN_PATH', ONPHP_ROOT_PATH.'main'.DIRECTORY_SEPARATOR);
 	define('ONPHP_META_PATH', ONPHP_ROOT_PATH.'meta'.DIRECTORY_SEPARATOR);
+	define('ONPHP_UI_PATH', ONPHP_ROOT_PATH.'UI'.DIRECTORY_SEPARATOR);
 	
 	if (!defined('ONPHP_META_PATH'))
 		define(
@@ -141,6 +142,9 @@
 		.ONPHP_MAIN_PATH.'EntityProto'.DIRECTORY_SEPARATOR.'Accessors'.PATH_SEPARATOR
 		
 		.ONPHP_MAIN_PATH.'UnifiedContainer'.PATH_SEPARATOR
+
+		.ONPHP_MAIN_PATH.'UI'.PATH_SEPARATOR
+		.ONPHP_MAIN_PATH.'UI'.DIRECTORY_SEPARATOR.'View'.PATH_SEPARATOR
 		
 		.ONPHP_MAIN_PATH.'Utils'		.PATH_SEPARATOR
 		.ONPHP_MAIN_PATH.'Utils'.DIRECTORY_SEPARATOR.'TuringTest'.PATH_SEPARATOR
diff --git a/main/Flow/CleanRedirectView.class.php b/main/UI/View/CleanRedirectView.class.php
similarity index 100%
rename from main/Flow/CleanRedirectView.class.php
rename to main/UI/View/CleanRedirectView.class.php
diff --git a/main/Flow/DebugPhpView.class.php b/main/UI/View/DebugPhpView.class.php
similarity index 100%
rename from main/Flow/DebugPhpView.class.php
rename to main/UI/View/DebugPhpView.class.php
diff --git a/main/Flow/EmptyGifView.class.php b/main/UI/View/EmptyGifView.class.php
similarity index 100%
rename from main/Flow/EmptyGifView.class.php
rename to main/UI/View/EmptyGifView.class.php
diff --git a/main/Flow/EmptyView.class.php b/main/UI/View/EmptyView.class.php
similarity index 100%
rename from main/Flow/EmptyView.class.php
rename to main/UI/View/EmptyView.class.php
diff --git a/main/Flow/HttpErrorView.class.php b/main/UI/View/HttpErrorView.class.php
similarity index 100%
rename from main/Flow/HttpErrorView.class.php
rename to main/UI/View/HttpErrorView.class.php
diff --git a/main/Flow/JsonView.class.php b/main/UI/View/JsonView.class.php
similarity index 100%
rename from main/Flow/JsonView.class.php
rename to main/UI/View/JsonView.class.php
diff --git a/main/Flow/MultiPrefixPhpViewResolver.class.php b/main/UI/View/MultiPrefixPhpViewResolver.class.php
similarity index 100%
rename from main/Flow/MultiPrefixPhpViewResolver.class.php
rename to main/UI/View/MultiPrefixPhpViewResolver.class.php
diff --git a/main/Flow/PartViewer.class.php b/main/UI/View/PartViewer.class.php
similarity index 100%
rename from main/Flow/PartViewer.class.php
rename to main/UI/View/PartViewer.class.php
diff --git a/main/Flow/PhpViewResolver.class.php b/main/UI/View/PhpViewResolver.class.php
similarity index 100%
rename from main/Flow/PhpViewResolver.class.php
rename to main/UI/View/PhpViewResolver.class.php
diff --git a/main/Flow/RedirectToView.class.php b/main/UI/View/RedirectToView.class.php
similarity index 100%
rename from main/Flow/RedirectToView.class.php
rename to main/UI/View/RedirectToView.class.php
diff --git a/main/Flow/RedirectView.class.php b/main/UI/View/RedirectView.class.php
similarity index 100%
rename from main/Flow/RedirectView.class.php
rename to main/UI/View/RedirectView.class.php
diff --git a/main/Flow/SimplePhpView.class.php b/main/UI/View/SimplePhpView.class.php
similarity index 100%
rename from main/Flow/SimplePhpView.class.php
rename to main/UI/View/SimplePhpView.class.php
diff --git a/main/Flow/View.class.php b/main/UI/View/View.class.php
similarity index 100%
rename from main/Flow/View.class.php
rename to main/UI/View/View.class.php
diff --git a/main/Flow/ViewResolver.class.php b/main/UI/View/ViewResolver.class.php
similarity index 100%
rename from main/Flow/ViewResolver.class.php
rename to main/UI/View/ViewResolver.class.php