code cleanup, converted to new com.veritiv package nomenclature