use java 1.6 and simplify package