sorted out android files that andy committed