Implemented Doj, renamed Java files