Initial commit for java branch