diff --git a/Citadelle/ROOT b/Citadelle/ROOT
index 8d5b93074909bc7578d0e91d33a20e3116fc1daa..74c8550b142c1886dea29f7dc3da7ca056fbde9d 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 213bd268028e14b4f3d783876880d5bf9bb0e773..3185ad06c380c0cd0e55b547ee80d33dada20332 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 829747774b62fa52c593f29bb003c8e14c27f3f0..9b082c566f3f1610426c6c1b319af54af81b7ad2 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 b25d579a2aac888e2fe8c99c7d2cf950caf1428e..6b5d9ed8281232dfff48a78007d4f0e903a0e949 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 e2f7af288d20561e5e4628bf3a5cb2d18dc980b8..6c87ca599db5ac0e3abaaf15fe2868d37001bcb9 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 a689d158ba3546f76db894a66ca070a3c3fbfda6..cb3217ee3905ce916e9a05faccf0ee0baf02d175 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 40a78880709e9c21b1cbd0e4014152af81b4ece0..2126c0c99a9b910b91c4badebd09cb7d269bf84f 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 468789461687f35d9e7bac8645ac2ccc147934c0..514647829000955cde4eb1e5025b682e7b42bda3 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 c07ce6092e91eb64bb3b1ffa159e1261d2b93e6f..0537cd00dce08912d696c2c55e5f4f166ac6c039 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 0c6dcf4a657a97c04e0e0bc6527104f493f9a54a..065fd7da0c0a53a6eb5ba033a88426945fb80322 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 762a3552ed130909971d73b97885a941920e8b09..f37498fd8c7c3181691af0fde6df707c3f0f0cb7 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 29c10c57bf4b96c8ccc7a5a3f21dfd862cdfb2d7..6284ed2c327a43df5cd3f564c7ea0b1e8d7417e1 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 45f404ccf2dddf52b100cf46a7bcc99ed2df2485..c2b01ba5b99eea8a58749ab3a528725d78da849b 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 cc0f462d1aceecafa1a790f3336528ba34428f00..e33b664fe07aa2983bf79146ff5c885bfbb47aa7 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 e936c9f66092ef475f6d7a6d053f9323abe55d16..fe476c59d1c4499c7c97a15cfa899747c53af386 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 5423deb8e804368a84469b994f46acaa685effa1..6dfb3e6a5945aad2280edebe915bbebf5f9ec947 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 b03b69f069b500005394b499a05d99659da46470..856a03e53f8efb1fe959b6cb8702f3c93a225bdf 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 ee05c260fbb5ff7a8e35d275129525ec7bfeebdc..30c0275e4abfd1d4a797e3515bf98f5a472254fb 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 031c8621a459075057a664a03db410f00cee75ab..3360f39738838304a1cdc6dbaaeff88258088f42 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 3f6319354235c8958a6dbb9b01bb0433cc359fc0..25cb9d141acfbc821510459d31dc78c804517cc8 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 7440f961722bcbd2d75a3344c10dcfbeeb9d70ac..f692537f345c2fa9e2201b297d32f62e049416ea 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 97defe1e4478338fddf82cec55abbef42b811070..a1130533912fc3d6d0f241f2d1448042717609a4 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 50ca01efbe4310ceae98036dde35e528283f253a..e48924f8292e671a3b5668983a9a7700cb86857f 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 4f9ee9e87e10d5e1c5e2f9b7092616290516c9f5..2f7f6335a79b8ecbf7ac5ab5ca036118bbbb4796 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 5f117645820a764f4b5eb06d89e00b7fb0bd6fd2..249f2466deb616a2ee56d4c68e41e9574cc8b4b6 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 e27ab0f14042c25d0ff9cfcdf34aacf009dd1226..0006e9718db6eaec75c3a34aa312a0d1788dbe5a 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 9e6e6d3d2b88771d030be412154b82eaeecc4c5a..d8a021de011f6211f8b379763ad3daeada450863 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 3dadc34d688e92d8ef62627222af9c9f4e13faa0..8ea92a38e6ac5b5ca40b848f42198a2ca2edc6d7 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 0d3c30e32b919fb493ae408a1a60b6a410f46e49..11f9f74e5ddef594dbaa349fb3baf9af7f257c87 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 315b00198d89bac0a41f6434bf6b2d8fcdd616a2..7bcd55a43079d821dba43cef7d60103f68814962 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 d71c26983568acc6d162a3822befab635eb2cb64..6a823433b5850b1779c1a8bc23c2170dc5790ce9 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 97809197ea1c9639c4d41a17e3f17c99b49ccc8b..e269067b63f12d2ec5d425852fcf88939193c292 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 f7f1af7956ff2f520e0b5dcd37c37eaa75481e4e..4b0ae9f9e44cdc8bb2b4180a245ca21c97e30756 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 ee4c705626b05fb9c4cb8d37f41676bd28f13ca5..6c6be889dd146a908335fd45c424d62476a1c927 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 37e8f6fe7f4e29e8eb7d8743992998ff6022166d..169dc786d480908b29eeaff76395223537c3cec1 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 55bde7bf914e88097a92f348ecf7e953ad84e692..db336d91ea0dbea25f744a56d80dd4485d2c802b 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 2c851e624111b18f34b7636ac87720c2c664627a..d7d1c4ef2ffa35532c6332e17266a8fe0783aa47 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 558005d917b13c180bdf75d3458e459378eb2bac..dbbf05bb540f5ae579950c3fb0a1ddb5255f4898 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 e04aa5a108a8d2d3a6f4663b0748b87edd6533ed..3a523b5a2a84c81e3fd7545782de08855ce768b9 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 83fc8bff57560b61d754370a3f44baddb86f6c78..2387c840d8e34eed3b0c6784f866900ca74576f9 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 48fd730856b3ecbc6ea01121ac35f3ec21d1250d..ac34bccda4f553fb9cb1c826d95b17b85758fdeb 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 84664d1a33643733666fa8e4eef45d683be6192e..169fc6c133e2d1fbf2405f46d53f0a2193e302fc 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 e58911952187886a850f0a95abf951f7a0a1bccd..2cb904aed9c1fd205f6b26ed0348891f955ded4d 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 6a0a4eff6676f508b1e8953f560c164b46e22226..e7959cc38fdd4bc3cdc638fc431bd86390ff8785 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 e7e6506fc4466283c522c708643e0750d7b26d05..715fca70572ed3b8d48b038ab1044e2b1f0ed256 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 9b7a29ebffc05cf54da0f7ee8de39445779221b3..e093e4b68522534efd9f9a9751547c6b776c46cc 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 63a8acafda3da1598fe76f045bc1b2faf2237126..93f321d0d23af901e0c0f00ff70d10612e562db3 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 45f49f94b44fe12a15c6f088756dfbfe9634cecc..d1b9387698103ffedc1e6d5cfcadbbd10b2835ca 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 0ea0dc47c52a27055d31dd9967322bef9c970d88..5e4b343a10b0e1078d28a07770f026cf18d96407 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 012f7451cfa7e6b8e4fc5e0d971982874bb8924b..9750974a12d003d591a5ab31d7c90aa1b6801b1a 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 01c8b567c1bedb98e27f10c048bf94b48d8991cf..162b17f2b02ba1204f85e2e9a4230c34dbddc1fe 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 a9530867ae3ddb72b95ffabe55140c949170505c..74cda2cf0c76d103402570b13456798ca09d6687 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 ae5e7f4b93370fa1075f60f719c62d149d2c56a6..a9e788e69fbfda0358e1875861a3381abe012b6f 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 4dd290a44f96ded685c286cbe907c3a54e57e9dc..fe85a8221f74a4366251a08659e6e026d45381d1 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 9c1edf905286f78524c73e69cf26b76c7ef2f16f..32a9e66b1377a829e75e02539c5db8af5369f30b 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 9a613655f0435c25b06e87f09931c387b6f7cc40..edcf8a6af5cdfbe4123fc26b9ed445e2829ba0e5 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 7a9637bfdf3b23937bbf86f5f258baf35669e110..fb6016ece002f9267869eb6cce92289959e380b3 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 f0cbad1a68aafd745de832610715f6b792cd9827..fc0e492689bf9bccdff9b5a6c04475a551b35055 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 48d9f21d5246c3e770f845f796167c5a63822f9f..fa4e7af7beffe0b4750837f0e16b64419b2a9ec4 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 841fb689ceebe8e5592ff17125e8579d8aee5536..67bfc143f9d94f78e7144375e48e812f97916bfe 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 f2107b47069c3fafa0b0170fed621957381a67f4..c51b4635c0ea9bc58625a11d3b744fb0d194225e 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 3fa2104fad608d7d917b71686cd1ccb7be2ab824..c25391013e40d0c6d073da13f7162086dc2776e6 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 702b24b5d56f2ffe0406adcc1964926bece7504c..645637524e95f9772e89fcaa5a655e21248d522d 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 0a4d05fe340e4a0dc152fa4b8dc2388b0ead4f52..a43aa599ae9a7a0d179d6f311dc4b7a9865c032b 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 c0c84d2c63192439750755e12cf2363029932f09..d207becb0c7ec29c46261f4cf503bacab1c570a5 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 f8f35b369ec864ab247fdd796573d5819f778349..066ee7684f9149bc628f25a8fa680624170cf454 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 44f92420387a6c8dcd3da8734f99d63ba3da36fd..83c480a9099799dec05e339e179527585b24f0b6 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 a5aa7965121753d5689c7561ad08c11a5646a20e..234c1151d4652cf4d9aa58bd144b378c4ca7f5b8 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 5eb833eb5b461ca1d8fbece125fb1d0fc73ae9cc..ba3e7685bff5f66d02c7d59460c78ae26047c364 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 f334b34956397f47c6ef80d54a69dff9eb0b0306..9510007e06f13bb62e8a782ff7fe003192729fda 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 951471baff6c8b4b35557771ce8eaa6ef6634275..02678336a7c23776678e93dbe738689186f46fe3 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 7524831ea1da57b46b7e4d8209e5c0b171ad1393..af36ec5d5224b433ab4ffac7144de1c559bc0460 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 0b55a47903bd964a9a3bab101aacb49af344a786..27702dc6e678ce0f212ed4e62e40d1eaa9469d24 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 f701cbe436c36a1b82fa6c829c2e69f547f9f140..4798217583de3d7a3b19c77be84fcd292b2d4b5e 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 556b31a9c1b214d6321846e3122c05bdcef60964..cdd3e67bf46fa369c549d06789b15bc4f655f3e2 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 d31d17fb9cb83f188dada00982845f790275a9f0..8220f8cf4648e281a3586e584250f064721fa095 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 0241b55d80f514201a4d7bd424f578ec722c00d4..ec84064c122e63e154c59102092d624b0a6cfa47 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 c7d863c4ab02e4b1b12fb8edcfcf95f25df943a0..bfaddb478b4737a58611ca63b7a34fd37fcb6c70 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 e82b060b75b6770b7287583b50f19bc2e3b1fe47..e8635453430a1788ef524e5b0f7cf793471c9694 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 8673231881af736c58708b2bb4f49d7fddb8c096..cf69fea434fa1406d79c9dd45e4abe992589ec0d 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 56536ac6dcee33eedf03c225728a15f82d1c7706..5b208a0668e144f7c0bde7338884efba61546da1 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 57081a7b2c2d936dc3626ccd9d3835a22f43320c..7194bb8717bc5b2b0bf0be9d9e6684e961d6a501 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 132b0a139575fe5ac04301f32c73d6350b42cc01..961fa6c62c33f62f9904089b63d985c23aebef2d 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 09d98521d698e9565bd9838a7166b4fa8fc1416d..00a7bef9776f90cf78b61c88a9e653687453b506 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 b6a2f2d71c0b3f242e967aded635ebad36229528..b097d3fb5db820cc375827cbe68649e4e7d84e05 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 e8827d4880b53418da882fc7fa39048cb0c88cee..2e0073c3ce8423b442b3c0203d03b67cb53eee9e 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 6d307ae7aef1d6874ffad11a3cae57200be1d0b3..b8fc2583cefc13cf5abdcaf680d94a9333e2197d 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