renamed Apk class, formatting and variable passsing changes