reorganised the toolkit