relocated classes
updated gradle build