Refactored the tools into the type files.