diff --git a/modules/pymol/commanding.py b/modules/pymol/commanding.py
index 470994f33..27d724e05 100644
--- a/modules/pymol/commanding.py
+++ b/modules/pymol/commanding.py
@@ -12,6 +12,8 @@
 #-*
 #Z* -------------------------------------------------------------------
 
+from pymol.shortcut import Shortcut
+
 if True:
 
     import sys
@@ -39,7 +41,7 @@
     cmd = sys.modules["pymol.cmd"]
     import pymol
 
-    from .cmd import _cmd, Shortcut, QuietException, \
+    from .cmd import _cmd, QuietException, \
           fb_module, fb_mask, is_list, \
           DEFAULT_ERROR, DEFAULT_SUCCESS, is_ok, is_error, is_string
 
diff --git a/modules/pymol/constants.py b/modules/pymol/constants.py
index dc19cdebc..caa70aab4 100644
--- a/modules/pymol/constants.py
+++ b/modules/pymol/constants.py
@@ -1,8 +1,8 @@
 
 # constant objects
 
+from pymol.shortcut import Shortcut
 from .parsing import QuietException
-from .shortcut import Shortcut
 from .constants_palette import palette_dict
 import re
 
diff --git a/modules/pymol/controlling.py b/modules/pymol/controlling.py
index 74929e149..9de1de7ca 100644
--- a/modules/pymol/controlling.py
+++ b/modules/pymol/controlling.py
@@ -12,10 +12,11 @@
 #-*
 #Z* -------------------------------------------------------------------
 
+from pymol.shortcut import Shortcut
+
 if True:
     try:
         from . import selector, internal
-        from .shortcut import Shortcut
         cmd = __import__("sys").modules["pymol.cmd"]
         from .cmd import _cmd, QuietException, is_string, \
              boolean_dict, boolean_sc, \
@@ -23,7 +24,6 @@
              location_code, location_sc
         import pymol
     except:
-        from shortcut import Shortcut
         cmd = None
 
 
diff --git a/modules/pymol/creating.py b/modules/pymol/creating.py
index ac9c7fbc9..6ea15cc45 100644
--- a/modules/pymol/creating.py
+++ b/modules/pymol/creating.py
@@ -12,6 +12,7 @@
 #-*
 #Z* -------------------------------------------------------------------
 
+from pymol.shortcut import Shortcut
 from .constants import CURRENT_STATE, ALL_STATES
 
 if True:
@@ -23,7 +24,7 @@
     import re
     import gzip
     import os
-    from .cmd import _cmd, Shortcut, is_list, is_string, \
+    from .cmd import _cmd, is_list, is_string, \
           safe_list_eval, safe_alpha_list_eval, \
           DEFAULT_ERROR, DEFAULT_SUCCESS, is_ok, is_error, \
           is_tuple
diff --git a/modules/pymol/editing.py b/modules/pymol/editing.py
index 4f288b237..420073fa6 100644
--- a/modules/pymol/editing.py
+++ b/modules/pymol/editing.py
@@ -13,6 +13,7 @@
 #Z* -------------------------------------------------------------------
 
 import pymol
+from pymol.shortcut import Shortcut
 from .constants import CURRENT_STATE, ALL_STATES
 
 
@@ -67,7 +68,7 @@ def _iterate_prepare_args(expression, space, _self):
     import math
     from . import selector
     cmd = __import__("sys").modules["pymol.cmd"]
-    from .cmd import _cmd,lock,unlock,Shortcut,is_string, \
+    from .cmd import _cmd,lock,unlock,is_string, \
           boolean_sc,boolean_dict,safe_list_eval, is_sequence, \
           DEFAULT_ERROR, DEFAULT_SUCCESS, _raising, is_ok, is_error
     from chempy import cpv
diff --git a/modules/pymol/experimenting.py b/modules/pymol/experimenting.py
index 5dda05c17..e91c1abed 100644
--- a/modules/pymol/experimenting.py
+++ b/modules/pymol/experimenting.py
@@ -15,7 +15,7 @@
 if True:
 
     from . import selector
