LAC-85: Fix java classes for import