Fix compiler error because of moved classes in JavaAidKit