Reorganized and renamed java packages. Updated scripts accordingly.