diff --git a/direct/src/directtools/DirectSession.py b/direct/src/directtools/DirectSession.py
index 8d8d21f29b..7cb83b4f00 100644
--- a/direct/src/directtools/DirectSession.py
+++ b/direct/src/directtools/DirectSession.py
@@ -1,20 +1,27 @@
+
+import math
+import types
+import string
+
+from pandac.PandaModules import *
+from DirectUtil import *
+
 from direct.showbase.DirectObject import DirectObject
-from DirectGlobals import *
-from DirectUtil import*
-from DirectCameraControl import *
-from DirectManipulation import *
-from DirectSelection import *
-from DirectGrid import *
-from DirectGeometry import *
-from DirectLights import *
-from direct.cluster.ClusterClient import *
-from direct.cluster.ClusterServer import *
+from direct.task import Task
+
+from DirectGlobals import DIRECT_NO_MOD
+from DirectCameraControl import DirectCameraControl
+from DirectManipulation import DirectManipulationControl
+from DirectSelection import SelectionRay, COA_ORIGIN, SelectedNodePaths
+from DirectGrid import DirectGrid
+#from DirectGeometry import *
+from DirectLights import DirectLights
+from direct.cluster.ClusterClient import createClusterClient, DummyClusterClient
+from direct.cluster.ClusterServer import ClusterServer
 from direct.tkpanels import Placer
 from direct.tkwidgets import Slider
 from direct.tkwidgets import SceneGraphExplorer
 from direct.gui import OnscreenText
-import types
-import string
 from direct.showbase import Loader
 
 class DirectSession(DirectObject):