Update and rename BlockSetIter.java to BlockSet.java