Pack-scan changes

I tend to prefer this kind of stuff at the top of the module. Shouldn't matter functionality wise though.
Might be cleaner to move the "base" classes in NONDEFAULT_CMDS (NON_DEFAULT_CMDS ;-))  to a separate module. Or maybe just a namespace module.