Change package. Switch to java 7