fixed java folder name casing
merged heads