Overhauling dependency architecture