Update and rename java2_BufferReader.java to BufferReader.java