refactor: Create structs for each tools command to better isolate commands - cont'd

refactor: Create structs for each tools command to better isolate commands - cont'd #1334