diff --git a/Analysis.thy b/UPF/Analysis.thy
similarity index 100%
rename from Analysis.thy
rename to UPF/Analysis.thy
diff --git a/ElementaryPolicies.thy b/UPF/ElementaryPolicies.thy
similarity index 100%
rename from ElementaryPolicies.thy
rename to UPF/ElementaryPolicies.thy
diff --git a/Monads.thy b/UPF/Monads.thy
similarity index 100%
rename from Monads.thy
rename to UPF/Monads.thy
diff --git a/Normalisation.thy b/UPF/Normalisation.thy
similarity index 100%
rename from Normalisation.thy
rename to UPF/Normalisation.thy
diff --git a/NormalisationTestSpecification.thy b/UPF/NormalisationTestSpecification.thy
similarity index 100%
rename from NormalisationTestSpecification.thy
rename to UPF/NormalisationTestSpecification.thy
diff --git a/ParallelComposition.thy b/UPF/ParallelComposition.thy
similarity index 100%
rename from ParallelComposition.thy
rename to UPF/ParallelComposition.thy
diff --git a/ROOT b/UPF/ROOT
similarity index 100%
rename from ROOT
rename to UPF/ROOT
diff --git a/SeqComposition.thy b/UPF/SeqComposition.thy
similarity index 100%
rename from SeqComposition.thy
rename to UPF/SeqComposition.thy
diff --git a/Service.thy b/UPF/Service.thy
similarity index 100%
rename from Service.thy
rename to UPF/Service.thy
diff --git a/ServiceExample.thy b/UPF/ServiceExample.thy
similarity index 100%
rename from ServiceExample.thy
rename to UPF/ServiceExample.thy
diff --git a/UPF.thy b/UPF/UPF.thy
similarity index 100%
rename from UPF.thy
rename to UPF/UPF.thy
diff --git a/UPFCore.thy b/UPF/UPFCore.thy
similarity index 100%
rename from UPFCore.thy
rename to UPF/UPFCore.thy
diff --git a/document/auto/root.el b/UPF/document/auto/root.el
similarity index 100%
rename from document/auto/root.el
rename to UPF/document/auto/root.el
diff --git a/document/conclusion.tex b/UPF/document/conclusion.tex
similarity index 100%
rename from document/conclusion.tex
rename to UPF/document/conclusion.tex
diff --git a/document/example-intro.tex b/UPF/document/example-intro.tex
similarity index 100%
rename from document/example-intro.tex
rename to UPF/document/example-intro.tex
diff --git a/document/introduction.tex b/UPF/document/introduction.tex
similarity index 100%
rename from document/introduction.tex
rename to UPF/document/introduction.tex
diff --git a/document/root.bib b/UPF/document/root.bib
similarity index 100%
rename from document/root.bib
rename to UPF/document/root.bib
diff --git a/document/root.tex b/UPF/document/root.tex
similarity index 100%
rename from document/root.tex
rename to UPF/document/root.tex
diff --git a/config b/config
deleted file mode 100644
index 5614d14..0000000
--- a/config
+++ /dev/null
@@ -1,9 +0,0 @@
-# -*- shell-script -*-
-
-# Get email when automated build fails. May be empty.
-# values: "email1 email2 .. emailn"
-NOTIFY="adbrucker@0x5f.org wolff@lri.fr lukas.a.bruegger@gmail.com"
-
-# Participate in frequent (nightly) build (only for small submissions)
-# values: "yes" "no"
-FREQUENT="no"