Moving the 'rebuild' command into the full tools, instead of the run.n wrapper