Refactor the app to use the util modules.