clean up
Move build to gradle