-    from .cmd import _cmd,lock,unlock,Shortcut,QuietException, \
+    from .cmd import _cmd,lock,unlock,QuietException, \
           DEFAULT_ERROR, DEFAULT_SUCCESS, _raising, is_ok, is_error
     cmd = __import__("sys").modules["pymol.cmd"]
     import threading
diff --git a/modules/pymol/exporting.py b/modules/pymol/exporting.py
index 132a8407a..e6cd9f18c 100644
--- a/modules/pymol/exporting.py
+++ b/modules/pymol/exporting.py
@@ -12,6 +12,7 @@
 #-*
 #Z* -------------------------------------------------------------------
 
+from pymol.shortcut import Shortcut
 from . import colorprinting
 
 if True:
@@ -24,7 +25,7 @@
 
     import pymol
     cmd = sys.modules["pymol.cmd"]
-    from .cmd import _cmd,Shortcut,QuietException
+    from .cmd import _cmd,QuietException
     from chempy import io
     from chempy.pkl import cPickle
     from .cmd import _feedback,fb_module,fb_mask, \
diff --git a/modules/pymol/externing.py b/modules/pymol/externing.py
index 7f43cf792..20a6169bf 100644
--- a/modules/pymol/externing.py
+++ b/modules/pymol/externing.py
@@ -23,7 +23,7 @@
     import traceback
 
     from glob import glob
-    from .cmd import _cmd,lock,unlock,Shortcut,QuietException, \
+    from .cmd import _cmd,lock,unlock,QuietException, \
           _feedback,fb_module,fb_mask, exp_path, \
           DEFAULT_ERROR, DEFAULT_SUCCESS, _raising, is_ok, is_error
 
diff --git a/modules/pymol/feedingback.py b/modules/pymol/feedingback.py
index 3e4d0bcb8..56e6b8266 100644
--- a/modules/pymol/feedingback.py
+++ b/modules/pymol/feedingback.py
@@ -1,6 +1,7 @@
 import sys
+from pymol.shortcut import Shortcut
 cmd = __import__("sys").modules["pymol.cmd"]
-from .cmd import Shortcut, is_string, QuietException
+from .cmd import is_string, QuietException
 from .cmd import fb_module, fb_mask, fb_action,_raising
 import copy
 
diff --git a/modules/pymol/fitting.py b/modules/pymol/fitting.py
index 7097b2080..213b15d42 100644
--- a/modules/pymol/fitting.py
+++ b/modules/pymol/fitting.py
@@ -20,7 +20,7 @@
         import os
         import pymol
 
-        from .cmd import _cmd,lock,unlock,Shortcut, \
+        from .cmd import _cmd,lock,unlock, \
             DEFAULT_ERROR, DEFAULT_SUCCESS, _raising, is_ok, is_error
 
 
diff --git a/modules/pymol/internal.py b/modules/pymol/internal.py
index 087ed03fa..0e5c5fb79 100644
--- a/modules/pymol/internal.py
+++ b/modules/pymol/internal.py
@@ -1,6 +1,7 @@
 import os
 import sys
 cmd = sys.modules["pymol.cmd"]
+from pymol.shortcut import Shortcut
 from pymol import _cmd
 import threading
 import traceback
@@ -14,7 +15,7 @@
 
 import chempy.io
 
-from .cmd import DEFAULT_ERROR, DEFAULT_SUCCESS, loadable, _load2str, Shortcut, \
+from .cmd import DEFAULT_ERROR, DEFAULT_SUCCESS, loadable, _load2str, \
    is_string, is_ok
 
 # cache management:
diff --git a/modules/pymol/moving.py b/modules/pymol/moving.py
index 8c489c9e3..67c03eec2 100644
--- a/modules/pymol/moving.py
+++ b/modules/pymol/moving.py
@@ -11,6 +11,7 @@
 #-*
 #-*
 #Z* -------------------------------------------------------------------
