Use several source directories and fix some FindBugs warnings