diff --git a/WATERS-FMTV-challenges/WATERS_FMTV_Challenges__Eclipse_projects__APP4MC_v0.9.6.zip b/WATERS-FMTV-challenges/WATERS_FMTV_Challenges__Eclipse_projects__APP4MC_v0.9.6.zip
new file mode 100644
index 0000000..41fb60f
--- /dev/null
+++ b/WATERS-FMTV-challenges/WATERS_FMTV_Challenges__Eclipse_projects__APP4MC_v0.9.6.zip
Binary files differ
diff --git a/fmtv-challenge-2016/FMTV_challenge_2016_Bosch.pdf b/WATERS-FMTV-challenges/fmtv-challenge-2016/FMTV_challenge_2016_Bosch.pdf
similarity index 100%
rename from fmtv-challenge-2016/FMTV_challenge_2016_Bosch.pdf
rename to WATERS-FMTV-challenges/fmtv-challenge-2016/FMTV_challenge_2016_Bosch.pdf
Binary files differ
diff --git a/fmtv-challenge-2016/_readme_WATERS_2016.txt b/WATERS-FMTV-challenges/fmtv-challenge-2016/_readme_WATERS_2016.txt
similarity index 100%
rename from fmtv-challenge-2016/_readme_WATERS_2016.txt
rename to WATERS-FMTV-challenges/fmtv-challenge-2016/_readme_WATERS_2016.txt
diff --git a/fmtv-challenge-2016/models/original/ChallengeModel_updated.zip b/WATERS-FMTV-challenges/fmtv-challenge-2016/models/original/ChallengeModel_updated.zip
similarity index 100%
rename from fmtv-challenge-2016/models/original/ChallengeModel_updated.zip
rename to WATERS-FMTV-challenges/fmtv-challenge-2016/models/original/ChallengeModel_updated.zip
Binary files differ
diff --git a/fmtv-challenge-2016/models/updated/GeneratedModel_format_0.7.0.amxmi.zip b/WATERS-FMTV-challenges/fmtv-challenge-2016/models/updated/GeneratedModel_format_0.7.0.amxmi.zip
similarity index 100%
rename from fmtv-challenge-2016/models/updated/GeneratedModel_format_0.7.0.amxmi.zip
rename to WATERS-FMTV-challenges/fmtv-challenge-2016/models/updated/GeneratedModel_format_0.7.0.amxmi.zip
Binary files differ
diff --git a/fmtv-challenge-2016/models/updated/GeneratedModel_format_0.7.1.amxmi.zip b/WATERS-FMTV-challenges/fmtv-challenge-2016/models/updated/GeneratedModel_format_0.7.1.amxmi.zip
similarity index 100%
rename from fmtv-challenge-2016/models/updated/GeneratedModel_format_0.7.1.amxmi.zip
rename to WATERS-FMTV-challenges/fmtv-challenge-2016/models/updated/GeneratedModel_format_0.7.1.amxmi.zip
Binary files differ
diff --git a/fmtv-challenge-2016/models/updated/GeneratedModel_format_0.7.2.amxmi.zip b/WATERS-FMTV-challenges/fmtv-challenge-2016/models/updated/GeneratedModel_format_0.7.2.amxmi.zip
similarity index 100%
rename from fmtv-challenge-2016/models/updated/GeneratedModel_format_0.7.2.amxmi.zip
rename to WATERS-FMTV-challenges/fmtv-challenge-2016/models/updated/GeneratedModel_format_0.7.2.amxmi.zip
Binary files differ
diff --git a/fmtv-challenge-2016/models/updated/GeneratedModel_format_0.8.0.amxmi.zip b/WATERS-FMTV-challenges/fmtv-challenge-2016/models/updated/GeneratedModel_format_0.8.0.amxmi.zip
similarity index 100%
rename from fmtv-challenge-2016/models/updated/GeneratedModel_format_0.8.0.amxmi.zip
rename to WATERS-FMTV-challenges/fmtv-challenge-2016/models/updated/GeneratedModel_format_0.8.0.amxmi.zip
Binary files differ
diff --git a/fmtv-challenge-2016/related_info/RTAS_2016/RTAS-demo-paper-3.pdf b/WATERS-FMTV-challenges/fmtv-challenge-2016/related_info/RTAS_2016/RTAS-demo-paper-3.pdf
similarity index 100%
rename from fmtv-challenge-2016/related_info/RTAS_2016/RTAS-demo-paper-3.pdf
rename to WATERS-FMTV-challenges/fmtv-challenge-2016/related_info/RTAS_2016/RTAS-demo-paper-3.pdf
Binary files differ
diff --git a/fmtv-challenge-2016/related_info/RTAS_2016/RTAS-demo-presentation-3.pdf b/WATERS-FMTV-challenges/fmtv-challenge-2016/related_info/RTAS_2016/RTAS-demo-presentation-3.pdf
similarity index 100%
rename from fmtv-challenge-2016/related_info/RTAS_2016/RTAS-demo-presentation-3.pdf
rename to WATERS-FMTV-challenges/fmtv-challenge-2016/related_info/RTAS_2016/RTAS-demo-presentation-3.pdf
Binary files differ
diff --git a/fmtv-challenge-2016/related_info/RTAS_2016/_readme_RTAS_2016.txt b/WATERS-FMTV-challenges/fmtv-challenge-2016/related_info/RTAS_2016/_readme_RTAS_2016.txt
similarity index 100%
rename from fmtv-challenge-2016/related_info/RTAS_2016/_readme_RTAS_2016.txt
rename to WATERS-FMTV-challenges/fmtv-challenge-2016/related_info/RTAS_2016/_readme_RTAS_2016.txt
diff --git a/fmtv-challenge-2016/related_info/WATERS_2015/Real World Automotive Benchmarks For Free - ECRTS - WATERS 2015.pdf b/WATERS-FMTV-challenges/fmtv-challenge-2016/related_info/WATERS_2015/Real World Automotive Benchmarks For Free - ECRTS - WATERS 2015.pdf
similarity index 100%
rename from fmtv-challenge-2016/related_info/WATERS_2015/Real World Automotive Benchmarks For Free - ECRTS - WATERS 2015.pdf
rename to WATERS-FMTV-challenges/fmtv-challenge-2016/related_info/WATERS_2015/Real World Automotive Benchmarks For Free - ECRTS - WATERS 2015.pdf
Binary files differ
diff --git a/fmtv-challenge-2016/related_info/WATERS_2015/WATERS15_Real_World_Automotive_Benchmark_For_Free.pdf b/WATERS-FMTV-challenges/fmtv-challenge-2016/related_info/WATERS_2015/WATERS15_Real_World_Automotive_Benchmark_For_Free.pdf
similarity index 100%
rename from fmtv-challenge-2016/related_info/WATERS_2015/WATERS15_Real_World_Automotive_Benchmark_For_Free.pdf
rename to WATERS-FMTV-challenges/fmtv-challenge-2016/related_info/WATERS_2015/WATERS15_Real_World_Automotive_Benchmark_For_Free.pdf
Binary files differ
diff --git a/fmtv-challenge-2016/related_info/WATERS_2015/_readme_WATERS_2015.txt b/WATERS-FMTV-challenges/fmtv-challenge-2016/related_info/WATERS_2015/_readme_WATERS_2015.txt
similarity index 100%
rename from fmtv-challenge-2016/related_info/WATERS_2015/_readme_WATERS_2015.txt
rename to WATERS-FMTV-challenges/fmtv-challenge-2016/related_info/WATERS_2015/_readme_WATERS_2015.txt
diff --git a/fmtv-challenge-2017/WATERS2017_Industrial_Challenge_Bosch.pdf b/WATERS-FMTV-challenges/fmtv-challenge-2017/WATERS2017_Industrial_Challenge_Bosch.pdf
similarity index 100%
rename from fmtv-challenge-2017/WATERS2017_Industrial_Challenge_Bosch.pdf
rename to WATERS-FMTV-challenges/fmtv-challenge-2017/WATERS2017_Industrial_Challenge_Bosch.pdf
Binary files differ
diff --git a/fmtv-challenge-2017/_readme_WATERS_2017.txt b/WATERS-FMTV-challenges/fmtv-challenge-2017/_readme_WATERS_2017.txt
similarity index 100%
rename from fmtv-challenge-2017/_readme_WATERS_2017.txt
rename to WATERS-FMTV-challenges/fmtv-challenge-2017/_readme_WATERS_2017.txt
diff --git a/fmtv-challenge-2017/models/original/Bosch_ChallengeModel_w_LabelStats_fixedLabelMapping_App4mc_v072.zip b/WATERS-FMTV-challenges/fmtv-challenge-2017/models/original/Bosch_ChallengeModel_w_LabelStats_fixedLabelMapping_App4mc_v072.zip
similarity index 100%
rename from fmtv-challenge-2017/models/original/Bosch_ChallengeModel_w_LabelStats_fixedLabelMapping_App4mc_v072.zip
rename to WATERS-FMTV-challenges/fmtv-challenge-2017/models/original/Bosch_ChallengeModel_w_LabelStats_fixedLabelMapping_App4mc_v072.zip
Binary files differ
diff --git a/fmtv-challenge-2017/models/original/Bosch_ChallengeModel_withCommImplementationType_v082.zip b/WATERS-FMTV-challenges/fmtv-challenge-2017/models/original/Bosch_ChallengeModel_withCommImplementationType_v082.zip
similarity index 100%
rename from fmtv-challenge-2017/models/original/Bosch_ChallengeModel_withCommImplementationType_v082.zip
rename to WATERS-FMTV-challenges/fmtv-challenge-2017/models/original/Bosch_ChallengeModel_withCommImplementationType_v082.zip
Binary files differ
diff --git a/fmtv-challenge-2017/models/updated/ChallengeModel_w_LabelStats_fixedLabelMapping_App4mc_v072.zip b/WATERS-FMTV-challenges/fmtv-challenge-2017/models/updated/ChallengeModel_w_LabelStats_fixedLabelMapping_App4mc_v072.zip
similarity index 100%
rename from fmtv-challenge-2017/models/updated/ChallengeModel_w_LabelStats_fixedLabelMapping_App4mc_v072.zip
rename to WATERS-FMTV-challenges/fmtv-challenge-2017/models/updated/ChallengeModel_w_LabelStats_fixedLabelMapping_App4mc_v072.zip
Binary files differ
diff --git a/fmtv-challenge-2017/models/updated/ChallengeModel_w_LabelStats_fixedLabelMapping_App4mc_v080.zip b/WATERS-FMTV-challenges/fmtv-challenge-2017/models/updated/ChallengeModel_w_LabelStats_fixedLabelMapping_App4mc_v080.zip
similarity index 100%
rename from fmtv-challenge-2017/models/updated/ChallengeModel_w_LabelStats_fixedLabelMapping_App4mc_v080.zip
rename to WATERS-FMTV-challenges/fmtv-challenge-2017/models/updated/ChallengeModel_w_LabelStats_fixedLabelMapping_App4mc_v080.zip
Binary files differ
diff --git a/fmtv-challenge-2017/models/updated/ChallengeModel_w_LabelStats_fixedLabelMapping_fixedSporadicStimuli_App4mc_v080.zip b/WATERS-FMTV-challenges/fmtv-challenge-2017/models/updated/ChallengeModel_w_LabelStats_fixedLabelMapping_fixedSporadicStimuli_App4mc_v080.zip
similarity index 100%
rename from fmtv-challenge-2017/models/updated/ChallengeModel_w_LabelStats_fixedLabelMapping_fixedSporadicStimuli_App4mc_v080.zip
rename to WATERS-FMTV-challenges/fmtv-challenge-2017/models/updated/ChallengeModel_w_LabelStats_fixedLabelMapping_fixedSporadicStimuli_App4mc_v080.zip
Binary files differ
diff --git a/fmtv-challenge-2017/models/updated/ChallengeModel_w_LabelStats_fixedLabelMapping_fixedSporadicStimuli_App4mc_v081.zip b/WATERS-FMTV-challenges/fmtv-challenge-2017/models/updated/ChallengeModel_w_LabelStats_fixedLabelMapping_fixedSporadicStimuli_App4mc_v081.zip
similarity index 100%
rename from fmtv-challenge-2017/models/updated/ChallengeModel_w_LabelStats_fixedLabelMapping_fixedSporadicStimuli_App4mc_v081.zip
rename to WATERS-FMTV-challenges/fmtv-challenge-2017/models/updated/ChallengeModel_w_LabelStats_fixedLabelMapping_fixedSporadicStimuli_App4mc_v081.zip
Binary files differ
diff --git a/fmtv-challenge-2017/models/updated/ChallengeModel_wih_CommImplementationType_App4mc_v082.zip b/WATERS-FMTV-challenges/fmtv-challenge-2017/models/updated/ChallengeModel_wih_CommImplementationType_App4mc_v082.zip
similarity index 100%
rename from fmtv-challenge-2017/models/updated/ChallengeModel_wih_CommImplementationType_App4mc_v082.zip
rename to WATERS-FMTV-challenges/fmtv-challenge-2017/models/updated/ChallengeModel_wih_CommImplementationType_App4mc_v082.zip
Binary files differ
diff --git a/fmtv-challenge-2017/models/updated/ChallengeModel_withCommImplementationType_v0.9.5.amxmi.zip b/WATERS-FMTV-challenges/fmtv-challenge-2017/models/updated/ChallengeModel_withCommImplementationType_v0.9.5.amxmi.zip
similarity index 100%
rename from fmtv-challenge-2017/models/updated/ChallengeModel_withCommImplementationType_v0.9.5.amxmi.zip
rename to WATERS-FMTV-challenges/fmtv-challenge-2017/models/updated/ChallengeModel_withCommImplementationType_v0.9.5.amxmi.zip
Binary files differ
diff --git a/fmtv-challenge-2017/related_info/workflowExample.zip b/WATERS-FMTV-challenges/fmtv-challenge-2017/related_info/workflowExample.zip
similarity index 100%
rename from fmtv-challenge-2017/related_info/workflowExample.zip
rename to WATERS-FMTV-challenges/fmtv-challenge-2017/related_info/workflowExample.zip
Binary files differ
diff --git a/WATERS-FMTV-challenges/fmtv-challenge-2019/ChallengeModel_release_fix.zip b/WATERS-FMTV-challenges/fmtv-challenge-2019/ChallengeModel_release_fix.zip
new file mode 100644
index 0000000..a148bc5
--- /dev/null
+++ b/WATERS-FMTV-challenges/fmtv-challenge-2019/ChallengeModel_release_fix.zip
Binary files differ
diff --git a/WATERS-FMTV-challenges/fmtv-challenge-2019/WATERS_Industrial_Challenge_2019.pdf b/WATERS-FMTV-challenges/fmtv-challenge-2019/WATERS_Industrial_Challenge_2019.pdf
new file mode 100644
index 0000000..806651e
--- /dev/null
+++ b/WATERS-FMTV-challenges/fmtv-challenge-2019/WATERS_Industrial_Challenge_2019.pdf
Binary files differ
diff --git a/WATERS-FMTV-challenges/fmtv-challenge-2019/_readme_WATERS_2019.txt b/WATERS-FMTV-challenges/fmtv-challenge-2019/_readme_WATERS_2019.txt
new file mode 100644
index 0000000..c655c3a
--- /dev/null
+++ b/WATERS-FMTV-challenges/fmtv-challenge-2019/_readme_WATERS_2019.txt
@@ -0,0 +1,29 @@
+______________________________________________________________________________________________
+
+WATERS 2019
+
+International Workshop on Analysis Tools and Methodologies for Embedded and Real-time Systems
+
+https://www.ecrts.org/archives/fileadmin/WebsitesArchiv/ecrts2019/waters
+
+
+WATERS 2019 community forum
+
+https://www.ecrts.org/forum/viewforum.php?f=42&sid=273e69c4b3fcb4746fe0d1dd25ca8970
+
+______________________________________________________________________________________________
+
+Description of the WATERS Industrial Challenge 2019
+
+The 2019 FMTV Challenge (BOSCH)
+
+https://www.ecrts.org/forum/viewtopic.php?f=43&t=124&sid=0ed1902afb3bc9cdc463ad4e5fbe7470
+
+______________________________________________________________________________________________
+
+Origin:
+	Forum
+	https://www.ecrts.org/forum/viewtopic.php?f=43&t=126&sid=6e0c255145af515ce5aabe92a64618db
+
+	ChallengeModel_release_fix.zip
+	https://www.ecrts.org/forum/download/file.php?id=117&sid=e70ad88e33ec8b258b8cd3274164d727
diff --git a/WATERS-FMTV-challenges/readme.txt b/WATERS-FMTV-challenges/readme.txt
new file mode 100644
index 0000000..de8dea6
--- /dev/null
+++ b/WATERS-FMTV-challenges/readme.txt
@@ -0,0 +1,38 @@
+
+WATERS - International Workshop on Analysis Tools and Methodologies for Embedded and Real-time Systems
+
+https://www.ecrts.org/archives/index9140.html?id=waters
+
+__________________________________________________________
+
+WATERS Industrial Challenges 2016, 2017, 2019
+__________________________________________________________
+
+
+The documents, references and the original model files of the
+industrial challenges are stored in the following subfolders:
+
+ - fmtv-challenge-2016/
+ - fmtv-challenge-2017/
+ - fmtv-challenge-2019/
+__________________________________________________________
+
+If you use the Eclipse APP4MC products the recommended way to load
+the challenge models is an import of the zipped projects.
+
+
+1. Get the APP4MC platform
+
+    https://projects.eclipse.org/projects/technology.app4mc/downloads
+
+2. Import the projects into workspace
+
+    Import... > General > Existing Projects into Workspace
+
+    Select archive file
+
+The following archive files contain migrated versions
+of the original challenge models with manual fixes:
+
+ - WATERS_FMTV_Challenges__Eclipse_projects__APP4MC_v0.9.6.zip
+