Completed part 3 in java and moved some files