diff --git a/launch/unix/manager.sh b/launch/unix/manager.sh
new file mode 100755
index 0000000..5ca87de
--- /dev/null
+++ b/launch/unix/manager.sh
@@ -0,0 +1,9 @@
+#!/bin/sh
+SOURCEDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
+source $SOURCEDIR/env.sh
+export CURRENT_PROGRAM='manager'
+
+export PYTHONPATH=${PYTHONPATH}
+
+echo "Starting Manager..."
+python pipe/app/manager/main.py
diff --git a/pipe/tools/manager/README.md b/pipe/app/manager/README.md
similarity index 100%
rename from pipe/tools/manager/README.md
rename to pipe/app/manager/README.md
diff --git a/pipe/tools/manager/__init__.py b/pipe/app/manager/__init__.py
similarity index 100%
rename from pipe/tools/manager/__init__.py
rename to pipe/app/manager/__init__.py
diff --git a/pipe/tools/manager/gui/app.py b/pipe/app/manager/gui/app.py
similarity index 100%
rename from pipe/tools/manager/gui/app.py
rename to pipe/app/manager/gui/app.py
diff --git a/pipe/tools/manager/gui/dialogs.py b/pipe/app/manager/gui/dialogs.py
similarity index 100%
rename from pipe/tools/manager/gui/dialogs.py
rename to pipe/app/manager/gui/dialogs.py
diff --git a/pipe/tools/manager/gui/main.py b/pipe/app/manager/gui/main.py
similarity index 100%
rename from pipe/tools/manager/gui/main.py
rename to pipe/app/manager/gui/main.py
diff --git a/pipe/tools/manager/gui/pages.py b/pipe/app/manager/gui/pages.py
similarity index 100%
rename from pipe/tools/manager/gui/pages.py
rename to pipe/app/manager/gui/pages.py
diff --git a/pipe/tools/manager/gui/programWidget.py b/pipe/app/manager/gui/programWidget.py
similarity index 100%
rename from pipe/tools/manager/gui/programWidget.py
rename to pipe/app/manager/gui/programWidget.py
diff --git a/pipe/tools/manager/gui/resources.py b/pipe/app/manager/gui/resources.py
similarity index 100%
rename from pipe/tools/manager/gui/resources.py
rename to pipe/app/manager/gui/resources.py
diff --git a/pipe/tools/manager/gui/tables.py b/pipe/app/manager/gui/tables.py
similarity index 100%
rename from pipe/tools/manager/gui/tables.py
rename to pipe/app/manager/gui/tables.py
diff --git a/pipe/tools/manager/gui/tableutils.py b/pipe/app/manager/gui/tableutils.py
similarity index 100%
rename from pipe/tools/manager/gui/tableutils.py
rename to pipe/app/manager/gui/tableutils.py
diff --git a/pipe/tools/manager/gui/viewmodel.py b/pipe/app/manager/gui/viewmodel.py
similarity index 100%
rename from pipe/tools/manager/gui/viewmodel.py
rename to pipe/app/manager/gui/viewmodel.py
diff --git a/pipe/tools/manager/gui/window.py b/pipe/app/manager/gui/window.py
similarity index 100%
rename from pipe/tools/manager/gui/window.py
rename to pipe/app/manager/gui/window.py
diff --git a/pipe/tools/manager/icons/default-logo.png b/pipe/app/manager/icons/default-logo.png
similarity index 100%
rename from pipe/tools/manager/icons/default-logo.png
rename to pipe/app/manager/icons/default-logo.png
diff --git a/pipe/tools/manager/icons/file.png b/pipe/app/manager/icons/file.png
similarity index 100%
rename from pipe/tools/manager/icons/file.png
rename to pipe/app/manager/icons/file.png
diff --git a/pipe/tools/manager/icons/hou.png b/pipe/app/manager/icons/hou.png
similarity index 100%
rename from pipe/tools/manager/icons/hou.png
rename to pipe/app/manager/icons/hou.png
diff --git a/pipe/tools/manager/icons/logo-fullres.png b/pipe/app/manager/icons/logo-fullres.png
similarity index 100%
rename from pipe/tools/manager/icons/logo-fullres.png
rename to pipe/app/manager/icons/logo-fullres.png
diff --git a/pipe/tools/manager/icons/mari.png b/pipe/app/manager/icons/mari.png
similarity index 100%
rename from pipe/tools/manager/icons/mari.png
rename to pipe/app/manager/icons/mari.png
diff --git a/pipe/tools/manager/icons/maya.png b/pipe/app/manager/icons/maya.png
similarity index 100%
rename from pipe/tools/manager/icons/maya.png
rename to pipe/app/manager/icons/maya.png
diff --git a/pipe/tools/manager/icons/nuke.png b/pipe/app/manager/icons/nuke.png
similarity index 100%
rename from pipe/tools/manager/icons/nuke.png
rename to pipe/app/manager/icons/nuke.png
diff --git a/pipe/tools/manager/icons/shortcut-icon.png b/pipe/app/manager/icons/shortcut-icon.png
similarity index 100%
rename from pipe/tools/manager/icons/shortcut-icon.png
rename to pipe/app/manager/icons/shortcut-icon.png
diff --git a/pipe/tools/manager/icons/usd.png b/pipe/app/manager/icons/usd.png
similarity index 100%
rename from pipe/tools/manager/icons/usd.png
rename to pipe/app/manager/icons/usd.png
diff --git a/pipe/tools/manager/icons/warning-icon.png b/pipe/app/manager/icons/warning-icon.png
similarity index 100%
rename from pipe/tools/manager/icons/warning-icon.png
rename to pipe/app/manager/icons/warning-icon.png
diff --git a/pipe/tools/manager/images/PipelionLogoRevised.png b/pipe/app/manager/images/PipelionLogoRevised.png
similarity index 100%
rename from pipe/tools/manager/images/PipelionLogoRevised.png
rename to pipe/app/manager/images/PipelionLogoRevised.png
diff --git a/pipe/tools/manager/images/PipelionTextLogo.png b/pipe/app/manager/images/PipelionTextLogo.png
similarity index 100%
rename from pipe/tools/manager/images/PipelionTextLogo.png
rename to pipe/app/manager/images/PipelionTextLogo.png
diff --git a/pipe/tools/manager/images/pipelionlogoanimated.gif b/pipe/app/manager/images/pipelionlogoanimated.gif
similarity index 100%
rename from pipe/tools/manager/images/pipelionlogoanimated.gif
rename to pipe/app/manager/images/pipelionlogoanimated.gif
diff --git a/pipe/tools/manager/main.py b/pipe/app/manager/main.py
similarity index 98%
rename from pipe/tools/manager/main.py
rename to pipe/app/manager/main.py
index c2c630e..dbeb176 100644
--- a/pipe/tools/manager/main.py
+++ b/pipe/app/manager/main.py
@@ -1,9 +1,16 @@
+import os
+
+print("here")
+print(os.getcwd())
+
+from PySide import *
+print("PyQt version:", PYQT_VERSION_STR)
 try:
-	from PySide2 import QtWidgets, QtGui
-	from PySide2 import QtCore
+    from PySide import QtGui as QtWidgets
+    from PySide import QtGui as QtGui
+    from PySide import QtCore
 except ImportError:
-	from PySide import QtGui as QtWidgets
-	from PySide import QtCore
+    from PySide2 import QtWidgets, QtGui, QtCore
 
 import datetime
 import operator
@@ -13,7 +20,7 @@
 from pipe.am.environment import Department, Status
 from pipe.am.project import Project
 
-from byugui import request_email
+# from byugui import request_email
 
 REF_WINDOW_WIDTH = 1080
 REF_WINDOW_HEIGHT = 650
@@ -356,7 +363,7 @@ def __init__(self):
 		layout.addWidget(self.status_bar)
 		self.setLayout(layout)
 
-		request_email.check_user_email(self)
+		# request_email.check_user_email(self)
 
 	def _build_tree(self):
 		self.tree.clear()