Moved things around for Android Studion + Gradle.
Renamed package.