reorg of top level dir for package