From 3e7c41bc533ab7b101f0ec8b438d0b474353b0aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Tuong?=
 <tuong@users.noreply.github.com>
Date: Sat, 9 May 2020 09:51:45 +0000
Subject: [PATCH] move sessions to a separate directory

git-svn-id: https://projects.brucker.ch/hol-testgen/svn/HOL-TestGen/trunk/hol-testgen@14180 3260e6d1-4efc-4170-b0a7-36055960796d
---
 Citadelle/ROOT                                 |  2 +-
 .../Employee_Model/Analysis/Analysis_UML.thy   |  2 +-
 .../Employee_Model/Design/Design_UML.thy       |  2 +-
 Citadelle/examples/archive/Toy_deep.thy        |  4 ++--
 .../empirical_evaluation/Class_model.thy       |  4 ++--
 .../Tree_01_00_deep_self.thy                   |  2 +-
 .../Tree_01_00_shallow.thy                     |  2 +-
 .../Tree_01_01_deep_self.thy                   |  2 +-
 .../Tree_01_01_shallow.thy                     |  2 +-
 .../Tree_01_02_deep_self.thy                   |  2 +-
 .../Tree_01_02_shallow.thy                     |  2 +-
 .../Tree_01_03_deep_self.thy                   |  2 +-
 .../Tree_01_03_shallow.thy                     |  2 +-
 .../Tree_01_04_deep_self.thy                   |  2 +-
 .../Tree_01_04_shallow.thy                     |  2 +-
 .../Tree_01_05_deep_self.thy                   |  2 +-
 .../Tree_01_05_shallow.thy                     |  2 +-
 .../Tree_01_06_deep_self.thy                   |  2 +-
 .../Tree_01_06_shallow.thy                     |  2 +-
 .../Tree_01_07_deep_self.thy                   |  2 +-
 .../Tree_01_07_shallow.thy                     |  2 +-
 .../Tree_01_12_deep_self.thy                   |  2 +-
 .../Tree_01_12_shallow.thy                     |  2 +-
 .../Tree_01_14_deep_self.thy                   |  2 +-
 .../Tree_01_14_shallow.thy                     |  2 +-
 .../Tree_01_20_deep_self.thy                   |  2 +-
 .../Tree_01_20_shallow.thy                     |  2 +-
 .../Tree_01_30_deep_self.thy                   |  2 +-
 .../Tree_01_30_shallow.thy                     |  2 +-
 .../Tree_01_39_deep_self.thy                   |  2 +-
 .../Tree_01_39_shallow.thy                     |  2 +-
 .../Tree_01_42_deep_self.thy                   |  2 +-
 .../Tree_01_42_shallow.thy                     |  2 +-
 .../Tree_01_56_deep_self.thy                   |  2 +-
 .../Tree_01_56_shallow.thy                     |  2 +-
 .../Tree_02_01_deep_self.thy                   |  2 +-
 .../Tree_02_01_shallow.thy                     |  2 +-
 .../Tree_02_02_deep_self.thy                   |  2 +-
 .../Tree_02_02_shallow.thy                     |  2 +-
 .../Tree_02_03_deep_self.thy                   |  2 +-
 .../Tree_02_03_shallow.thy                     |  2 +-
 .../Tree_02_04_deep_self.thy                   |  2 +-
 .../Tree_02_04_shallow.thy                     |  2 +-
 .../Tree_03_01_deep_self.thy                   |  2 +-
 .../Tree_03_01_shallow.thy                     |  2 +-
 .../Tree_03_02_deep_self.thy                   |  2 +-
 .../Tree_03_02_shallow.thy                     |  2 +-
 .../Tree_03_03_deep_self.thy                   |  2 +-
 .../Tree_03_03_shallow.thy                     |  2 +-
 .../Tree_04_01_deep_self.thy                   |  2 +-
 .../Tree_04_01_shallow.thy                     |  2 +-
 .../Tree_04_02_deep_self.thy                   |  2 +-
 .../Tree_04_02_shallow.thy                     |  2 +-
 .../Tree_05_01_deep_self.thy                   |  2 +-
 .../Tree_05_01_shallow.thy                     |  2 +-
 .../Tree_05_02_deep_self.thy                   |  2 +-
 .../Tree_05_02_shallow.thy                     |  2 +-
 .../Tree_06_01_deep_self.thy                   |  2 +-
 .../Tree_06_01_shallow.thy                     |  2 +-
 .../Tree_06_02_deep_self.thy                   |  2 +-
 .../Tree_06_02_shallow.thy                     |  2 +-
 .../Tree_07_01_deep_self.thy                   |  2 +-
 .../Tree_07_01_shallow.thy                     |  2 +-
 .../Tree_07_02_deep_self.thy                   |  2 +-
 .../Tree_07_02_shallow.thy                     |  2 +-
 .../Tree_12_01_deep_self.thy                   |  2 +-
 .../Tree_12_01_shallow.thy                     |  2 +-
 .../Tree_14_01_deep_self.thy                   |  2 +-
 .../Tree_14_01_shallow.thy                     |  2 +-
 .../Tree_20_01_deep_self.thy                   |  2 +-
 .../Tree_20_01_shallow.thy                     |  2 +-
 .../Tree_30_01_deep_self.thy                   |  2 +-
 .../Tree_30_01_shallow.thy                     |  2 +-
 .../Tree_39_01_deep_self.thy                   |  2 +-
 .../Tree_39_01_shallow.thy                     |  2 +-
 .../Tree_42_01_deep_self.thy                   |  2 +-
 .../Tree_42_01_shallow.thy                     |  2 +-
 .../Tree_56_01_deep_self.thy                   |  2 +-
 .../Tree_56_01_shallow.thy                     |  2 +-
 Citadelle/src/UML_OCL.thy                      |  2 +-
 Citadelle/src/basic_types/UML_Boolean.thy      |  2 +-
 Citadelle/src/basic_types/UML_Integer.thy      |  2 +-
 Citadelle/src/basic_types/UML_Real.thy         |  2 +-
 Citadelle/src/basic_types/UML_String.thy       |  2 +-
 Citadelle/src/basic_types/UML_Void.thy         |  2 +-
 Citadelle/src/collection_types/UML_Pair.thy    |  2 +-
 Citadelle/src/{ => uml_main}/UML_Contracts.thy |  0
 Citadelle/src/{ => uml_main}/UML_Library.thy   | 18 +++++++++---------
 Citadelle/src/{ => uml_main}/UML_Logic.thy     |  0
 Citadelle/src/{ => uml_main}/UML_Main.thy      |  0
 .../{ => uml_main}/UML_PropertyProfiles.thy    |  0
 Citadelle/src/{ => uml_main}/UML_State.thy     |  0
 Citadelle/src/{ => uml_main}/UML_Tools.thy     |  0
 Citadelle/src/{ => uml_main}/UML_Types.thy     |  0
 94 files changed, 97 insertions(+), 97 deletions(-)
 rename Citadelle/src/{ => uml_main}/UML_Contracts.thy (100%)
 rename Citadelle/src/{ => uml_main}/UML_Library.thy (98%)
 rename Citadelle/src/{ => uml_main}/UML_Logic.thy (100%)
 rename Citadelle/src/{ => uml_main}/UML_Main.thy (100%)
 rename Citadelle/src/{ => uml_main}/UML_PropertyProfiles.thy (100%)
 rename Citadelle/src/{ => uml_main}/UML_State.thy (100%)
 rename Citadelle/src/{ => uml_main}/UML_Tools.thy (100%)
 rename Citadelle/src/{ => uml_main}/UML_Types.thy (100%)

diff --git a/Citadelle/ROOT b/Citadelle/ROOT
index 8d5b9307490..74c8550b142 100644
--- a/Citadelle/ROOT
+++ b/Citadelle/ROOT
@@ -46,7 +46,7 @@ session OCL in src = HOL +
            document_variants="annex-a=annexa,-theory,-afp,-noexample,-proof,-ML:document=afp,-annexa,-noexample:outline=-annexa,-noexample,afp,/proof,/ML",
            show_question_marks = false]
   theories
-    "../src/UML_Main"
+    "../src/uml_main/UML_Main"
     "../examples/Employee_Model/Analysis/Analysis_OCL"
     "../examples/Employee_Model/Design/Design_OCL"
   document_files
diff --git a/Citadelle/examples/Employee_Model/Analysis/Analysis_UML.thy b/Citadelle/examples/Employee_Model/Analysis/Analysis_UML.thy
index 213bd268028..3185ad06c38 100644
--- a/Citadelle/examples/Employee_Model/Analysis/Analysis_UML.thy
+++ b/Citadelle/examples/Employee_Model/Analysis/Analysis_UML.thy
@@ -51,7 +51,7 @@ chapter{* Example: The Employee Analysis Model *} (* UML part *)
 theory
   Analysis_UML
 imports
-  "../../../src/UML_Main"
+  "../../../src/uml_main/UML_Main"
 begin
 
 text {* \label{ex:employee-analysis:uml} *}
diff --git a/Citadelle/examples/Employee_Model/Design/Design_UML.thy b/Citadelle/examples/Employee_Model/Design/Design_UML.thy
index 829747774b6..9b082c566f3 100644
--- a/Citadelle/examples/Employee_Model/Design/Design_UML.thy
+++ b/Citadelle/examples/Employee_Model/Design/Design_UML.thy
@@ -51,7 +51,7 @@ chapter{* Example: The Employee Design Model *} (* UML part *)
 theory
   Design_UML
 imports
-  "../../../src/UML_Main"
+  "../../../src/uml_main/UML_Main"
 begin
 
 text {* \label{ex:employee-design:uml} *}
