Reorganized solution and Android project in anticipation of adding an iOS project.