Fix nullpointer
Restructure project for gradle and Android Studio