Same changes due to moved classes in the JavaAidKit