Update and rename Characteristic.java to CharacteristicData.java