diff --git a/irods-basicGUI/README.md b/irods-iBridgesGui/README.md
similarity index 100%
rename from irods-basicGUI/README.md
rename to irods-iBridgesGui/README.md
diff --git a/irods-basicGUI/checkableFsTree.py b/irods-iBridgesGui/checkableFsTree.py
similarity index 100%
rename from irods-basicGUI/checkableFsTree.py
rename to irods-iBridgesGui/checkableFsTree.py
diff --git a/irods-basicGUI/continousUpload.py b/irods-iBridgesGui/continousUpload.py
similarity index 100%
rename from irods-basicGUI/continousUpload.py
rename to irods-iBridgesGui/continousUpload.py
diff --git a/irods-basicGUI/dataTransfer.py b/irods-iBridgesGui/dataTransfer.py
similarity index 99%
rename from irods-basicGUI/dataTransfer.py
rename to irods-iBridgesGui/dataTransfer.py
index a6d7b8b4908a440857da9135e4cc8537d544bfe5..8627f4ac7c438d0702ce7228524688e42774fbcc 100644
--- a/irods-basicGUI/dataTransfer.py
+++ b/irods-iBridgesGui/dataTransfer.py
@@ -176,9 +176,10 @@ class getDataState(QObject):
             else:
                 #data is placed inside fsDir, check if obj or coll is inside
                 subFsPath = os.path.join(self.localFsPath, self.coll.name)
-                if not os.path.isdir(subFsPath):
-                    os.mkdir(subFsPath)
+                #if not os.path.isdir(subFsPath):
+                #    os.mkdir(subFsPath)
                 if self.ic.session.collections.exists(self.coll.path):
+                    os.mkdir(subFsPath)
                     (diff, onlyFS, onlyIrods, same) = self.ic.diffIrodsLocalfs(
                                                   self.coll, subFsPath, scope="checksum")
                 elif self.ic.session.data_objects.exists(self.coll.path):
