major refactoring of Tools based on new Control