Cleanup for modules split
Update Java-make (fix Jar building)