Updated gradle files, tools and structure