minor change (package reorg)