move common dependencies to parent and fix injection