better reorg of dependencies