add back Factions.java incorrectly removed during upstream merge
remove stale class was moved in pull request acceptance
improve dependencies, upstream version and group, fix sourceSets