diff --git a/direct/src/distributed/DistributedActor.py b/direct/src/actor/DistributedActor.py
similarity index 100%
rename from direct/src/distributed/DistributedActor.py
rename to direct/src/actor/DistributedActor.py
diff --git a/direct/src/showbase/DirectNotify.py b/direct/src/directnotify/DirectNotify.py
similarity index 100%
rename from direct/src/showbase/DirectNotify.py
rename to direct/src/directnotify/DirectNotify.py
diff --git a/direct/src/showbase/DirectNotifyGlobal.py b/direct/src/directnotify/DirectNotifyGlobal.py
similarity index 100%
rename from direct/src/showbase/DirectNotifyGlobal.py
rename to direct/src/directnotify/DirectNotifyGlobal.py
diff --git a/direct/src/showbase/Logger.py b/direct/src/directnotify/Logger.py
similarity index 100%
rename from direct/src/showbase/Logger.py
rename to direct/src/directnotify/Logger.py
diff --git a/direct/src/showbase/LoggerGlobal.py b/direct/src/directnotify/LoggerGlobal.py
similarity index 100%
rename from direct/src/showbase/LoggerGlobal.py
rename to direct/src/directnotify/LoggerGlobal.py
diff --git a/direct/src/showbase/Notifier.py b/direct/src/directnotify/Notifier.py
similarity index 100%
rename from direct/src/showbase/Notifier.py
rename to direct/src/directnotify/Notifier.py
diff --git a/direct/src/showbase/OnscreenText.py b/direct/src/gui/OnscreenText.py
similarity index 100%
rename from direct/src/showbase/OnscreenText.py
rename to direct/src/gui/OnscreenText.py
diff --git a/direct/src/gui/PickList.py b/direct/src/gui/PickList.py
index 862823ecfd..510731bbca 100644
--- a/direct/src/gui/PickList.py
+++ b/direct/src/gui/PickList.py
@@ -42,7 +42,7 @@ class PickList(PandaObject.PandaObject):
 
         # ignore all the buttons
         for item in self.frame.getItems():
-            self.ignore(item.getGuiItem().getUpRolloverEvent())
+            self.ignore(item.getGuiItem().getUpEvent())
             self.ignore(item.getGuiItem().getUpRolloverEvent())
             self.ignore(item.getGuiItem().getDownRolloverEvent())
 
diff --git a/direct/src/showbase/Task.py b/direct/src/task/Task.py
similarity index 100%
rename from direct/src/showbase/Task.py
rename to direct/src/task/Task.py
diff --git a/direct/src/showbase/TaskManagerGlobal.py b/direct/src/task/TaskManagerGlobal.py
similarity index 100%
rename from direct/src/showbase/TaskManagerGlobal.py
rename to direct/src/task/TaskManagerGlobal.py