Moving code out of util.py and into __init__.py.