diff --git a/old-stuff/ExampleApp/Wrappers.py b/ExampleApp/Wrappers.py
similarity index 100%
rename from old-stuff/ExampleApp/Wrappers.py
rename to ExampleApp/Wrappers.py
diff --git a/ExampleApp/__init__.py b/ExampleApp/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..e7acfa05e7a9da864e4b16b385efba4e12e0768f
--- /dev/null
+++ b/ExampleApp/__init__.py
@@ -0,0 +1,22 @@
+#from .sams_classes import SAMSHub
+import yaml, os, glob
+
+# with open('config/config.yaml', 'r') as f:
+#   hubConf = yaml.load(f.read())
+# hub = SAMSHub(config=hubConf.get(
+#   'ExampleApp',
+#   { 'default_language': 'en', 'main_app': 'Main'}
+# ))
+# hub.flaskApp.config.update(hubConf.get('flask', {}))
+# for appName in hubConf.get('apps', []):
+#   with open('../' + appName + '/manifest.yaml') as f:
+#     manifest = yaml.load(f.read())
+#   # it is possible for the exampleApp to manipulate the manifest if needed
+#   # manifest.update({}) <-- or whatever
+#   hub.addApp(SAMSApp(name = appName, manifest = manifest, langDict = langDict))
+
+def search_yaml_files(path):
+  matchingFiles = []
+  extensions = ['.yaml', '.yml']
+  for path in glob.glob(path + '*.yaml'):
+    print(path + '\n')
\ No newline at end of file
diff --git a/old-stuff/ExampleApp/config/config.yaml b/ExampleApp/config/config.yaml
similarity index 100%
rename from old-stuff/ExampleApp/config/config.yaml
rename to ExampleApp/config/config.yaml
diff --git a/old-stuff/ExampleApp/config/modules.yaml b/ExampleApp/config/modules.yaml
similarity index 100%
rename from old-stuff/ExampleApp/config/modules.yaml
rename to ExampleApp/config/modules.yaml
diff --git a/old-stuff/ExampleApp/exceptions.py b/ExampleApp/exceptions.py
similarity index 100%
rename from old-stuff/ExampleApp/exceptions.py
rename to ExampleApp/exceptions.py
diff --git a/old-stuff/ExampleApp/languages/de.yaml b/ExampleApp/languages/de.yaml
similarity index 100%
rename from old-stuff/ExampleApp/languages/de.yaml
rename to ExampleApp/languages/de.yaml
diff --git a/old-stuff/ExampleApp/manifest.yaml b/ExampleApp/manifest.yaml
similarity index 100%
rename from old-stuff/ExampleApp/manifest.yaml
rename to ExampleApp/manifest.yaml
diff --git a/old-stuff/ExampleApp/modules/.gitkeep b/ExampleApp/modules/.gitkeep
similarity index 100%
rename from old-stuff/ExampleApp/modules/.gitkeep
rename to ExampleApp/modules/.gitkeep
diff --git a/old-stuff/ExampleApp/modules/hallo_module/__init__.py b/ExampleApp/modules/hallo_module/__init__.py
similarity index 100%
rename from old-stuff/ExampleApp/modules/hallo_module/__init__.py
rename to ExampleApp/modules/hallo_module/__init__.py
diff --git a/old-stuff/ExampleApp/modules/hallo_module/languages/de.yaml b/ExampleApp/modules/hallo_module/languages/de.yaml
similarity index 100%
rename from old-stuff/ExampleApp/modules/hallo_module/languages/de.yaml
rename to ExampleApp/modules/hallo_module/languages/de.yaml
diff --git a/old-stuff/ExampleApp/modules/hallo_module/languages/en.yaml b/ExampleApp/modules/hallo_module/languages/en.yaml
similarity index 100%
rename from old-stuff/ExampleApp/modules/hallo_module/languages/en.yaml
rename to ExampleApp/modules/hallo_module/languages/en.yaml
diff --git a/old-stuff/ExampleApp/modules/hallo_module/manifest.yaml b/ExampleApp/modules/hallo_module/manifest.yaml
similarity index 100%
rename from old-stuff/ExampleApp/modules/hallo_module/manifest.yaml
rename to ExampleApp/modules/hallo_module/manifest.yaml
diff --git a/old-stuff/ExampleApp/modules/hallo_module/templates/hallo_module.html b/ExampleApp/modules/hallo_module/templates/hallo_module.html
similarity index 100%
rename from old-stuff/ExampleApp/modules/hallo_module/templates/hallo_module.html
rename to ExampleApp/modules/hallo_module/templates/hallo_module.html
diff --git a/old-stuff/ExampleApp/modules/hallo_module/templates/subview.html b/ExampleApp/modules/hallo_module/templates/subview.html
similarity index 100%
rename from old-stuff/ExampleApp/modules/hallo_module/templates/subview.html
rename to ExampleApp/modules/hallo_module/templates/subview.html
diff --git a/old-stuff/ExampleApp/modules/hallo_module/urls.py b/ExampleApp/modules/hallo_module/urls.py
similarity index 100%
rename from old-stuff/ExampleApp/modules/hallo_module/urls.py
rename to ExampleApp/modules/hallo_module/urls.py
diff --git a/old-stuff/ExampleApp/modules/hallo_module/views.py b/ExampleApp/modules/hallo_module/views.py
similarity index 100%
rename from old-stuff/ExampleApp/modules/hallo_module/views.py
rename to ExampleApp/modules/hallo_module/views.py
diff --git a/old-stuff/ExampleApp/static/.gitkeep b/ExampleApp/static/.gitkeep
similarity index 100%
rename from old-stuff/ExampleApp/static/.gitkeep
rename to ExampleApp/static/.gitkeep
diff --git a/old-stuff/ExampleApp/static/style.css b/ExampleApp/static/style.css
similarity index 100%
rename from old-stuff/ExampleApp/static/style.css
rename to ExampleApp/static/style.css
diff --git a/old-stuff/ExampleApp/templates/.gitkeep b/ExampleApp/templates/.gitkeep
similarity index 100%
rename from old-stuff/ExampleApp/templates/.gitkeep
rename to ExampleApp/templates/.gitkeep
diff --git a/old-stuff/ExampleApp/templates/base-struct.html b/ExampleApp/templates/base-struct.html
similarity index 100%
rename from old-stuff/ExampleApp/templates/base-struct.html
rename to ExampleApp/templates/base-struct.html
diff --git a/old-stuff/ExampleApp/templates/home.html b/ExampleApp/templates/home.html
similarity index 100%
rename from old-stuff/ExampleApp/templates/home.html
rename to ExampleApp/templates/home.html
diff --git a/old-stuff/ExampleApp/templates/login.html b/ExampleApp/templates/login.html
similarity index 100%
rename from old-stuff/ExampleApp/templates/login.html
rename to ExampleApp/templates/login.html
diff --git a/old-stuff/ExampleApp/views.py b/ExampleApp/views.py
similarity index 100%
rename from old-stuff/ExampleApp/views.py
rename to ExampleApp/views.py
diff --git a/app.py b/app.py
deleted file mode 100644
index e68e1eba7ab60969f70e7e160aca42733156445d..0000000000000000000000000000000000000000
--- a/app.py
+++ /dev/null
@@ -1,5 +0,0 @@
-#from test_app import hub
-
-#hub.app.run(debug = True)
-from importlib import import_module
-import_module('foo')
\ No newline at end of file
diff --git a/example_app.py b/example_app.py
new file mode 100644
index 0000000000000000000000000000000000000000..e77d90a2ca952a9cb8779694101b831a322f275d
--- /dev/null
+++ b/example_app.py
@@ -0,0 +1,3 @@
+from .ExampleApp import hub
+
+hub.flaskApp.run()
\ No newline at end of file
diff --git a/old-stuff/ExampleApp/__init__.py b/old-stuff/ExampleApp/__init__.py
deleted file mode 100644
index a4bd17439f42a8005e1b613ab2ccf6cf3068dbaf..0000000000000000000000000000000000000000
--- a/old-stuff/ExampleApp/__init__.py
+++ /dev/null
@@ -1,17 +0,0 @@
-from ..sams_classes import SAMSHub
-import yaml
-
-with open('config/config.yaml', 'r') as f:
-  hubConf = yaml.load(f.read())
-hub = SAMSHub(config=hubConf.get(
-  'ExampleApp',
-  { 'default_language': 'en', 'main_app': 'Main'}
-))
-hub.flaskApp.config.update(hubConf.get('flask', {}))
-for appName in hubConf.get('apps', []):
-  with open('../' + appName + '/manifest.yaml') as f:
-    manifest = yaml.load(f.read())
-  # it is possible for the exampleApp to manipulate the manifest if needed
-  # manifest.update({}) <-- or whatever
-"""  TODO: loadDictFromYAMLFiles """
-  hub.addApp(SAMSApp(name = appName, manifest = manifest, langDict = langDict))
\ No newline at end of file
diff --git a/old-stuff/app.py b/old-stuff/app.py
index 68af58eae6ce471fa1423f45605c020d19452f76..99f3b5351d38269fe8a64589892800569421068a 100644
--- a/old-stuff/app.py
+++ b/old-stuff/app.py
@@ -1,3 +1,4 @@
-from ExampleApp import hub
+from ExampleApp import search_yaml_files
 
-hub.flaskApp.run()
+# hub.flaskApp.run()
+search_yaml_files('./ExampleApp/config/')
\ No newline at end of file