try restructuring some dependencies