Convert Salvage to a child skill.
A whole bunch of more work to convert Salvage to a child skill
Minor cleanup of imports