removed .gradle folder and refactor some code