Converted more files to Java.