Finished splitting util.py into separate files.