refacotr gen aidl class