diff --git a/.gitignore b/.gitignore
index ec3cdec..a16a248 100644
--- a/.gitignore
+++ b/.gitignore
@@ -58,3 +58,16 @@ coverage.xml
 # Sphinx documentation
 docs/_build/
 
+# OSX
+**/.DS_Store
+
+# python
+**/*.pyc
+**/__pycache__
+**/*.pyon
+**/*.h5
+
+# all of .idea (pycharm's config files)
+.idea
+**/.idea
+.idea/**
diff --git a/gui/__init__.py b/gui/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/config_gui.py b/gui/config_gui.py
similarity index 99%
rename from config_gui.py
rename to gui/config_gui.py
index 7416b96..8ce4d3a 100644
--- a/config_gui.py
+++ b/gui/config_gui.py
@@ -29,7 +29,7 @@ def accept(self):
     def do_dirSelect(self):
         start_path = str(self.registryPath.text())
         if not os.exists(start_path):
-            start_path = '.'
+            start_path = '..'
         dirname = str(QtGui.QFileDialog.getExistingDirectory(self, "Select Directory", directory=start_path))
         if dirname:
             self.registryPath.setText(dirname)
diff --git a/manager_blacklist.ui b/gui/manager_blacklist.ui
similarity index 100%
rename from manager_blacklist.ui
rename to gui/manager_blacklist.ui
diff --git a/manager_config.ui b/gui/manager_config.ui
similarity index 100%
rename from manager_config.ui
rename to gui/manager_config.ui
diff --git a/manager_gui.py b/gui/manager_gui.py
similarity index 99%
rename from manager_gui.py
rename to gui/manager_gui.py
index 86e8677..2f0420b 100755
--- a/manager_gui.py
+++ b/gui/manager_gui.py
@@ -1,6 +1,5 @@
 #!/usr/bin/python
 import sys
-import os
 #if __name__ == "__main__":
 #    if os.name == "posix":
 #        sys.path.insert(0, os.path.join(os.environ['HOME'], 'src/pylabrad-0.93.#1/'))
diff --git a/manager_gui.ui b/gui/manager_gui.ui
similarity index 100%
rename from manager_gui.ui
rename to gui/manager_gui.ui
diff --git a/qt_designer_notes.txt b/gui/qt_designer_notes.txt
similarity index 100%
rename from qt_designer_notes.txt
rename to gui/qt_designer_notes.txt
diff --git a/test_dns.py b/tests/test_dns.py
similarity index 100%
rename from test_dns.py
rename to tests/test_dns.py
diff --git a/test_manager.py b/tests/test_manager.py
similarity index 100%
rename from test_manager.py
rename to tests/test_manager.py
diff --git a/profile_test.py b/tests/test_profile.py
similarity index 100%
rename from profile_test.py
rename to tests/test_profile.py