diff --git a/Citadelle/examples/archive/Toy_deep.thy b/Citadelle/examples/archive/Toy_deep.thy
index b25d579a2aa..6b5d9ed8281 100644
--- a/Citadelle/examples/archive/Toy_deep.thy
+++ b/Citadelle/examples/archive/Toy_deep.thy
@@ -71,7 +71,7 @@ to see the differences of imported theories, and which ones to manually import
 generation_syntax [ (*deep
                       (generation_semantics [ design (*, oid_start 10*) ])
                       (THEORY Toy_generated)
-                      (IMPORTS ["../src/UML_Main", "../src/compiler/Static"]
+                      (IMPORTS ["../src/uml_main/UML_Main", "../src/compiler/Static"]
                                "../src/compiler/Generator_dynamic_sequential")
                       SECTION
                       (*SORRY*) (*no_dirty*)
@@ -89,7 +89,7 @@ generation_syntax
   [ deep
       (generation_semantics [ design ])
       (THEORY Design_generated)
-      (IMPORTS ["../src/UML_Main", "../src/compiler/Static"]
+      (IMPORTS ["../src/uml_main/UML_Main", "../src/compiler/Static"]
                "../src/compiler/Generator_dynamic_sequential")
       SECTION
       (*SORRY*) (*no_dirty*)
diff --git a/Citadelle/examples/empirical_evaluation/Class_model.thy b/Citadelle/examples/empirical_evaluation/Class_model.thy
index e2f7af288d2..6c87ca599db 100644
--- a/Citadelle/examples/empirical_evaluation/Class_model.thy
+++ b/Citadelle/examples/empirical_evaluation/Class_model.thy
@@ -86,14 +86,14 @@ definition \<open>print_abr sprintf_int write_file =
                         ,            \<open>                      (generation_semantics [ analysis (*, oid_start 10*) ])\<close>
                         ,            \<open>                      skip_export\<close>
                         , S.flatten [\<open>                      (THEORY \<close>, tree_name, \<open>_generated\<close>, \<open>_\<close>, comp, \<open>)\<close>]
-                        , S.flatten [\<open>                      (IMPORTS ["../../../src/UML_Main", "../../../src/compiler/Static"]\<close>]
+                        , S.flatten [\<open>                      (IMPORTS ["../../../src/uml_main/UML_Main", "../../../src/compiler/Static"]\<close>]
                         , S.flatten [\<open>                               "../../../src/compiler/Generator_dynamic_sequential")\<close>]
                         ,            \<open>                      SECTION\<close>
                         , S.flatten [\<open>                      [ in \<close>, comp, \<open> \<close>, comp2, \<open> ]\<close>]
                         , S.flatten [\<open>                      (output_directory "./doc") ]\<close>] ]
         , S_flatten_n [ \<open>generation_syntax deep flush_all\<close> ])
       , ( (\<open>shallow\<close>, [(\<open>\<close>, \<open>\<close>)])
-        , S.flatten [ \<open>"../../src/UML_Main"\<close>, \<open> \<close>
+        , S.flatten [ \<open>"../../src/uml_main/UML_Main"\<close>, \<open> \<close>
                     , \<open>"../../src/compiler/Static"\<close>  ]
         , \<lambda>_ _. S_flatten_n [ \<open>generation_syntax [ shallow (generation_semantics [ analysis ]) ]\<close> ]
         , \<open>End!\<close>) ]))\<close>
diff --git a/Citadelle/examples/empirical_evaluation/Tree_01_00_deep_self.thy b/Citadelle/examples/empirical_evaluation/Tree_01_00_deep_self.thy
index a689d158ba3..cb3217ee390 100644
--- a/Citadelle/examples/empirical_evaluation/Tree_01_00_deep_self.thy
+++ b/Citadelle/examples/empirical_evaluation/Tree_01_00_deep_self.thy
@@ -3,7 +3,7 @@ generation_syntax [ deep
                       (generation_semantics [ analysis (*, oid_start 10*) ])
                       skip_export
                       (THEORY Tree_01_00_generated_self)
-                      (IMPORTS ["../../../src/UML_Main", "../../../src/compiler/Static"]
+                      (IMPORTS ["../../../src/uml_main/UML_Main", "../../../src/compiler/Static"]
                                "../../../src/compiler/Generator_dynamic_sequential")
                       SECTION
                       [ in self  ]
diff --git a/Citadelle/examples/empirical_evaluation/Tree_01_00_shallow.thy b/Citadelle/examples/empirical_evaluation/Tree_01_00_shallow.thy
index 40a78880709..2126c0c99a9 100644
--- a/Citadelle/examples/empirical_evaluation/Tree_01_00_shallow.thy
+++ b/Citadelle/examples/empirical_evaluation/Tree_01_00_shallow.thy
@@ -1,4 +1,4 @@
-theory Tree_01_00_shallow imports "../../src/UML_Main" "../../src/compiler/Static" "../../src/compiler/Generator_dynamic_sequential" begin
+theory Tree_01_00_shallow imports "../../src/uml_main/UML_Main" "../../src/compiler/Static" "../../src/compiler/Generator_dynamic_sequential" begin
 generation_syntax [ shallow (generation_semantics [ analysis ]) ]
 
 
diff --git a/Citadelle/examples/empirical_evaluation/Tree_01_01_deep_self.thy b/Citadelle/examples/empirical_evaluation/Tree_01_01_deep_self.thy
index 46878946168..51464782900 100644
--- a/Citadelle/examples/empirical_evaluation/Tree_01_01_deep_self.thy
+++ b/Citadelle/examples/empirical_evaluation/Tree_01_01_deep_self.thy
@@ -3,7 +3,7 @@ generation_syntax [ deep
                       (generation_semantics [ analysis (*, oid_start 10*) ])
                       skip_export
                       (THEORY Tree_01_01_generated_self)
-                      (IMPORTS ["../../../src/UML_Main", "../../../src/compiler/Static"]
+                      (IMPORTS ["../../../src/uml_main/UML_Main", "../../../src/compiler/Static"]
                                "../../../src/compiler/Generator_dynamic_sequential")
                       SECTION
                       [ in self  ]
diff --git a/Citadelle/examples/empirical_evaluation/Tree_01_01_shallow.thy b/Citadelle/examples/empirical_evaluation/Tree_01_01_shallow.thy
index c07ce6092e9..0537cd00dce 100644
--- a/Citadelle/examples/empirical_evaluation/Tree_01_01_shallow.thy
+++ b/Citadelle/examples/empirical_evaluation/Tree_01_01_shallow.thy
@@ -1,4 +1,4 @@
-theory Tree_01_01_shallow imports "../../src/UML_Main" "../../src/compiler/Static" "../../src/compiler/Generator_dynamic_sequential" begin
+theory Tree_01_01_shallow imports "../../src/uml_main/UML_Main" "../../src/compiler/Static" "../../src/compiler/Generator_dynamic_sequential" begin
 generation_syntax [ shallow (generation_semantics [ analysis ]) ]
 
 Class Aazz End
diff --git a/Citadelle/examples/empirical_evaluation/Tree_01_02_deep_self.thy b/Citadelle/examples/empirical_evaluation/Tree_01_02_deep_self.thy
index 0c6dcf4a657..065fd7da0c0 100644
--- a/Citadelle/examples/empirical_evaluation/Tree_01_02_deep_self.thy
+++ b/Citadelle/examples/empirical_evaluation/Tree_01_02_deep_self.thy
@@ -3,7 +3,7 @@ generation_syntax [ deep
                       (generation_semantics [ analysis (*, oid_start 10*) ])
                       skip_export
                       (THEORY Tree_01_02_generated_self)
-                      (IMPORTS ["../../../src/UML_Main", "../../../src/compiler/Static"]
+                      (IMPORTS ["../../../src/uml_main/UML_Main", "../../../src/compiler/Static"]
                                "../../../src/compiler/Generator_dynamic_sequential")
                       SECTION
                       [ in self  ]
diff --git a/Citadelle/examples/empirical_evaluation/Tree_01_02_shallow.thy b/Citadelle/examples/empirical_evaluation/Tree_01_02_shallow.thy
index 762a3552ed1..f37498fd8c7 100644
--- a/Citadelle/examples/empirical_evaluation/Tree_01_02_shallow.thy
+++ b/Citadelle/examples/empirical_evaluation/Tree_01_02_shallow.thy
@@ -1,4 +1,4 @@
-theory Tree_01_02_shallow imports "../../src/UML_Main" "../../src/compiler/Static" "../../src/compiler/Generator_dynamic_sequential" begin
+theory Tree_01_02_shallow imports "../../src/uml_main/UML_Main" "../../src/compiler/Static" "../../src/compiler/Generator_dynamic_sequential" begin
 generation_syntax [ shallow (generation_semantics [ analysis ]) ]
 
 Class Aazz End
diff --git a/Citadelle/examples/empirical_evaluation/Tree_01_03_deep_self.thy b/Citadelle/examples/empirical_evaluation/Tree_01_03_deep_self.thy
index 29c10c57bf4..6284ed2c327 100644
--- a/Citadelle/examples/empirical_evaluation/Tree_01_03_deep_self.thy
+++ b/Citadelle/examples/empirical_evaluation/Tree_01_03_deep_self.thy
@@ -3,7 +3,7 @@ generation_syntax [ deep
                       (generation_semantics [ analysis (*, oid_start 10*) ])
                       skip_export
                       (THEORY Tree_01_03_generated_self)
-                      (IMPORTS ["../../../src/UML_Main", "../../../src/compiler/Static"]
+                      (IMPORTS ["../../../src/uml_main/UML_Main", "../../../src/compiler/Static"]
                                "../../../src/compiler/Generator_dynamic_sequential")
                       SECTION
                       [ in self  ]
diff --git a/Citadelle/examples/empirical_evaluation/Tree_01_03_shallow.thy b/Citadelle/examples/empirical_evaluation/Tree_01_03_shallow.thy
index 45f404ccf2d..c2b01ba5b99 100644
--- a/Citadelle/examples/empirical_evaluation/Tree_01_03_shallow.thy
+++ b/Citadelle/examples/empirical_evaluation/Tree_01_03_shallow.thy
@@ -1,4 +1,4 @@
-theory Tree_01_03_shallow imports "../../src/UML_Main" "../../src/compiler/Static" "../../src/compiler/Generator_dynamic_sequential" begin
+theory Tree_01_03_shallow imports "../../src/uml_main/UML_Main" "../../src/compiler/Static" "../../src/compiler/Generator_dynamic_sequential" begin
 generation_syntax [ shallow (generation_semantics [ analysis ]) ]
 
 Class Aazz End
diff --git a/Citadelle/examples/empirical_evaluation/Tree_01_04_deep_self.thy b/Citadelle/examples/empirical_evaluation/Tree_01_04_deep_self.thy
index cc0f462d1ac..e33b664fe07 100644
--- a/Citadelle/examples/empirical_evaluation/Tree_01_04_deep_self.thy
+++ b/Citadelle/examples/empirical_evaluation/Tree_01_04_deep_self.thy
@@ -3,7 +3,7 @@ generation_syntax [ deep
                       (generation_semantics [ analysis (*, oid_start 10*) ])
                       skip_export
                       (THEORY Tree_01_04_generated_self)
-                      (IMPORTS ["../../../src/UML_Main", "../../../src/compiler/Static"]
+                      (IMPORTS ["../../../src/uml_main/UML_Main", "../../../src/compiler/Static"]
                                "../../../src/compiler/Generator_dynamic_sequential")
                       SECTION
                       [ in self  ]
diff --git a/Citadelle/examples/empirical_evaluation/Tree_01_04_shallow.thy b/Citadelle/examples/empirical_evaluation/Tree_01_04_shallow.thy
index e936c9f6609..fe476c59d1c 100644
--- a/Citadelle/examples/empirical_evaluation/Tree_01_04_shallow.thy
+++ b/Citadelle/examples/empirical_evaluation/Tree_01_04_shallow.thy
@@ -1,4 +1,4 @@
-theory Tree_01_04_shallow imports "../../src/UML_Main" "../../src/compiler/Static" "../../src/compiler/Generator_dynamic_sequential" begin
+theory Tree_01_04_shallow imports "../../src/uml_main/UML_Main" "../../src/compiler/Static" "../../src/compiler/Generator_dynamic_sequential" begin
 generation_syntax [ shallow (generation_semantics [ analysis ]) ]
 
 Class Aazz End
diff --git a/Citadelle/examples/empirical_evaluation/Tree_01_05_deep_self.thy b/Citadelle/examples/empirical_evaluation/Tree_01_05_deep_self.thy
index 5423deb8e80..6dfb3e6a594 100644
--- a/Citadelle/examples/empirical_evaluation/Tree_01_05_deep_self.thy
+++ b/Citadelle/examples/empirical_evaluation/Tree_01_05_deep_self.thy
@@ -3,7 +3,7 @@ generation_syntax [ deep
                       (generation_semantics [ analysis (*, oid_start 10*) ])
                       skip_export
                       (THEORY Tree_01_05_generated_self)
-                      (IMPORTS ["../../../src/UML_Main", "../../../src/compiler/Static"]
+                      (IMPORTS ["../../../src/uml_main/UML_Main", "../../../src/compiler/Static"]
                                "../../../src/compiler/Generator_dynamic_sequential")
                       SECTION
                       [ in self  ]
diff --git a/Citadelle/examples/empirical_evaluation/Tree_01_05_shallow.thy b/Citadelle/examples/empirical_evaluation/Tree_01_05_shallow.thy
index b03b69f069b..856a03e53f8 100644
--- a/Citadelle/examples/empirical_evaluation/Tree_01_05_shallow.thy
+++ b/Citadelle/examples/empirical_evaluation/Tree_01_05_shallow.thy
@@ -1,4 +1,4 @@
-theory Tree_01_05_shallow imports "../../src/UML_Main" "../../src/compiler/Static" "../../src/compiler/Generator_dynamic_sequential" begin
+theory Tree_01_05_shallow imports "../../src/uml_main/UML_Main" "../../src/compiler/Static" "../../src/compiler/Generator_dynamic_sequential" begin
 generation_syntax [ shallow (generation_semantics [ analysis ]) ]
 
 Class Aazz End
diff --git a/Citadelle/examples/empirical_evaluation/Tree_01_06_deep_self.thy b/Citadelle/examples/empirical_evaluation/Tree_01_06_deep_self.thy
index ee05c260fbb..30c0275e4ab 100644
--- a/Citadelle/examples/empirical_evaluation/Tree_01_06_deep_self.thy
+++ b/Citadelle/examples/empirical_evaluation/Tree_01_06_deep_self.thy
@@ -3,7 +3,7 @@ generation_syntax [ deep
                       (generation_semantics [ analysis (*, oid_start 10*) ])
                       skip_export
                       (THEORY Tree_01_06_generated_self)
-                      (IMPORTS ["../../../src/UML_Main", "../../../src/compiler/Static"]
+                      (IMPORTS ["../../../src/uml_main/UML_Main", "../../../src/compiler/Static"]
                                "../../../src/compiler/Generator_dynamic_sequential")
                       SECTION
                       [ in self  ]
diff --git a/Citadelle/examples/empirical_evaluation/Tree_01_06_shallow.thy b/Citadelle/examples/empirical_evaluation/Tree_01_06_shallow.thy
index 031c8621a45..3360f397388 100644
--- a/Citadelle/examples/empirical_evaluation/Tree_01_06_shallow.thy
+++ b/Citadelle/examples/empirical_evaluation/Tree_01_06_shallow.thy
@@ -1,4 +1,4 @@
-theory Tree_01_06_shallow imports "../../src/UML_Main" "../../src/compiler/Static" "../../src/compiler/Generator_dynamic_sequential" begin
+theory Tree_01_06_shallow imports "../../src/uml_main/UML_Main" "../../src/compiler/Static" "../../src/compiler/Generator_dynamic_sequential" begin
 generation_syntax [ shallow (generation_semantics [ analysis ]) ]
 
 Class Aazz End
diff --git a/Citadelle/examples/empirical_evaluation/Tree_01_07_deep_self.thy b/Citadelle/examples/empirical_evaluation/Tree_01_07_deep_self.thy
index 3f631935423..25cb9d141ac 100644
--- a/Citadelle/examples/empirical_evaluation/Tree_01_07_deep_self.thy
+++ b/Citadelle/examples/empirical_evaluation/Tree_01_07_deep_self.thy
@@ -3,7 +3,7 @@ generation_syntax [ deep
                       (generation_semantics [ analysis (*, oid_start 10*) ])
                       skip_export
                       (THEORY Tree_01_07_generated_self)
-                      (IMPORTS ["../../../src/UML_Main", "../../../src/compiler/Static"]
+                      (IMPORTS ["../../../src/uml_main/UML_Main", "../../../src/compiler/Static"]
                                "../../../src/compiler/Generator_dynamic_sequential")
                       SECTION
                       [ in self  ]
diff --git a/Citadelle/examples/empirical_evaluation/Tree_01_07_shallow.thy b/Citadelle/examples/empirical_evaluation/Tree_01_07_shallow.thy
index 7440f961722..f692537f345 100644
--- a/Citadelle/examples/empirical_evaluation/Tree_01_07_shallow.thy
+++ b/Citadelle/examples/empirical_evaluation/Tree_01_07_shallow.thy
@@ -1,4 +1,4 @@
-theory Tree_01_07_shallow imports "../../src/UML_Main" "../../src/compiler/Static" "../../src/compiler/Generator_dynamic_sequential" begin
+theory Tree_01_07_shallow imports "../../src/uml_main/UML_Main" "../../src/compiler/Static" "../../src/compiler/Generator_dynamic_sequential" begin
 generation_syntax [ shallow (generation_semantics [ analysis ]) ]
 
 Class Aazz End
diff --git a/Citadelle/examples/empirical_evaluation/Tree_01_12_deep_self.thy b/Citadelle/examples/empirical_evaluation/Tree_01_12_deep_self.thy
index 97defe1e447..a1130533912 100644
--- a/Citadelle/examples/empirical_evaluation/Tree_01_12_deep_self.thy
+++ b/Citadelle/examples/empirical_evaluation/Tree_01_12_deep_self.thy
@@ -3,7 +3,7 @@ generation_syntax [ deep
                       (generation_semantics [ analysis (*, oid_start 10*) ])
                       skip_export
                       (THEORY Tree_01_12_generated_self)
-                      (IMPORTS ["../../../src/UML_Main", "../../../src/compiler/Static"]
+                      (IMPORTS ["../../../src/uml_main/UML_Main", "../../../src/compiler/Static"]
                                "../../../src/compiler/Generator_dynamic_sequential")
                       SECTION
                       [ in self  ]
diff --git a/Citadelle/examples/empirical_evaluation/Tree_01_12_shallow.thy b/Citadelle/examples/empirical_evaluation/Tree_01_12_shallow.thy
index 50ca01efbe4..e48924f8292 100644
--- a/Citadelle/examples/empirical_evaluation/Tree_01_12_shallow.thy
+++ b/Citadelle/examples/empirical_evaluation/Tree_01_12_shallow.thy
@@ -1,4 +1,4 @@
-theory Tree_01_12_shallow imports "../../src/UML_Main" "../../src/compiler/Static" "../../src/compiler/Generator_dynamic_sequential" begin
+theory Tree_01_12_shallow imports "../../src/uml_main/UML_Main" "../../src/compiler/Static" "../../src/compiler/Generator_dynamic_sequential" begin
 generation_syntax [ shallow (generation_semantics [ analysis ]) ]
 
 Class Aazz End
diff --git a/Citadelle/examples/empirical_evaluation/Tree_01_14_deep_self.thy b/Citadelle/examples/empirical_evaluation/Tree_01_14_deep_self.thy
index 4f9ee9e87e1..2f7f6335a79 100644
--- a/Citadelle/examples/empirical_evaluation/Tree_01_14_deep_self.thy
+++ b/Citadelle/examples/empirical_evaluation/Tree_01_14_deep_self.thy
@@ -3,7 +3,7 @@ generation_syntax [ deep
                       (generation_semantics [ analysis (*, oid_start 10*) ])
                       skip_export
                       (THEORY Tree_01_14_generated_self)
-                      (IMPORTS ["../../../src/UML_Main", "../../../src/compiler/Static"]
+                      (IMPORTS ["../../../src/uml_main/UML_Main", "../../../src/compiler/Static"]
                                "../../../src/compiler/Generator_dynamic_sequential")
                       SECTION
                       [ in self  ]
diff --git a/Citadelle/examples/empirical_evaluation/Tree_01_14_shallow.thy b/Citadelle/examples/empirical_evaluation/Tree_01_14_shallow.thy
index 5f117645820..249f2466deb 100644
--- a/Citadelle/examples/empirical_evaluation/Tree_01_14_shallow.thy
+++ b/Citadelle/examples/empirical_evaluation/Tree_01_14_shallow.thy
@@ -1,4 +1,4 @@
-theory Tree_01_14_shallow imports "../../src/UML_Main" "../../src/compiler/Static" "../../src/compiler/Generator_dynamic_sequential" begin
+theory Tree_01_14_shallow imports "../../src/uml_main/UML_Main" "../../src/compiler/Static" "../../src/compiler/Generator_dynamic_sequential" begin
 generation_syntax [ shallow (generation_semantics [ analysis ]) ]
 
 Class Aazz End
diff --git a/Citadelle/examples/empirical_evaluation/Tree_01_20_deep_self.thy b/Citadelle/examples/empirical_evaluation/Tree_01_20_deep_self.thy
index e27ab0f1404..0006e9718db 100644
--- a/Citadelle/examples/empirical_evaluation/Tree_01_20_deep_self.thy
+++ b/Citadelle/examples/empirical_evaluation/Tree_01_20_deep_self.thy
@@ -3,7 +3,7 @@ generation_syntax [ deep
                       (generation_semantics [ analysis (*, oid_start 10*) ])
                       skip_export
                       (THEORY Tree_01_20_generated_self)
-                      (IMPORTS ["../../../src/UML_Main", "../../../src/compiler/Static"]
+                      (IMPORTS ["../../../src/uml_main/UML_Main", "../../../src/compiler/Static"]
                                "../../../src/compiler/Generator_dynamic_sequential")
                       SECTION
                       [ in self  ]
diff --git a/Citadelle/examples/empirical_evaluation/Tree_01_20_shallow.thy b/Citadelle/examples/empirical_evaluation/Tree_01_20_shallow.thy
index 9e6e6d3d2b8..d8a021de011 100644
--- a/Citadelle/examples/empirical_evaluation/Tree_01_20_shallow.thy
+++ b/Citadelle/examples/empirical_evaluation/Tree_01_20_shallow.thy
@@ -1,4 +1,4 @@
-theory Tree_01_20_shallow imports "../../src/UML_Main" "../../src/compiler/Static" "../../src/compiler/Generator_dynamic_sequential" begin
+theory Tree_01_20_shallow imports "../../src/uml_main/UML_Main" "../../src/compiler/Static" "../../src/compiler/Generator_dynamic_sequential" begin
 generation_syntax [ shallow (generation_semantics [ analysis ]) ]
 
 Class Aazz End
diff --git a/Citadelle/examples/empirical_evaluation/Tree_01_30_deep_self.thy b/Citadelle/examples/empirical_evaluation/Tree_01_30_deep_self.thy
index 3dadc34d688..8ea92a38e6a 100644
--- a/Citadelle/examples/empirical_evaluation/Tree_01_30_deep_self.thy
+++ b/Citadelle/examples/empirical_evaluation/Tree_01_30_deep_self.thy
@@ -3,7 +3,7 @@ generation_syntax [ deep
                       (generation_semantics [ analysis (*, oid_start 10*) ])
                       skip_export
                       (THEORY Tree_01_30_generated_self)
-                      (IMPORTS ["../../../src/UML_Main", "../../../src/compiler/Static"]
+                      (IMPORTS ["../../../src/uml_main/UML_Main", "../../../src/compiler/Static"]
                                "../../../src/compiler/Generator_dynamic_sequential")
                       SECTION
                       [ in self  ]
diff --git a/Citadelle/examples/empirical_evaluation/Tree_01_30_shallow.thy b/Citadelle/examples/empirical_evaluation/Tree_01_30_shallow.thy
index 0d3c30e32b9..11f9f74e5dd 100644
--- a/Citadelle/examples/empirical_evaluation/Tree_01_30_shallow.thy
+++ b/Citadelle/examples/empirical_evaluation/Tree_01_30_shallow.thy
@@ -1,4 +1,4 @@
-theory Tree_01_30_shallow imports "../../src/UML_Main" "../../src/compiler/Static" "../../src/compiler/Generator_dynamic_sequential" begin
+theory Tree_01_30_shallow imports "../../src/uml_main/UML_Main" "../../src/compiler/Static" "../../src/compiler/Generator_dynamic_sequential" begin
 generation_syntax [ shallow (generation_semantics [ analysis ]) ]
 
 Class Aazz End
diff --git a/Citadelle/examples/empirical_evaluation/Tree_01_39_deep_self.thy b/Citadelle/examples/empirical_evaluation/Tree_01_39_deep_self.thy
index 315b00198d8..7bcd55a4307 100644
--- a/Citadelle/examples/empirical_evaluation/Tree_01_39_deep_self.thy
+++ b/Citadelle/examples/empirical_evaluation/Tree_01_39_deep_self.thy
@@ -3,7 +3,7 @@ generation_syntax [ deep
                       (generation_semantics [ analysis (*, oid_start 10*) ])
                       skip_export
                       (THEORY Tree_01_39_generated_self)
-                      (IMPORTS ["../../../src/UML_Main", "../../../src/compiler/Static"]
+                      (IMPORTS ["../../../src/uml_main/UML_Main", "../../../src/compiler/Static"]
                                "../../../src/compiler/Generator_dynamic_sequential")
                       SECTION
                       [ in self  ]
diff --git a/Citadelle/examples/empirical_evaluation/Tree_01_39_shallow.thy b/Citadelle/examples/empirical_evaluation/Tree_01_39_shallow.thy
index d71c2698356..6a823433b58 100644
--- a/Citadelle/examples/empirical_evaluation/Tree_01_39_shallow.thy
+++ b/Citadelle/examples/empirical_evaluation/Tree_01_39_shallow.thy
@@ -1,4 +1,4 @@
-theory Tree_01_39_shallow imports "../../src/UML_Main" "../../src/compiler/Static" "../../src/compiler/Generator_dynamic_sequential" begin
+theory Tree_01_39_shallow imports "../../src/uml_main/UML_Main" "../../src/compiler/Static" "../../src/compiler/Generator_dynamic_sequential" begin
 generation_syntax [ shallow (generation_semantics [ analysis ]) ]
 
 Class Aazz End
diff --git a/Citadelle/examples/empirical_evaluation/Tree_01_42_deep_self.thy b/Citadelle/examples/empirical_evaluation/Tree_01_42_deep_self.thy
index 97809197ea1..e269067b63f 100644
--- a/Citadelle/examples/empirical_evaluation/Tree_01_42_deep_self.thy
+++ b/Citadelle/examples/empirical_evaluation/Tree_01_42_deep_self.thy
@@ -3,7 +3,7 @@ generation_syntax [ deep
                       (generation_semantics [ analysis (*, oid_start 10*) ])
                       skip_export
                       (THEORY Tree_01_42_generated_self)
-                      (IMPORTS ["../../../src/UML_Main", "../../../src/compiler/Static"]
+                      (IMPORTS ["../../../src/uml_main/UML_Main", "../../../src/compiler/Static"]
                                "../../../src/compiler/Generator_dynamic_sequential")
                       SECTION
                       [ in self  ]
diff --git a/Citadelle/examples/empirical_evaluation/Tree_01_42_shallow.thy b/Citadelle/examples/empirical_evaluation/Tree_01_42_shallow.thy
index f7f1af7956f..4b0ae9f9e44 100644
--- a/Citadelle/examples/empirical_evaluation/Tree_01_42_shallow.thy
+++ b/Citadelle/examples/empirical_evaluation/Tree_01_42_shallow.thy
@@ -1,4 +1,4 @@
-theory Tree_01_42_shallow imports "../../src/UML_Main" "../../src/compiler/Static" "../../src/compiler/Generator_dynamic_sequential" begin
+theory Tree_01_42_shallow imports "../../src/uml_main/UML_Main" "../../src/compiler/Static" "../../src/compiler/Generator_dynamic_sequential" begin
 generation_syntax [ shallow (generation_semantics [ analysis ]) ]
 
 Class Aazz End
diff --git a/Citadelle/examples/empirical_evaluation/Tree_01_56_deep_self.thy b/Citadelle/examples/empirical_evaluation/Tree_01_56_deep_self.thy
index ee4c705626b..6c6be889dd1 100644
--- a/Citadelle/examples/empirical_evaluation/Tree_01_56_deep_self.thy
+++ b/Citadelle/examples/empirical_evaluation/Tree_01_56_deep_self.thy
@@ -3,7 +3,7 @@ generation_syntax [ deep
                       (generation_semantics [ analysis (*, oid_start 10*) ])
                       skip_export
                       (THEORY Tree_01_56_generated_self)
-                      (IMPORTS ["../../../src/UML_Main", "../../../src/compiler/Static"]
+                      (IMPORTS ["../../../src/uml_main/UML_Main", "../../../src/compiler/Static"]
                                "../../../src/compiler/Generator_dynamic_sequential")
                       SECTION
                       [ in self  ]
diff --git a/Citadelle/examples/empirical_evaluation/Tree_01_56_shallow.thy b/Citadelle/examples/empirical_evaluation/Tree_01_56_shallow.thy
index 37e8f6fe7f4..169dc786d48 100644
--- a/Citadelle/examples/empirical_evaluation/Tree_01_56_shallow.thy
+++ b/Citadelle/examples/empirical_evaluation/Tree_01_56_shallow.thy
@@ -1,4 +1,4 @@
-theory Tree_01_56_shallow imports "../../src/UML_Main" "../../src/compiler/Static" "../../src/compiler/Generator_dynamic_sequential" begin
+theory Tree_01_56_shallow imports "../../src/uml_main/UML_Main" "../../src/compiler/Static" "../../src/compiler/Generator_dynamic_sequential" begin
 generation_syntax [ shallow (generation_semantics [ analysis ]) ]
 
 Class Aazz End
diff --git a/Citadelle/examples/empirical_evaluation/Tree_02_01_deep_self.thy b/Citadelle/examples/empirical_evaluation/Tree_02_01_deep_self.thy
index 55bde7bf914..db336d91ea0 100644
--- a/Citadelle/examples/empirical_evaluation/Tree_02_01_deep_self.thy
+++ b/Citadelle/examples/empirical_evaluation/Tree_02_01_deep_self.thy
@@ -3,7 +3,7 @@ generation_syntax [ deep
                       (generation_semantics [ analysis (*, oid_start 10*) ])
                       skip_export
                       (THEORY Tree_02_01_generated_self)
-                      (IMPORTS ["../../../src/UML_Main", "../../../src/compiler/Static"]
+                      (IMPORTS ["../../../src/uml_main/UML_Main", "../../../src/compiler/Static"]
                                "../../../src/compiler/Generator_dynamic_sequential")
                       SECTION
                       [ in self  ]
diff --git a/Citadelle/examples/empirical_evaluation/Tree_02_01_shallow.thy b/Citadelle/examples/empirical_evaluation/Tree_02_01_shallow.thy
index 2c851e62411..d7d1c4ef2ff 100644
--- a/Citadelle/examples/empirical_evaluation/Tree_02_01_shallow.thy
+++ b/Citadelle/examples/empirical_evaluation/Tree_02_01_shallow.thy
@@ -1,4 +1,4 @@
-theory Tree_02_01_shallow imports "../../src/UML_Main" "../../src/compiler/Static" "../../src/compiler/Generator_dynamic_sequential" begin
+theory Tree_02_01_shallow imports "../../src/uml_main/UML_Main" "../../src/compiler/Static" "../../src/compiler/Generator_dynamic_sequential" begin
 generation_syntax [ shallow (generation_semantics [ analysis ]) ]
 
 Class Aazz End
diff --git a/Citadelle/examples/empirical_evaluation/Tree_02_02_deep_self.thy b/Citadelle/examples/empirical_evaluation/Tree_02_02_deep_self.thy
index 558005d917b..dbbf05bb540 100644
--- a/Citadelle/examples/empirical_evaluation/Tree_02_02_deep_self.thy
+++ b/Citadelle/examples/empirical_evaluation/Tree_02_02_deep_self.thy
@@ -3,7 +3,7 @@ generation_syntax [ deep
                       (generation_semantics [ analysis (*, oid_start 10*) ])
                       skip_export
                       (THEORY Tree_02_02_generated_self)
-                      (IMPORTS ["../../../src/UML_Main", "../../../src/compiler/Static"]
+                      (IMPORTS ["../../../src/uml_main/UML_Main", "../../../src/compiler/Static"]
                                "../../../src/compiler/Generator_dynamic_sequential")
                       SECTION
                       [ in self  ]
diff --git a/Citadelle/examples/empirical_evaluation/Tree_02_02_shallow.thy b/Citadelle/examples/empirical_evaluation/Tree_02_02_shallow.thy
index e04aa5a108a..3a523b5a2a8 100644
--- a/Citadelle/examples/empirical_evaluation/Tree_02_02_shallow.thy
+++ b/Citadelle/examples/empirical_evaluation/Tree_02_02_shallow.thy
@@ -1,4 +1,4 @@
-theory Tree_02_02_shallow imports "../../src/UML_Main" "../../src/compiler/Static" "../../src/compiler/Generator_dynamic_sequential" begin
+theory Tree_02_02_shallow imports "../../src/uml_main/UML_Main" "../../src/compiler/Static" "../../src/compiler/Generator_dynamic_sequential" begin
 generation_syntax [ shallow (generation_semantics [ analysis ]) ]
 
 Class Aazz End
diff --git a/Citadelle/examples/empirical_evaluation/Tree_02_03_deep_self.thy b/Citadelle/examples/empirical_evaluation/Tree_02_03_deep_self.thy
index 83fc8bff575..2387c840d8e 100644
--- a/Citadelle/examples/empirical_evaluation/Tree_02_03_deep_self.thy
+++ b/Citadelle/examples/empirical_evaluation/Tree_02_03_deep_self.thy
@@ -3,7 +3,7 @@ generation_syntax [ deep
                       (generation_semantics [ analysis (*, oid_start 10*) ])
                       skip_export
                       (THEORY Tree_02_03_generated_self)
-                      (IMPORTS ["../../../src/UML_Main", "../../../src/compiler/Static"]
+                      (IMPORTS ["../../../src/uml_main/UML_Main", "../../../src/compiler/Static"]
                                "../../../src/compiler/Generator_dynamic_sequential")
                       SECTION
                       [ in self  ]
diff --git a/Citadelle/examples/empirical_evaluation/Tree_02_03_shallow.thy b/Citadelle/examples/empirical_evaluation/Tree_02_03_shallow.thy
index 48fd730856b..ac34bccda4f 100644
--- a/Citadelle/examples/empirical_evaluation/Tree_02_03_shallow.thy
+++ b/Citadelle/examples/empirical_evaluation/Tree_02_03_shallow.thy
@@ -1,4 +1,4 @@
-theory Tree_02_03_shallow imports "../../src/UML_Main" "../../src/compiler/Static" "../../src/compiler/Generator_dynamic_sequential" begin
+theory Tree_02_03_shallow imports "../../src/uml_main/UML_Main" "../../src/compiler/Static" "../../src/compiler/Generator_dynamic_sequential" begin
 generation_syntax [ shallow (generation_semantics [ analysis ]) ]
 
 Class Aazz End
diff --git a/Citadelle/examples/empirical_evaluation/Tree_02_04_deep_self.thy b/Citadelle/examples/empirical_evaluation/Tree_02_04_deep_self.thy
index 84664d1a336..169fc6c133e 100644
--- a/Citadelle/examples/empirical_evaluation/Tree_02_04_deep_self.thy
+++ b/Citadelle/examples/empirical_evaluation/Tree_02_04_deep_self.thy
@@ -3,7 +3,7 @@ generation_syntax [ deep
                       (generation_semantics [ analysis (*, oid_start 10*) ])
                       skip_export
                       (THEORY Tree_02_04_generated_self)
-                      (IMPORTS ["../../../src/UML_Main", "../../../src/compiler/Static"]
+                      (IMPORTS ["../../../src/uml_main/UML_Main", "../../../src/compiler/Static"]
                                "../../../src/compiler/Generator_dynamic_sequential")
                       SECTION
                       [ in self  ]
diff --git a/Citadelle/examples/empirical_evaluation/Tree_02_04_shallow.thy b/Citadelle/examples/empirical_evaluation/Tree_02_04_shallow.thy
index e5891195218..2cb904aed9c 100644
--- a/Citadelle/examples/empirical_evaluation/Tree_02_04_shallow.thy
+++ b/Citadelle/examples/empirical_evaluation/Tree_02_04_shallow.thy
@@ -1,4 +1,4 @@
-theory Tree_02_04_shallow imports "../../src/UML_Main" "../../src/compiler/Static" "../../src/compiler/Generator_dynamic_sequential" begin
+theory Tree_02_04_shallow imports "../../src/uml_main/UML_Main" "../../src/compiler/Static" "../../src/compiler/Generator_dynamic_sequential" begin
 generation_syntax [ shallow (generation_semantics [ analysis ]) ]
 
 Class Aazz End
diff --git a/Citadelle/examples/empirical_evaluation/Tree_03_01_deep_self.thy b/Citadelle/examples/empirical_evaluation/Tree_03_01_deep_self.thy
index 6a0a4eff667..e7959cc38fd 100644
--- a/Citadelle/examples/empirical_evaluation/Tree_03_01_deep_self.thy
+++ b/Citadelle/examples/empirical_evaluation/Tree_03_01_deep_self.thy
@@ -3,7 +3,7 @@ generation_syntax [ deep
                       (generation_semantics [ analysis (*, oid_start 10*) ])
                       skip_export
                       (THEORY Tree_03_01_generated_self)
-                      (IMPORTS ["../../../src/UML_Main", "../../../src/compiler/Static"]
+                      (IMPORTS ["../../../src/uml_main/UML_Main", "../../../src/compiler/Static"]
                                "../../../src/compiler/Generator_dynamic_sequential")
                       SECTION
                       [ in self  ]
diff --git a/Citadelle/examples/empirical_evaluation/Tree_03_01_shallow.thy b/Citadelle/examples/empirical_evaluation/Tree_03_01_shallow.thy
index e7e6506fc44..715fca70572 100644
--- a/Citadelle/examples/empirical_evaluation/Tree_03_01_shallow.thy
+++ b/Citadelle/examples/empirical_evaluation/Tree_03_01_shallow.thy
@@ -1,4 +1,4 @@
-theory Tree_03_01_shallow imports "../../src/UML_Main" "../../src/compiler/Static" "../../src/compiler/Generator_dynamic_sequential" begin
+theory Tree_03_01_shallow imports "../../src/uml_main/UML_Main" "../../src/compiler/Static" "../../src/compiler/Generator_dynamic_sequential" begin
 generation_syntax [ shallow (generation_semantics [ analysis ]) ]
 
 Class Aazz End
diff --git a/Citadelle/examples/empirical_evaluation/Tree_03_02_deep_self.thy b/Citadelle/examples/empirical_evaluation/Tree_03_02_deep_self.thy
index 9b7a29ebffc..e093e4b6852 100644
--- a/Citadelle/examples/empirical_evaluation/Tree_03_02_deep_self.thy
+++ b/Citadelle/examples/empirical_evaluation/Tree_03_02_deep_self.thy
@@ -3,7 +3,7 @@ generation_syntax [ deep
                       (generation_semantics [ analysis (*, oid_start 10*) ])
                       skip_export
                       (THEORY Tree_03_02_generated_self)
-                      (IMPORTS ["../../../src/UML_Main", "../../../src/compiler/Static"]
+                      (IMPORTS ["../../../src/uml_main/UML_Main", "../../../src/compiler/Static"]
                                "../../../src/compiler/Generator_dynamic_sequential")
                       SECTION
                       [ in self  ]
diff --git a/Citadelle/examples/empirical_evaluation/Tree_03_02_shallow.thy b/Citadelle/examples/empirical_evaluation/Tree_03_02_shallow.thy
index 63a8acafda3..93f321d0d23 100644
--- a/Citadelle/examples/empirical_evaluation/Tree_03_02_shallow.thy
+++ b/Citadelle/examples/empirical_evaluation/Tree_03_02_shallow.thy
@@ -1,4 +1,4 @@
-theory Tree_03_02_shallow imports "../../src/UML_Main" "../../src/compiler/Static" "../../src/compiler/Generator_dynamic_sequential" begin
+theory Tree_03_02_shallow imports "../../src/uml_main/UML_Main" "../../src/compiler/Static" "../../src/compiler/Generator_dynamic_sequential" begin
 generation_syntax [ shallow (generation_semantics [ analysis ]) ]
 
 Class Aazz End
diff --git a/Citadelle/examples/empirical_evaluation/Tree_03_03_deep_self.thy b/Citadelle/examples/empirical_evaluation/Tree_03_03_deep_self.thy
index 45f49f94b44..d1b93876981 100644
--- a/Citadelle/examples/empirical_evaluation/Tree_03_03_deep_self.thy
+++ b/Citadelle/examples/empirical_evaluation/Tree_03_03_deep_self.thy
@@ -3,7 +3,7 @@ generation_syntax [ deep
                       (generation_semantics [ analysis (*, oid_start 10*) ])
                       skip_export
                       (THEORY Tree_03_03_generated_self)
-                      (IMPORTS ["../../../src/UML_Main", "../../../src/compiler/Static"]
+                      (IMPORTS ["../../../src/uml_main/UML_Main", "../../../src/compiler/Static"]
                                "../../../src/compiler/Generator_dynamic_sequential")
                       SECTION
                       [ in self  ]
diff --git a/Citadelle/examples/empirical_evaluation/Tree_03_03_shallow.thy b/Citadelle/examples/empirical_evaluation/Tree_03_03_shallow.thy
index 0ea0dc47c52..5e4b343a10b 100644
--- a/Citadelle/examples/empirical_evaluation/Tree_03_03_shallow.thy
+++ b/Citadelle/examples/empirical_evaluation/Tree_03_03_shallow.thy
@@ -1,4 +1,4 @@
-theory Tree_03_03_shallow imports "../../src/UML_Main" "../../src/compiler/Static" "../../src/compiler/Generator_dynamic_sequential" begin
+theory Tree_03_03_shallow imports "../../src/uml_main/UML_Main" "../../src/compiler/Static" "../../src/compiler/Generator_dynamic_sequential" begin
 generation_syntax [ shallow (generation_semantics [ analysis ]) ]
 
 Class Aazz End
diff --git a/Citadelle/examples/empirical_evaluation/Tree_04_01_deep_self.thy b/Citadelle/examples/empirical_evaluation/Tree_04_01_deep_self.thy
index 012f7451cfa..9750974a12d 100644
--- a/Citadelle/examples/empirical_evaluation/Tree_04_01_deep_self.thy
+++ b/Citadelle/examples/empirical_evaluation/Tree_04_01_deep_self.thy
@@ -3,7 +3,7 @@ generation_syntax [ deep
                       (generation_semantics [ analysis (*, oid_start 10*) ])
                       skip_export
                       (THEORY Tree_04_01_generated_self)
-                      (IMPORTS ["../../../src/UML_Main", "../../../src/compiler/Static"]
+                      (IMPORTS ["../../../src/uml_main/UML_Main", "../../../src/compiler/Static"]
                                "../../../src/compiler/Generator_dynamic_sequential")
                       SECTION
                       [ in self  ]
diff --git a/Citadelle/examples/empirical_evaluation/Tree_04_01_shallow.thy b/Citadelle/examples/empirical_evaluation/Tree_04_01_shallow.thy
index 01c8b567c1b..162b17f2b02 100644
--- a/Citadelle/examples/empirical_evaluation/Tree_04_01_shallow.thy
+++ b/Citadelle/examples/empirical_evaluation/Tree_04_01_shallow.thy
@@ -1,4 +1,4 @@
-theory Tree_04_01_shallow imports "../../src/UML_Main" "../../src/compiler/Static" "../../src/compiler/Generator_dynamic_sequential" begin
+theory Tree_04_01_shallow imports "../../src/uml_main/UML_Main" "../../src/compiler/Static" "../../src/compiler/Generator_dynamic_sequential" begin
 generation_syntax [ shallow (generation_semantics [ analysis ]) ]
 
 Class Aazz End
diff --git a/Citadelle/examples/empirical_evaluation/Tree_04_02_deep_self.thy b/Citadelle/examples/empirical_evaluation/Tree_04_02_deep_self.thy
index a9530867ae3..74cda2cf0c7 100644
--- a/Citadelle/examples/empirical_evaluation/Tree_04_02_deep_self.thy
+++ b/Citadelle/examples/empirical_evaluation/Tree_04_02_deep_self.thy
@@ -3,7 +3,7 @@ generation_syntax [ deep
                       (generation_semantics [ analysis (*, oid_start 10*) ])
                       skip_export
                       (THEORY Tree_04_02_generated_self)
-                      (IMPORTS ["../../../src/UML_Main", "../../../src/compiler/Static"]
+                      (IMPORTS ["../../../src/uml_main/UML_Main", "../../../src/compiler/Static"]
                                "../../../src/compiler/Generator_dynamic_sequential")
                       SECTION
                       [ in self  ]
diff --git a/Citadelle/examples/empirical_evaluation/Tree_04_02_shallow.thy b/Citadelle/examples/empirical_evaluation/Tree_04_02_shallow.thy
index ae5e7f4b933..a9e788e69fb 100644
--- a/Citadelle/examples/empirical_evaluation/Tree_04_02_shallow.thy
+++ b/Citadelle/examples/empirical_evaluation/Tree_04_02_shallow.thy
@@ -1,4 +1,4 @@
-theory Tree_04_02_shallow imports "../../src/UML_Main" "../../src/compiler/Static" "../../src/compiler/Generator_dynamic_sequential" begin
+theory Tree_04_02_shallow imports "../../src/uml_main/UML_Main" "../../src/compiler/Static" "../../src/compiler/Generator_dynamic_sequential" begin
 generation_syntax [ shallow (generation_semantics [ analysis ]) ]
 
 Class Aazz End
diff --git a/Citadelle/examples/empirical_evaluation/Tree_05_01_deep_self.thy b/Citadelle/examples/empirical_evaluation/Tree_05_01_deep_self.thy
index 4dd290a44f9..fe85a8221f7 100644
--- a/Citadelle/examples/empirical_evaluation/Tree_05_01_deep_self.thy
+++ b/Citadelle/examples/empirical_evaluation/Tree_05_01_deep_self.thy
@@ -3,7 +3,7 @@ generation_syntax [ deep
                       (generation_semantics [ analysis (*, oid_start 10*) ])
                       skip_export
                       (THEORY Tree_05_01_generated_self)
-                      (IMPORTS ["../../../src/UML_Main", "../../../src/compiler/Static"]
+                      (IMPORTS ["../../../src/uml_main/UML_Main", "../../../src/compiler/Static"]
                                "../../../src/compiler/Generator_dynamic_sequential")
                       SECTION
                       [ in self  ]
diff --git a/Citadelle/examples/empirical_evaluation/Tree_05_01_shallow.thy b/Citadelle/examples/empirical_evaluation/Tree_05_01_shallow.thy
index 9c1edf90528..32a9e66b137 100644
--- a/Citadelle/examples/empirical_evaluation/Tree_05_01_shallow.thy
+++ b/Citadelle/examples/empirical_evaluation/Tree_05_01_shallow.thy
@@ -1,4 +1,4 @@
-theory Tree_05_01_shallow imports "../../src/UML_Main" "../../src/compiler/Static" "../../src/compiler/Generator_dynamic_sequential" begin
+theory Tree_05_01_shallow imports "../../src/uml_main/UML_Main" "../../src/compiler/Static" "../../src/compiler/Generator_dynamic_sequential" begin
 generation_syntax [ shallow (generation_semantics [ analysis ]) ]
 
 Class Aazz End
diff --git a/Citadelle/examples/empirical_evaluation/Tree_05_02_deep_self.thy b/Citadelle/examples/empirical_evaluation/Tree_05_02_deep_self.thy
index 9a613655f04..edcf8a6af5c 100644
--- a/Citadelle/examples/empirical_evaluation/Tree_05_02_deep_self.thy
+++ b/Citadelle/examples/empirical_evaluation/Tree_05_02_deep_self.thy
@@ -3,7 +3,7 @@ generation_syntax [ deep
                       (generation_semantics [ analysis (*, oid_start 10*) ])
                       skip_export
                       (THEORY Tree_05_02_generated_self)
-                      (IMPORTS ["../../../src/UML_Main", "../../../src/compiler/Static"]
+                      (IMPORTS ["../../../src/uml_main/UML_Main", "../../../src/compiler/Static"]
                                "../../../src/compiler/Generator_dynamic_sequential")
                       SECTION
                       [ in self  ]
diff --git a/Citadelle/examples/empirical_evaluation/Tree_05_02_shallow.thy b/Citadelle/examples/empirical_evaluation/Tree_05_02_shallow.thy
index 7a9637bfdf3..fb6016ece00 100644
--- a/Citadelle/examples/empirical_evaluation/Tree_05_02_shallow.thy
+++ b/Citadelle/examples/empirical_evaluation/Tree_05_02_shallow.thy
@@ -1,4 +1,4 @@
-theory Tree_05_02_shallow imports "../../src/UML_Main" "../../src/compiler/Static" "../../src/compiler/Generator_dynamic_sequential" begin
+theory Tree_05_02_shallow imports "../../src/uml_main/UML_Main" "../../src/compiler/Static" "../../src/compiler/Generator_dynamic_sequential" begin
 generation_syntax [ shallow (generation_semantics [ analysis ]) ]
 
 Class Aazz End
diff --git a/Citadelle/examples/empirical_evaluation/Tree_06_01_deep_self.thy b/Citadelle/examples/empirical_evaluation/Tree_06_01_deep_self.thy
index f0cbad1a68a..fc0e492689b 100644
--- a/Citadelle/examples/empirical_evaluation/Tree_06_01_deep_self.thy
+++ b/Citadelle/examples/empirical_evaluation/Tree_06_01_deep_self.thy
@@ -3,7 +3,7 @@ generation_syntax [ deep
                       (generation_semantics [ analysis (*, oid_start 10*) ])
                       skip_export
                       (THEORY Tree_06_01_generated_self)
-                      (IMPORTS ["../../../src/UML_Main", "../../../src/compiler/Static"]
+                      (IMPORTS ["../../../src/uml_main/UML_Main", "../../../src/compiler/Static"]
                                "../../../src/compiler/Generator_dynamic_sequential")
                       SECTION
                       [ in self  ]
diff --git a/Citadelle/examples/empirical_evaluation/Tree_06_01_shallow.thy b/Citadelle/examples/empirical_evaluation/Tree_06_01_shallow.thy
index 48d9f21d524..fa4e7af7bef 100644
--- a/Citadelle/examples/empirical_evaluation/Tree_06_01_shallow.thy
+++ b/Citadelle/examples/empirical_evaluation/Tree_06_01_shallow.thy
@@ -1,4 +1,4 @@
-theory Tree_06_01_shallow imports "../../src/UML_Main" "../../src/compiler/Static" "../../src/compiler/Generator_dynamic_sequential" begin
+theory Tree_06_01_shallow imports "../../src/uml_main/UML_Main" "../../src/compiler/Static" "../../src/compiler/Generator_dynamic_sequential" begin
 generation_syntax [ shallow (generation_semantics [ analysis ]) ]
 
 Class Aazz End
diff --git a/Citadelle/examples/empirical_evaluation/Tree_06_02_deep_self.thy b/Citadelle/examples/empirical_evaluation/Tree_06_02_deep_self.thy
index 841fb689cee..67bfc143f9d 100644
--- a/Citadelle/examples/empirical_evaluation/Tree_06_02_deep_self.thy
+++ b/Citadelle/examples/empirical_evaluation/Tree_06_02_deep_self.thy
@@ -3,7 +3,7 @@ generation_syntax [ deep
                       (generation_semantics [ analysis (*, oid_start 10*) ])
                       skip_export
                       (THEORY Tree_06_02_generated_self)
-                      (IMPORTS ["../../../src/UML_Main", "../../../src/compiler/Static"]
+                      (IMPORTS ["../../../src/uml_main/UML_Main", "../../../src/compiler/Static"]
                                "../../../src/compiler/Generator_dynamic_sequential")
                       SECTION
                       [ in self  ]
diff --git a/Citadelle/examples/empirical_evaluation/Tree_06_02_shallow.thy b/Citadelle/examples/empirical_evaluation/Tree_06_02_shallow.thy
index f2107b47069..c51b4635c0e 100644
--- a/Citadelle/examples/empirical_evaluation/Tree_06_02_shallow.thy
+++ b/Citadelle/examples/empirical_evaluation/Tree_06_02_shallow.thy
@@ -1,4 +1,4 @@
-theory Tree_06_02_shallow imports "../../src/UML_Main" "../../src/compiler/Static" "../../src/compiler/Generator_dynamic_sequential" begin
+theory Tree_06_02_shallow imports "../../src/uml_main/UML_Main" "../../src/compiler/Static" "../../src/compiler/Generator_dynamic_sequential" begin
 generation_syntax [ shallow (generation_semantics [ analysis ]) ]
 
 Class Aazz End
diff --git a/Citadelle/examples/empirical_evaluation/Tree_07_01_deep_self.thy b/Citadelle/examples/empirical_evaluation/Tree_07_01_deep_self.thy
index 3fa2104fad6..c25391013e4 100644
--- a/Citadelle/examples/empirical_evaluation/Tree_07_01_deep_self.thy
+++ b/Citadelle/examples/empirical_evaluation/Tree_07_01_deep_self.thy
@@ -3,7 +3,7 @@ generation_syntax [ deep
                       (generation_semantics [ analysis (*, oid_start 10*) ])
                       skip_export
                       (THEORY Tree_07_01_generated_self)
-                      (IMPORTS ["../../../src/UML_Main", "../../../src/compiler/Static"]
+                      (IMPORTS ["../../../src/uml_main/UML_Main", "../../../src/compiler/Static"]
                                "../../../src/compiler/Generator_dynamic_sequential")
                       SECTION
                       [ in self  ]
diff --git a/Citadelle/examples/empirical_evaluation/Tree_07_01_shallow.thy b/Citadelle/examples/empirical_evaluation/Tree_07_01_shallow.thy
index 702b24b5d56..645637524e9 100644
--- a/Citadelle/examples/empirical_evaluation/Tree_07_01_shallow.thy
+++ b/Citadelle/examples/empirical_evaluation/Tree_07_01_shallow.thy
@@ -1,4 +1,4 @@
-theory Tree_07_01_shallow imports "../../src/UML_Main" "../../src/compiler/Static" "../../src/compiler/Generator_dynamic_sequential" begin
+theory Tree_07_01_shallow imports "../../src/uml_main/UML_Main" "../../src/compiler/Static" "../../src/compiler/Generator_dynamic_sequential" begin
 generation_syntax [ shallow (generation_semantics [ analysis ]) ]
 
 Class Aazz End
diff --git a/Citadelle/examples/empirical_evaluation/Tree_07_02_deep_self.thy b/Citadelle/examples/empirical_evaluation/Tree_07_02_deep_self.thy
index 0a4d05fe340..a43aa599ae9 100644
--- a/Citadelle/examples/empirical_evaluation/Tree_07_02_deep_self.thy
+++ b/Citadelle/examples/empirical_evaluation/Tree_07_02_deep_self.thy
@@ -3,7 +3,7 @@ generation_syntax [ deep
                       (generation_semantics [ analysis (*, oid_start 10*) ])
                       skip_export
                       (THEORY Tree_07_02_generated_self)
-                      (IMPORTS ["../../../src/UML_Main", "../../../src/compiler/Static"]
+                      (IMPORTS ["../../../src/uml_main/UML_Main", "../../../src/compiler/Static"]
                                "../../../src/compiler/Generator_dynamic_sequential")
                       SECTION
                       [ in self  ]
diff --git a/Citadelle/examples/empirical_evaluation/Tree_07_02_shallow.thy b/Citadelle/examples/empirical_evaluation/Tree_07_02_shallow.thy
index c0c84d2c631..d207becb0c7 100644
--- a/Citadelle/examples/empirical_evaluation/Tree_07_02_shallow.thy
+++ b/Citadelle/examples/empirical_evaluation/Tree_07_02_shallow.thy
@@ -1,4 +1,4 @@
-theory Tree_07_02_shallow imports "../../src/UML_Main" "../../src/compiler/Static" "../../src/compiler/Generator_dynamic_sequential" begin
+theory Tree_07_02_shallow imports "../../src/uml_main/UML_Main" "../../src/compiler/Static" "../../src/compiler/Generator_dynamic_sequential" begin
 generation_syntax [ shallow (generation_semantics [ analysis ]) ]
 
 Class Aazz End
diff --git a/Citadelle/examples/empirical_evaluation/Tree_12_01_deep_self.thy b/Citadelle/examples/empirical_evaluation/Tree_12_01_deep_self.thy
index f8f35b369ec..066ee7684f9 100644
--- a/Citadelle/examples/empirical_evaluation/Tree_12_01_deep_self.thy
+++ b/Citadelle/examples/empirical_evaluation/Tree_12_01_deep_self.thy
@@ -3,7 +3,7 @@ generation_syntax [ deep
                       (generation_semantics [ analysis (*, oid_start 10*) ])
                       skip_export
                       (THEORY Tree_12_01_generated_self)
-                      (IMPORTS ["../../../src/UML_Main", "../../../src/compiler/Static"]
+                      (IMPORTS ["../../../src/uml_main/UML_Main", "../../../src/compiler/Static"]
                                "../../../src/compiler/Generator_dynamic_sequential")
                       SECTION
                       [ in self  ]
diff --git a/Citadelle/examples/empirical_evaluation/Tree_12_01_shallow.thy b/Citadelle/examples/empirical_evaluation/Tree_12_01_shallow.thy
index 44f92420387..83c480a9099 100644
--- a/Citadelle/examples/empirical_evaluation/Tree_12_01_shallow.thy
+++ b/Citadelle/examples/empirical_evaluation/Tree_12_01_shallow.thy
@@ -1,4 +1,4 @@
-theory Tree_12_01_shallow imports "../../src/UML_Main" "../../src/compiler/Static" "../../src/compiler/Generator_dynamic_sequential" begin
+theory Tree_12_01_shallow imports "../../src/uml_main/UML_Main" "../../src/compiler/Static" "../../src/compiler/Generator_dynamic_sequential" begin
 generation_syntax [ shallow (generation_semantics [ analysis ]) ]
 
 Class Aazz End
diff --git a/Citadelle/examples/empirical_evaluation/Tree_14_01_deep_self.thy b/Citadelle/examples/empirical_evaluation/Tree_14_01_deep_self.thy
index a5aa7965121..234c1151d46 100644
--- a/Citadelle/examples/empirical_evaluation/Tree_14_01_deep_self.thy
+++ b/Citadelle/examples/empirical_evaluation/Tree_14_01_deep_self.thy
@@ -3,7 +3,7 @@ generation_syntax [ deep
                       (generation_semantics [ analysis (*, oid_start 10*) ])
                       skip_export
                       (THEORY Tree_14_01_generated_self)
-                      (IMPORTS ["../../../src/UML_Main", "../../../src/compiler/Static"]
+                      (IMPORTS ["../../../src/uml_main/UML_Main", "../../../src/compiler/Static"]
                                "../../../src/compiler/Generator_dynamic_sequential")
                       SECTION
                       [ in self  ]
diff --git a/Citadelle/examples/empirical_evaluation/Tree_14_01_shallow.thy b/Citadelle/examples/empirical_evaluation/Tree_14_01_shallow.thy
index 5eb833eb5b4..ba3e7685bff 100644
--- a/Citadelle/examples/empirical_evaluation/Tree_14_01_shallow.thy
+++ b/Citadelle/examples/empirical_evaluation/Tree_14_01_shallow.thy
@@ -1,4 +1,4 @@
-theory Tree_14_01_shallow imports "../../src/UML_Main" "../../src/compiler/Static" "../../src/compiler/Generator_dynamic_sequential" begin
+theory Tree_14_01_shallow imports "../../src/uml_main/UML_Main" "../../src/compiler/Static" "../../src/compiler/Generator_dynamic_sequential" begin
 generation_syntax [ shallow (generation_semantics [ analysis ]) ]
 
 Class Aazz End
diff --git a/Citadelle/examples/empirical_evaluation/Tree_20_01_deep_self.thy b/Citadelle/examples/empirical_evaluation/Tree_20_01_deep_self.thy
index f334b349563..9510007e06f 100644
--- a/Citadelle/examples/empirical_evaluation/Tree_20_01_deep_self.thy
+++ b/Citadelle/examples/empirical_evaluation/Tree_20_01_deep_self.thy
@@ -3,7 +3,7 @@ generation_syntax [ deep
                       (generation_semantics [ analysis (*, oid_start 10*) ])
                       skip_export
                       (THEORY Tree_20_01_generated_self)
-                      (IMPORTS ["../../../src/UML_Main", "../../../src/compiler/Static"]
+                      (IMPORTS ["../../../src/uml_main/UML_Main", "../../../src/compiler/Static"]
                                "../../../src/compiler/Generator_dynamic_sequential")
                       SECTION
                       [ in self  ]
diff --git a/Citadelle/examples/empirical_evaluation/Tree_20_01_shallow.thy b/Citadelle/examples/empirical_evaluation/Tree_20_01_shallow.thy
index 951471baff6..02678336a7c 100644
--- a/Citadelle/examples/empirical_evaluation/Tree_20_01_shallow.thy
+++ b/Citadelle/examples/empirical_evaluation/Tree_20_01_shallow.thy
@@ -1,4 +1,4 @@
-theory Tree_20_01_shallow imports "../../src/UML_Main" "../../src/compiler/Static" "../../src/compiler/Generator_dynamic_sequential" begin
+theory Tree_20_01_shallow imports "../../src/uml_main/UML_Main" "../../src/compiler/Static" "../../src/compiler/Generator_dynamic_sequential" begin
 generation_syntax [ shallow (generation_semantics [ analysis ]) ]
 
 Class Aazz End
diff --git a/Citadelle/examples/empirical_evaluation/Tree_30_01_deep_self.thy b/Citadelle/examples/empirical_evaluation/Tree_30_01_deep_self.thy
index 7524831ea1d..af36ec5d522 100644
--- a/Citadelle/examples/empirical_evaluation/Tree_30_01_deep_self.thy
+++ b/Citadelle/examples/empirical_evaluation/Tree_30_01_deep_self.thy
@@ -3,7 +3,7 @@ generation_syntax [ deep
                       (generation_semantics [ analysis (*, oid_start 10*) ])
                       skip_export
                       (THEORY Tree_30_01_generated_self)
-                      (IMPORTS ["../../../src/UML_Main", "../../../src/compiler/Static"]
+                      (IMPORTS ["../../../src/uml_main/UML_Main", "../../../src/compiler/Static"]
                                "../../../src/compiler/Generator_dynamic_sequential")
                       SECTION
                       [ in self  ]
diff --git a/Citadelle/examples/empirical_evaluation/Tree_30_01_shallow.thy b/Citadelle/examples/empirical_evaluation/Tree_30_01_shallow.thy
index 0b55a47903b..27702dc6e67 100644
--- a/Citadelle/examples/empirical_evaluation/Tree_30_01_shallow.thy
+++ b/Citadelle/examples/empirical_evaluation/Tree_30_01_shallow.thy
@@ -1,4 +1,4 @@
-theory Tree_30_01_shallow imports "../../src/UML_Main" "../../src/compiler/Static" "../../src/compiler/Generator_dynamic_sequential" begin
+theory Tree_30_01_shallow imports "../../src/uml_main/UML_Main" "../../src/compiler/Static" "../../src/compiler/Generator_dynamic_sequential" begin
 generation_syntax [ shallow (generation_semantics [ analysis ]) ]
 
 Class Aazz End
diff --git a/Citadelle/examples/empirical_evaluation/Tree_39_01_deep_self.thy b/Citadelle/examples/empirical_evaluation/Tree_39_01_deep_self.thy
index f701cbe436c..4798217583d 100644
--- a/Citadelle/examples/empirical_evaluation/Tree_39_01_deep_self.thy
+++ b/Citadelle/examples/empirical_evaluation/Tree_39_01_deep_self.thy
@@ -3,7 +3,7 @@ generation_syntax [ deep
                       (generation_semantics [ analysis (*, oid_start 10*) ])
                       skip_export
                       (THEORY Tree_39_01_generated_self)
-                      (IMPORTS ["../../../src/UML_Main", "../../../src/compiler/Static"]
+                      (IMPORTS ["../../../src/uml_main/UML_Main", "../../../src/compiler/Static"]
                                "../../../src/compiler/Generator_dynamic_sequential")
                       SECTION
                       [ in self  ]
diff --git a/Citadelle/examples/empirical_evaluation/Tree_39_01_shallow.thy b/Citadelle/examples/empirical_evaluation/Tree_39_01_shallow.thy
index 556b31a9c1b..cdd3e67bf46 100644
--- a/Citadelle/examples/empirical_evaluation/Tree_39_01_shallow.thy
+++ b/Citadelle/examples/empirical_evaluation/Tree_39_01_shallow.thy
@@ -1,4 +1,4 @@
-theory Tree_39_01_shallow imports "../../src/UML_Main" "../../src/compiler/Static" "../../src/compiler/Generator_dynamic_sequential" begin
+theory Tree_39_01_shallow imports "../../src/uml_main/UML_Main" "../../src/compiler/Static" "../../src/compiler/Generator_dynamic_sequential" begin
 generation_syntax [ shallow (generation_semantics [ analysis ]) ]
 
 Class Aazz End
diff --git a/Citadelle/examples/empirical_evaluation/Tree_42_01_deep_self.thy b/Citadelle/examples/empirical_evaluation/Tree_42_01_deep_self.thy
index d31d17fb9cb..8220f8cf464 100644
--- a/Citadelle/examples/empirical_evaluation/Tree_42_01_deep_self.thy
+++ b/Citadelle/examples/empirical_evaluation/Tree_42_01_deep_self.thy
@@ -3,7 +3,7 @@ generation_syntax [ deep
                       (generation_semantics [ analysis (*, oid_start 10*) ])
                       skip_export
                       (THEORY Tree_42_01_generated_self)
-                      (IMPORTS ["../../../src/UML_Main", "../../../src/compiler/Static"]
+                      (IMPORTS ["../../../src/uml_main/UML_Main", "../../../src/compiler/Static"]
                                "../../../src/compiler/Generator_dynamic_sequential")
                       SECTION
                       [ in self  ]
diff --git a/Citadelle/examples/empirical_evaluation/Tree_42_01_shallow.thy b/Citadelle/examples/empirical_evaluation/Tree_42_01_shallow.thy
index 0241b55d80f..ec84064c122 100644
--- a/Citadelle/examples/empirical_evaluation/Tree_42_01_shallow.thy
+++ b/Citadelle/examples/empirical_evaluation/Tree_42_01_shallow.thy
@@ -1,4 +1,4 @@
-theory Tree_42_01_shallow imports "../../src/UML_Main" "../../src/compiler/Static" "../../src/compiler/Generator_dynamic_sequential" begin
+theory Tree_42_01_shallow imports "../../src/uml_main/UML_Main" "../../src/compiler/Static" "../../src/compiler/Generator_dynamic_sequential" begin
 generation_syntax [ shallow (generation_semantics [ analysis ]) ]
 
 Class Aazz End
diff --git a/Citadelle/examples/empirical_evaluation/Tree_56_01_deep_self.thy b/Citadelle/examples/empirical_evaluation/Tree_56_01_deep_self.thy
index c7d863c4ab0..bfaddb478b4 100644
--- a/Citadelle/examples/empirical_evaluation/Tree_56_01_deep_self.thy
+++ b/Citadelle/examples/empirical_evaluation/Tree_56_01_deep_self.thy
@@ -3,7 +3,7 @@ generation_syntax [ deep
                       (generation_semantics [ analysis (*, oid_start 10*) ])
                       skip_export
                       (THEORY Tree_56_01_generated_self)
-                      (IMPORTS ["../../../src/UML_Main", "../../../src/compiler/Static"]
+                      (IMPORTS ["../../../src/uml_main/UML_Main", "../../../src/compiler/Static"]
                                "../../../src/compiler/Generator_dynamic_sequential")
                       SECTION
                       [ in self  ]
diff --git a/Citadelle/examples/empirical_evaluation/Tree_56_01_shallow.thy b/Citadelle/examples/empirical_evaluation/Tree_56_01_shallow.thy
index e82b060b75b..e8635453430 100644
--- a/Citadelle/examples/empirical_evaluation/Tree_56_01_shallow.thy
+++ b/Citadelle/examples/empirical_evaluation/Tree_56_01_shallow.thy
@@ -1,4 +1,4 @@
-theory Tree_56_01_shallow imports "../../src/UML_Main" "../../src/compiler/Static" "../../src/compiler/Generator_dynamic_sequential" begin
+theory Tree_56_01_shallow imports "../../src/uml_main/UML_Main" "../../src/compiler/Static" "../../src/compiler/Generator_dynamic_sequential" begin
 generation_syntax [ shallow (generation_semantics [ analysis ]) ]
 
 Class Aazz End
diff --git a/Citadelle/src/UML_OCL.thy b/Citadelle/src/UML_OCL.thy
index 8673231881a..cf69fea434f 100644
--- a/Citadelle/src/UML_OCL.thy
+++ b/Citadelle/src/UML_OCL.thy
@@ -44,7 +44,7 @@
  ******************************************************************************)
 
 theory   UML_OCL
-imports  "UML_Main"
+imports  "uml_main/UML_Main"
          "../examples/archive/Monads" (* NOTE: perform lazily the extraction of generation_syntax
                                          so that dependencies can alternate among theories *)
          "compiler/Static"
diff --git a/Citadelle/src/basic_types/UML_Boolean.thy b/Citadelle/src/basic_types/UML_Boolean.thy
index 56536ac6dce..5b208a0668e 100644
--- a/Citadelle/src/basic_types/UML_Boolean.thy
+++ b/Citadelle/src/basic_types/UML_Boolean.thy
@@ -44,7 +44,7 @@
  ******************************************************************************)
 
 theory  UML_Boolean
-imports "../UML_PropertyProfiles"
+imports "../uml_main/UML_PropertyProfiles"
 begin
 
 
diff --git a/Citadelle/src/basic_types/UML_Integer.thy b/Citadelle/src/basic_types/UML_Integer.thy
index 57081a7b2c2..7194bb8717b 100644
--- a/Citadelle/src/basic_types/UML_Integer.thy
+++ b/Citadelle/src/basic_types/UML_Integer.thy
@@ -44,7 +44,7 @@
  ******************************************************************************)
 
 theory  UML_Integer
-imports "../UML_PropertyProfiles"
+imports "../uml_main/UML_PropertyProfiles"
 begin
 
 section{* Basic Type Integer: Operations *}
diff --git a/Citadelle/src/basic_types/UML_Real.thy b/Citadelle/src/basic_types/UML_Real.thy
index 132b0a13957..961fa6c62c3 100644
--- a/Citadelle/src/basic_types/UML_Real.thy
+++ b/Citadelle/src/basic_types/UML_Real.thy
@@ -44,7 +44,7 @@
  ******************************************************************************)
 
 theory  UML_Real
-imports "../UML_PropertyProfiles"
+imports "../uml_main/UML_PropertyProfiles"
 begin
 
 section{* Basic Type Real: Operations *}
diff --git a/Citadelle/src/basic_types/UML_String.thy b/Citadelle/src/basic_types/UML_String.thy
index 09d98521d69..00a7bef9776 100644
--- a/Citadelle/src/basic_types/UML_String.thy
+++ b/Citadelle/src/basic_types/UML_String.thy
@@ -44,7 +44,7 @@
  ******************************************************************************)
 
 theory  UML_String
-imports "../UML_PropertyProfiles"
+imports "../uml_main/UML_PropertyProfiles"
 begin
 
 section{* Basic Type String: Operations *}
diff --git a/Citadelle/src/basic_types/UML_Void.thy b/Citadelle/src/basic_types/UML_Void.thy
index b6a2f2d71c0..b097d3fb5db 100644
--- a/Citadelle/src/basic_types/UML_Void.thy
+++ b/Citadelle/src/basic_types/UML_Void.thy
@@ -44,7 +44,7 @@
  ******************************************************************************)
 
 theory  UML_Void
-imports "../UML_PropertyProfiles"
+imports "../uml_main/UML_PropertyProfiles"
 begin
 
 section{* Basic Type Void: Operations *}
diff --git a/Citadelle/src/collection_types/UML_Pair.thy b/Citadelle/src/collection_types/UML_Pair.thy
index e8827d4880b..2e0073c3ce8 100644
--- a/Citadelle/src/collection_types/UML_Pair.thy
+++ b/Citadelle/src/collection_types/UML_Pair.thy
@@ -44,7 +44,7 @@
  ******************************************************************************)
 
 theory  UML_Pair
-imports "../UML_PropertyProfiles"
+imports "../uml_main/UML_PropertyProfiles"
 begin
 
 section{* Collection Type Pairs: Operations \label{sec:collection_pairs} *}
diff --git a/Citadelle/src/UML_Contracts.thy b/Citadelle/src/uml_main/UML_Contracts.thy
similarity index 100%
rename from Citadelle/src/UML_Contracts.thy
rename to Citadelle/src/uml_main/UML_Contracts.thy
diff --git a/Citadelle/src/UML_Library.thy b/Citadelle/src/uml_main/UML_Library.thy
similarity index 98%
rename from Citadelle/src/UML_Library.thy
rename to Citadelle/src/uml_main/UML_Library.thy
index 6d307ae7aef..b8fc2583cef 100644
--- a/Citadelle/src/UML_Library.thy
+++ b/Citadelle/src/uml_main/UML_Library.thy
@@ -46,17 +46,17 @@
 
 theory  UML_Library
 imports (* Basic Type Operations *)
-        "basic_types/UML_Boolean"
-        "basic_types/UML_Void"
-        "basic_types/UML_Integer"
-        "basic_types/UML_Real"
-        "basic_types/UML_String"
+        "../basic_types/UML_Boolean"
+        "../basic_types/UML_Void"
+        "../basic_types/UML_Integer"
+        "../basic_types/UML_Real"
+        "../basic_types/UML_String"
 
         (* Collection Type Operations *)
-        "collection_types/UML_Pair"
-        "collection_types/UML_Bag"
-        "collection_types/UML_Set"
-        "collection_types/UML_Sequence"
+        "../collection_types/UML_Pair"
+        "../collection_types/UML_Bag"
+        "../collection_types/UML_Set"
+        "../collection_types/UML_Sequence"
 begin
 
 section{* Miscellaneous Stuff*}
diff --git a/Citadelle/src/UML_Logic.thy b/Citadelle/src/uml_main/UML_Logic.thy
similarity index 100%
rename from Citadelle/src/UML_Logic.thy
rename to Citadelle/src/uml_main/UML_Logic.thy
diff --git a/Citadelle/src/UML_Main.thy b/Citadelle/src/uml_main/UML_Main.thy
similarity index 100%
rename from Citadelle/src/UML_Main.thy
rename to Citadelle/src/uml_main/UML_Main.thy
diff --git a/Citadelle/src/UML_PropertyProfiles.thy b/Citadelle/src/uml_main/UML_PropertyProfiles.thy
similarity index 100%
rename from Citadelle/src/UML_PropertyProfiles.thy
rename to Citadelle/src/uml_main/UML_PropertyProfiles.thy
diff --git a/Citadelle/src/UML_State.thy b/Citadelle/src/uml_main/UML_State.thy
similarity index 100%
rename from Citadelle/src/UML_State.thy
rename to Citadelle/src/uml_main/UML_State.thy
diff --git a/Citadelle/src/UML_Tools.thy b/Citadelle/src/uml_main/UML_Tools.thy
similarity index 100%
rename from Citadelle/src/UML_Tools.thy
rename to Citadelle/src/uml_main/UML_Tools.thy
diff --git a/Citadelle/src/UML_Types.thy b/Citadelle/src/uml_main/UML_Types.thy
similarity index 100%
rename from Citadelle/src/UML_Types.thy
rename to Citadelle/src/uml_main/UML_Types.thy
-- 
GitLab