Improve dependencies between jar targets