cleaned up packages; consistent use of Pair.java