Changed package declarations to Java