Make java 5 compatible, moved java 6 caliper to separate directory