diff --git a/irods-basicGUI/elabConnector.py b/irods-iBridgesGui/elabConnector.py
similarity index 100%
rename from irods-basicGUI/elabConnector.py
rename to irods-iBridgesGui/elabConnector.py
diff --git a/irods-basicGUI/elabUpload.py b/irods-iBridgesGui/elabUpload.py
similarity index 100%
rename from irods-basicGUI/elabUpload.py
rename to irods-iBridgesGui/elabUpload.py
diff --git a/irods-basicGUI/icons/arrow-left.png b/irods-iBridgesGui/icons/arrow-left.png
similarity index 100%
rename from irods-basicGUI/icons/arrow-left.png
rename to irods-iBridgesGui/icons/arrow-left.png
diff --git a/irods-basicGUI/icons/arrow-right.png b/irods-iBridgesGui/icons/arrow-right.png
similarity index 100%
rename from irods-basicGUI/icons/arrow-right.png
rename to irods-iBridgesGui/icons/arrow-right.png
diff --git a/irods-basicGUI/icons/home.png b/irods-iBridgesGui/icons/home.png
similarity index 100%
rename from irods-basicGUI/icons/home.png
rename to irods-iBridgesGui/icons/home.png
diff --git a/irods-basicGUI/icons/irods-basicGUI_Login.png b/irods-iBridgesGui/icons/irods-basicGUI_Login.png
similarity index 100%
rename from irods-basicGUI/icons/irods-basicGUI_Login.png
rename to irods-iBridgesGui/icons/irods-basicGUI_Login.png
diff --git a/irods-basicGUI/icons/loading_circle.gif b/irods-iBridgesGui/icons/loading_circle.gif
similarity index 100%
rename from irods-basicGUI/icons/loading_circle.gif
rename to irods-iBridgesGui/icons/loading_circle.gif
diff --git a/irods-basicGUI/icons/nosync.png b/irods-iBridgesGui/icons/nosync.png
similarity index 100%
rename from irods-basicGUI/icons/nosync.png
rename to irods-iBridgesGui/icons/nosync.png
diff --git a/irods-basicGUI/icons/syncing.png b/irods-iBridgesGui/icons/syncing.png
similarity index 100%
rename from irods-basicGUI/icons/syncing.png
rename to irods-iBridgesGui/icons/syncing.png
diff --git a/irods-basicGUI/irods-iBridgesGui.py b/irods-iBridgesGui/irods-iBridgesGui.py
similarity index 100%
rename from irods-basicGUI/irods-iBridgesGui.py
rename to irods-iBridgesGui/irods-iBridgesGui.py
diff --git a/irods-basicGUI/irodsBrowser.py b/irods-iBridgesGui/irodsBrowser.py
similarity index 100%
rename from irods-basicGUI/irodsBrowser.py
rename to irods-iBridgesGui/irodsBrowser.py
diff --git a/irods-basicGUI/irodsConnector.py b/irods-iBridgesGui/irodsConnector.py
similarity index 100%
rename from irods-basicGUI/irodsConnector.py
rename to irods-iBridgesGui/irodsConnector.py
diff --git a/irods-basicGUI/irodsConnectorIcommands.py b/irods-iBridgesGui/irodsConnectorIcommands.py
similarity index 100%
rename from irods-basicGUI/irodsConnectorIcommands.py
rename to irods-iBridgesGui/irodsConnectorIcommands.py
diff --git a/irods-basicGUI/irodsDataCompression.py b/irods-iBridgesGui/irodsDataCompression.py
similarity index 100%
rename from irods-basicGUI/irodsDataCompression.py
rename to irods-iBridgesGui/irodsDataCompression.py
diff --git a/irods-basicGUI/irodsSearch.py b/irods-iBridgesGui/irodsSearch.py
similarity index 100%
rename from irods-basicGUI/irodsSearch.py
rename to irods-iBridgesGui/irodsSearch.py
diff --git a/irods-basicGUI/irodsTreeView.py b/irods-iBridgesGui/irodsTreeView.py
similarity index 100%
rename from irods-basicGUI/irodsTreeView.py
rename to irods-iBridgesGui/irodsTreeView.py
diff --git a/irods-basicGUI/irodsUpDownload.py b/irods-iBridgesGui/irodsUpDownload.py
similarity index 100%
rename from irods-basicGUI/irodsUpDownload.py
rename to irods-iBridgesGui/irodsUpDownload.py
diff --git a/irods-basicGUI/mainmenu.py b/irods-iBridgesGui/mainmenu.py
similarity index 100%
rename from irods-basicGUI/mainmenu.py
rename to irods-iBridgesGui/mainmenu.py
diff --git a/irods-basicGUI/popupWidgets.py b/irods-iBridgesGui/popupWidgets.py
similarity index 100%
rename from irods-basicGUI/popupWidgets.py
rename to irods-iBridgesGui/popupWidgets.py
diff --git a/irods-basicGUI/requirements.txt b/irods-iBridgesGui/requirements.txt
similarity index 100%
rename from irods-basicGUI/requirements.txt
rename to irods-iBridgesGui/requirements.txt
diff --git a/irods-basicGUI/rules/tarCollection.r b/irods-iBridgesGui/rules/tarCollection.r
similarity index 100%
rename from irods-basicGUI/rules/tarCollection.r
rename to irods-iBridgesGui/rules/tarCollection.r
diff --git a/irods-basicGUI/rules/tarExtract.r b/irods-iBridgesGui/rules/tarExtract.r
similarity index 100%
rename from irods-basicGUI/rules/tarExtract.r
rename to irods-iBridgesGui/rules/tarExtract.r
diff --git a/irods-basicGUI/rules/tarReadIndex.r b/irods-iBridgesGui/rules/tarReadIndex.r
similarity index 100%
rename from irods-basicGUI/rules/tarReadIndex.r
rename to irods-iBridgesGui/rules/tarReadIndex.r
diff --git a/irods-basicGUI/ui-files/MainMenu.ui b/irods-iBridgesGui/ui-files/MainMenu.ui
similarity index 100%
rename from irods-basicGUI/ui-files/MainMenu.ui
rename to irods-iBridgesGui/ui-files/MainMenu.ui
diff --git a/irods-basicGUI/ui-files/createCollection.ui b/irods-iBridgesGui/ui-files/createCollection.ui
similarity index 100%
rename from irods-basicGUI/ui-files/createCollection.ui
rename to irods-iBridgesGui/ui-files/createCollection.ui
diff --git a/irods-basicGUI/ui-files/dataTransferState.ui b/irods-iBridgesGui/ui-files/dataTransferState.ui
similarity index 100%
rename from irods-basicGUI/ui-files/dataTransferState.ui
rename to irods-iBridgesGui/ui-files/dataTransferState.ui
diff --git a/irods-basicGUI/ui-files/irodsIndexPopup.ui b/irods-iBridgesGui/ui-files/irodsIndexPopup.ui
similarity index 100%
rename from irods-basicGUI/ui-files/irodsIndexPopup.ui
rename to irods-iBridgesGui/ui-files/irodsIndexPopup.ui
diff --git a/irods-basicGUI/ui-files/irodsLogin.ui b/irods-iBridgesGui/ui-files/irodsLogin.ui
similarity index 100%
rename from irods-basicGUI/ui-files/irodsLogin.ui
rename to irods-iBridgesGui/ui-files/irodsLogin.ui
diff --git a/irods-basicGUI/ui-files/searchDialog.ui b/irods-iBridgesGui/ui-files/searchDialog.ui
similarity index 100%
rename from irods-basicGUI/ui-files/searchDialog.ui
rename to irods-iBridgesGui/ui-files/searchDialog.ui
diff --git a/irods-basicGUI/ui-files/tabBrowser.ui b/irods-iBridgesGui/ui-files/tabBrowser.ui
similarity index 100%
rename from irods-basicGUI/ui-files/tabBrowser.ui
rename to irods-iBridgesGui/ui-files/tabBrowser.ui
diff --git a/irods-basicGUI/ui-files/tabDataCompression.ui b/irods-iBridgesGui/ui-files/tabDataCompression.ui
similarity index 100%
rename from irods-basicGUI/ui-files/tabDataCompression.ui
rename to irods-iBridgesGui/ui-files/tabDataCompression.ui
diff --git a/irods-basicGUI/ui-files/tabELNData.ui b/irods-iBridgesGui/ui-files/tabELNData.ui
similarity index 100%
rename from irods-basicGUI/ui-files/tabELNData.ui
rename to irods-iBridgesGui/ui-files/tabELNData.ui
diff --git a/irods-basicGUI/ui-files/tabFederations.ui b/irods-iBridgesGui/ui-files/tabFederations.ui
similarity index 100%
rename from irods-basicGUI/ui-files/tabFederations.ui
rename to irods-iBridgesGui/ui-files/tabFederations.ui
diff --git a/irods-basicGUI/ui-files/tabPage.ui b/irods-iBridgesGui/ui-files/tabPage.ui
similarity index 100%
rename from irods-basicGUI/ui-files/tabPage.ui
rename to irods-iBridgesGui/ui-files/tabPage.ui
diff --git a/irods-basicGUI/ui-files/tabUpDownload.ui b/irods-iBridgesGui/ui-files/tabUpDownload.ui
similarity index 100%
rename from irods-basicGUI/ui-files/tabUpDownload.ui
rename to irods-iBridgesGui/ui-files/tabUpDownload.ui
diff --git a/irods-basicGUI/utils.py b/irods-iBridgesGui/utils.py
similarity index 100%
rename from irods-basicGUI/utils.py
rename to irods-iBridgesGui/utils.py