Refactor the java packages