moved some logic out of CaptureActivity
renamed the package