Moved to gradle and android studio