Added convenience functions to common
Refactor imports

Minimizes use of global, top-level imports