Changed to AndroidStudio project structure