Some more dirs for Spuds! (And also a simpler code) - Fixes #746

Signed-off-by: emanuele <emanuele45@gmail.com>