Cleaned up model and util packages.