+from pymol.shortcut import Shortcut
 
 if True:
 
@@ -21,7 +22,7 @@
     import pymol
     import re
     cmd = sys.modules["pymol.cmd"]
-    from .cmd import _cmd,Shortcut, \
+    from .cmd import _cmd, \
           toggle_dict,toggle_sc, \
           DEFAULT_ERROR, DEFAULT_SUCCESS, _raising, is_ok, is_error
 
diff --git a/modules/pymol/querying.py b/modules/pymol/querying.py
index 6750eaaf0..bf8b3eae2 100644
--- a/modules/pymol/querying.py
+++ b/modules/pymol/querying.py
@@ -20,7 +20,7 @@
     from . import selector
     import pymol
     cmd = __import__("sys").modules["pymol.cmd"]
-    from .cmd import _cmd,lock,unlock,Shortcut, \
+    from .cmd import _cmd,lock,unlock, \
           _feedback,fb_module,fb_mask,is_list, \
           DEFAULT_ERROR, DEFAULT_SUCCESS, _raising, is_ok, is_error
 
diff --git a/modules/pymol/selecting.py b/modules/pymol/selecting.py
index 3be7b5f93..c8552aa69 100644
--- a/modules/pymol/selecting.py
+++ b/modules/pymol/selecting.py
@@ -11,6 +11,7 @@
 #-*
 #-*
 #Z* -------------------------------------------------------------------
+from pymol.shortcut import Shortcut
 
 if True:
 
@@ -18,7 +19,7 @@
 
     cmd = __import__("sys").modules["pymol.cmd"]
 
-    from .cmd import _cmd,Shortcut, \
+    from .cmd import _cmd, \
           DEFAULT_ERROR, DEFAULT_SUCCESS, _raising, is_ok, is_error
 
     import pymol
diff --git a/modules/pymol/setting.py b/modules/pymol/setting.py
index 21ebba646..f6c36cc61 100644
--- a/modules/pymol/setting.py
+++ b/modules/pymol/setting.py
@@ -13,6 +13,9 @@
 #Z* -------------------------------------------------------------------
 
 # must match layer1/Setting.h
+from pymol.shortcut import Shortcut
+
+
 cSetting_tuple = -1
 cSetting_blank = 0
 cSetting_boolean = 1
@@ -26,7 +29,6 @@
 
     import traceback
     from . import selector
-    from .shortcut import Shortcut
     cmd = __import__("sys").modules["pymol.cmd"]
     from .cmd import _cmd,lock,lock_attempt,unlock,QuietException, \
           is_string, \
diff --git a/modules/pymol/viewing.py b/modules/pymol/viewing.py
index a65970949..ba2f7dbc2 100644
--- a/modules/pymol/viewing.py
+++ b/modules/pymol/viewing.py
@@ -12,6 +12,7 @@
 #-*
 #Z* -------------------------------------------------------------------
 
+from pymol.shortcut import Shortcut
 from . import colorprinting
 
 if True:
@@ -25,7 +26,7 @@
     import re
     cmd = sys.modules["pymol.cmd"]
 
-    from .cmd import _cmd, Shortcut, \
+    from .cmd import _cmd, \
           _feedback,fb_module,fb_mask, \
           repres,repres_sc, is_string, is_list, \
           repmasks,repmasks_sc, \
diff --git a/modules/pymol/wizarding.py b/modules/pymol/wizarding.py
index bf707d48c..48512575e 100644
--- a/modules/pymol/wizarding.py
+++ b/modules/pymol/wizarding.py
@@ -17,7 +17,7 @@
     import pymol
     import sys
     cmd = __import__("sys").modules["pymol.cmd"]
-    from .cmd import _cmd,lock,unlock,Shortcut,QuietException,_raising, \
+    from .cmd import _cmd,lock,unlock,QuietException,_raising, \
           _feedback,fb_module,fb_mask, \
           DEFAULT_ERROR, DEFAULT_SUCCESS, _raising, is_ok, is_error