refactor, gen apk