Restructure shell tools.