changed file names, removed apkFactoryPref