Restructure to gradle sstructure