Modified Tools subpackage, Abstract class was added