new package class moved to own directory