Added classes to subpackage tasks.