Removed all zxing files from MainActivity, fixed some slight naming convention mismatches.