Migrated all utilitaries into tools