Changed shortcuts from being a package to just being a module