Massive re-structure. Mostly due to name change, partly due to poor prior project structure. Also updated everything to build with newest Android Studio.