Reorganize the Java packages