updated gradle and moved around some things