Add structured src and smart(ish) dependencies