fix all clases after change. fix gradle support.