Move abstract classes to util subpackage.