Moved sources to Java 7