cleaning up class names
switching to java 7