Rename DataType.java to Datatype.java