1.7.2 Update and structure change with gradle setup