Refactor scouting and FSM system to make states more atomic and isolated

Signed-off-by: MHesham <mhesham.fcis@gmail.com>