diff --git a/source/contents/code/config.py b/src/contents/code/config.py
similarity index 100%
rename from source/contents/code/config.py
rename to src/contents/code/config.py
diff --git a/source/contents/code/configdef.py b/src/contents/code/configdef.py
similarity index 100%
rename from source/contents/code/configdef.py
rename to src/contents/code/configdef.py
diff --git a/source/contents/code/configwindow.py b/src/contents/code/configwindow.py
similarity index 100%
rename from source/contents/code/configwindow.py
rename to src/contents/code/configwindow.py
diff --git a/source/contents/code/dataengine.py b/src/contents/code/dataengine.py
similarity index 100%
rename from source/contents/code/dataengine.py
rename to src/contents/code/dataengine.py
diff --git a/source/contents/code/main.py b/src/contents/code/main.py
similarity index 100%
rename from source/contents/code/main.py
rename to src/contents/code/main.py
diff --git a/source/contents/code/reinit.py b/src/contents/code/reinit.py
similarity index 99%
rename from source/contents/code/reinit.py
rename to src/contents/code/reinit.py
index 0b0efac..2edb139 100644
--- a/source/contents/code/reinit.py
+++ b/src/contents/code/reinit.py
@@ -277,13 +277,8 @@ class Reinit():
         self.parent.resize(10,10)
         
         # create dataengines
-        label_start = True
-        while label_start:
-            try:
-                self.parent.dataengine.connectToEngine()
-                label_start = False
-            except:
-                pass
+        self.parent.thread().wait(60000)
+        self.parent.dataengine.connectToEngine()
         
         self.parent.timer.setInterval(self.parent.interval)
         self.parent.startPolling()
diff --git a/source/contents/code/util.py b/src/contents/code/util.py
similarity index 100%
rename from source/contents/code/util.py
rename to src/contents/code/util.py
diff --git a/source/contents/ui/configwindow.ui b/src/contents/ui/configwindow.ui
similarity index 100%
rename from source/contents/ui/configwindow.ui
rename to src/contents/ui/configwindow.ui
diff --git a/source/metadata.desktop b/src/metadata.desktop
similarity index 100%
rename from source/metadata.desktop
rename to src/metadata.desktop