Move to use output$$ instead of blocking

Involves a cleanup and the use of File::Spec::catdir on
places where it was overseen