minor refactorings
ContactsAdapter moved to android.main