Added first round of changes to Android project