Add missing source dirs
Depend on annotations lib